Skip to content

Commit f950faf

Browse files
committed
fix windows meson build
1 parent b62f65c commit f950faf

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

external/sources/luabind-0.7.1/meson.build

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ if not get_option('use_prebuilt_libraries') or host_machine.system() in ['darwin
2525
else
2626
luabind = []
2727
if get_option('debug')
28-
deps = cxx.find_library('luabind-debug' , dirs: meson.current_source_dir()/'_Bin')
28+
if get_option('debug_type') == 'release'
29+
deps = cxx.find_library('luabind-debug-release', dirs: meson.current_source_dir()/'_Bin')
30+
else
31+
deps = cxx.find_library('luabind-debug' , dirs: meson.current_source_dir()/'_Bin')
32+
endif
2933
else
3034
deps = cxx.find_library('luabind-release', dirs: meson.current_source_dir()/'_Bin')
3135
endif
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
option('use_prebuilt_libraries', type: 'boolean', value: true, yield: true, description: 'On windows use the prebuilt libraries')
1+
option('use_prebuilt_libraries', type: 'boolean', value: true, yield: true, description: 'On windows use the prebuilt libraries')
2+
option('debug_type', type: 'combo', choices: ['full','minimal','release'], value:'minimal', yield: true, description: 'Enable certain Debug features, that might slow down the game')

meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ elif compiler.get_argument_syntax()== 'msvc'
7373
message('cl detected')
7474
elfname = 'Cortex Command'
7575
extra_args += ['-D_HAS_ITERATOR_DEBUGGING=0', '-D_HAS_AUTO_PTR_ETC=1', '-bigobj']
76+
add_global_arguments('-D_ITERATOR_DEBUG_LEVEL=0', language:'cpp')
7677
add_project_link_arguments(['winmm.lib', 'ws2_32.lib', 'dinput8.lib', 'ddraw.lib', 'dxguid.lib', 'dsound.lib', 'dbghelp.lib'], language:'cpp')
7778
if host_machine.cpu_family() == 'x86'
7879
elfname += ' x86'

0 commit comments

Comments
 (0)