diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-09-01 15:43:34 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-09-01 15:48:41 +0530 |
| commit | 3ff65b61caaaa7d74e5c5ca6d74c41040b093120 (patch) | |
| tree | 2c2c03846f06313dc191b4dc80301de75e842852 /config | |
| parent | dd317a9727755400cac327c65969b70e07401526 (diff) | |
Port all gstreamer recipes to Meson
Tested on: Fedora 28, macOS, cross-win32, cross-win64,
cross-android-universal, cross-ios-universal, Windows.
Diffstat (limited to 'config')
| -rw-r--r-- | config/windows.config | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/config/windows.config b/config/windows.config index 8c9c17bf..6979f8ca 100644 --- a/config/windows.config +++ b/config/windows.config @@ -51,7 +51,7 @@ else: ccache = use_ccache and 'ccache ' or '' # Toolchain environment -os.environ['CFLAGS'] += "-DWINVER=0x0600 -D_WIN32_WINNT=0x0600" +os.environ['CFLAGS'] += " -DWINVER=0x0600 -D_WIN32_WINNT=0x0600 " os.environ['CXXFLAGS']=os.environ['CFLAGS'] os.environ['PERL'] = 'perl' os.environ['NM']= cmd('nm') @@ -68,6 +68,8 @@ if not export_msvc: os.environ['STRIP']= cmd('strip') os.environ['WINDRES']= cmd('windres') os.environ['RC']= cmd('windres') + # With MinGW, DirectX headers are inside a subdir + os.environ['CFLAGS'] += ' -I%s/%s/include/directx ' % (toolchain_prefix, host) # PATH toolchainbin = os.path.join(toolchain_prefix, 'bin') if os.path.isdir(toolchainbin) and not toolchainbin in os.environ['PATH']: @@ -81,13 +83,6 @@ os.environ['lt_cv_deplibs_check_method'] = 'pass_all' os.environ['ac_cv_lib_bz2_BZ2_bzlibVersion'] = 'yes' os.environ['ac_cv_c_attribute_aligned'] = '64' -# DirectX and DirectSound -os.environ['DIRECTSOUND_CFLAGS'] = '-I%s/%s/include/directx' % (toolchain_prefix, host) -os.environ['DIRECSOUND_LDFLAGS'] = '-L%s/lib' % toolchain_prefix -os.environ['DIRECTX_CFLAGS']= '-I%s/include/DirectX' % toolchain_prefix -os.environ['DIRECTX_CFLAGS'] = '-I%s/%s/include/directx' % (toolchain_prefix, host) -os.environ['DIRECTX_LDFLAGS'] = '-L%s/lib' % toolchain_prefix - if platform == Platform.WINDOWS: os.environ['ACLOCAL'] = 'aclocal-1.11' # We use Visual Studio by default on Windows |