diff --git a/engine/wscript b/engine/wscript index 4e25a2d0..a0a9bad0 100644 --- a/engine/wscript +++ b/engine/wscript @@ -127,7 +127,6 @@ def configure(conf): conf.define_cond('XASH_CUSTOM_SWAP', conf.options.CUSTOM_SWAP) conf.define_cond('XASH_ENABLE_MAIN', conf.env.DISABLE_LAUNCHER) conf.define_cond('XASH_NO_ASYNC_NS_RESOLVE', conf.options.NO_ASYNC_RESOLVE) - conf.define_cond('SUPPORT_BSP2_FORMAT', conf.options.SUPPORT_BSP2_FORMAT) conf.define_cond('DBGHELP', conf.env.DEST_OS == 'win32') conf.define_cond('PSAPI_VERSION', conf.env.DEST_OS == 'win32') # will be defined as 1 diff --git a/ref/gl/wscript b/ref/gl/wscript index ffcc8845..062830d3 100644 --- a/ref/gl/wscript +++ b/ref/gl/wscript @@ -17,13 +17,10 @@ def options(opt): return def configure(conf): - conf.define_cond('SUPPORT_BSP2_FORMAT', conf.options.SUPPORT_BSP2_FORMAT) - conf.env.GL_STATIC = conf.options.GL_STATIC if conf.env.GL_STATIC: conf.check(lib='GL') - conf.define('REF_DLL', 1) if conf.env.DEST_OS2 == 'android': conf.check_cc(lib='log') @@ -74,6 +71,6 @@ def build(bld): target = k, includes = includes, use = libs + v['libs'], - defines = v['defines'], + defines = v['defines'] + ['REF_DLL=1'], install_path = bld.env.LIBDIR, subsystem = bld.env.MSVC_SUBSYSTEM) diff --git a/ref/soft/wscript b/ref/soft/wscript index f6529c35..aa7b1374 100644 --- a/ref/soft/wscript +++ b/ref/soft/wscript @@ -8,12 +8,10 @@ import os top = '.' def options(opt): - # stub return def configure(conf): - conf.define_cond('SUPPORT_BSP2_FORMAT', conf.options.SUPPORT_BSP2_FORMAT) - conf.define('REF_DLL', 1) + return def build(bld): libs = [ 'engine_includes', 'werror' ] @@ -26,6 +24,7 @@ def build(bld): bld.shlib(source = bld.path.ant_glob('*.c'), target = 'ref_soft', includes = '.', + defines = 'REF_DLL=1', use = libs, install_path = bld.env.LIBDIR, subsystem = bld.env.MSVC_SUBSYSTEM diff --git a/wscript b/wscript index 4a13b4d6..acb66a90 100644 --- a/wscript +++ b/wscript @@ -375,7 +375,8 @@ def configure(conf): conf.env.ENABLE_UTILS = conf.options.ENABLE_UTILS conf.env.ENABLE_FUZZER = conf.options.ENABLE_FUZZER conf.env.DEDICATED = conf.options.DEDICATED - conf.env.SUPPORT_BSP2_FORMAT = conf.options.SUPPORT_BSP2_FORMAT + + conf.define_cond('SUPPORT_BSP2_FORMAT', conf.options.SUPPORT_BSP2_FORMAT) # disable game_launch compiling on platform where it's not needed conf.env.DISABLE_LAUNCHER = conf.env.DEST_OS in ['android', 'nswitch', 'psvita', 'dos'] or conf.env.MAGX or conf.env.DEDICATED or conf.env.STATIC_LINKING