mirrors
/
vkd3d-proton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Move build options to top of build script 

Signed-off-by: Joshua Ashton <joshua@froggi.es>
This commit is contained in:
Joshua Ashton 2020-07-02 16:41:57 +01:00 committed by Philip Rebohle
parent cb4fcd5a98
commit 3d52186d3a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
meson.build
View File

@ -4,13 +4,17 @@ project('vkd3d', ['c'], version : '1.1', meson_version : '>= 0.51', default_opti
cpu_family = target_machine.cpu_family()
vkd3d_compiler = meson.get_compiler('c')
vkd3d_c_std = 'c99'
vkd3d_platform = target_machine.system()
enable_tests = get_option('enable_tests')
enable_extras = get_option('enable_extras')
add_project_arguments('-DHAVE_DXIL_SPV', language : 'c')
add_project_arguments('-D_GNU_SOURCE', language : 'c')
add_project_arguments('-DPACKAGE_VERSION="' + meson.project_version() + '"', language : 'c')
vkd3d_compiler = meson.get_compiler('c')
vkd3d_c_std = 'c99'
vkd3d_external_includes = [ './subprojects/Vulkan-Headers/include', './subprojects/SPIRV-Headers/include' ]
vkd3d_public_includes = [ './include' ] + vkd3d_external_includes
vkd3d_private_includes = [ './include/private' ] + vkd3d_public_includes
@ -30,14 +34,13 @@ glsl_generator = generator(glsl_compiler,
arguments : [ '-V', '--vn', '@BASENAME@', '@INPUT@', '-o', '@OUTPUT@' ])
threads_dep = dependency('threads')
lib_d3d12 = vkd3d_compiler.find_library('d3d12', required : false)
vkd3d_platform = target_machine.system()
if vkd3d_platform == 'linux'
lib_dl = vkd3d_compiler.find_library('dl')
vkd3d_extra_libs = [ lib_dl, threads_dep ]
elif vkd3d_platform == 'windows'
lib_dxgi = vkd3d_compiler.find_library('dxgi')
lib_d3d12 = vkd3d_compiler.find_library('d3d12', required : false)
vkd3d_extra_libs = [ threads_dep ]
else
error('Unknown platform')
@ -60,9 +63,6 @@ dxil_spirv_dep = dxil_spirv.get_variable('dxil_spirv_dep')
subdir('include')
subdir('libs')
enable_tests = get_option('enable_tests')
enable_extras = get_option('enable_extras')
if enable_tests
subdir('tests')
endif