diff --git a/ref/gl/exports.txt b/ref/gl/exports.txt index b79f9600..c37cfd3c 100644 --- a/ref/gl/exports.txt +++ b/ref/gl/exports.txt @@ -1,2 +1 @@ GetRefAPI -GetRefHumanReadableName \ No newline at end of file diff --git a/ref/gl/gl2_shim/wscript b/ref/gl/gl2_shim/wscript deleted file mode 100644 index a53aee64..00000000 --- a/ref/gl/gl2_shim/wscript +++ /dev/null @@ -1,24 +0,0 @@ -#! /usr/bin/env python -# encoding: utf-8 - -import os - -def options(opt): - pass - -def configure(conf): - conf.define('REF_DLL', 1) - -def build(bld): - source = bld.path.ant_glob( [ '*.c' ] ) - includes = [ '.' ] - libs = [ 'engine_includes', 'sdk_includes', 'werror' ] - bld.env.LDFLAGS += ['-fPIC'] - bld.env.CFLAGS += ['-fPIC'] - bld.stlib( - source = source, - target = 'gl2_shim', - includes = includes, - use = libs, - subsystem = bld.env.MSVC_SUBSYSTEM - ) diff --git a/ref/gl/vgl_shim/wscript b/ref/gl/vgl_shim/wscript index 3e2d7208..e7228285 100644 --- a/ref/gl/vgl_shim/wscript +++ b/ref/gl/vgl_shim/wscript @@ -10,15 +10,9 @@ def configure(conf): conf.define('REF_DLL', 1) def build(bld): - source = bld.path.ant_glob( [ '*.c' ] ) - includes = [ '.' ] - libs = [ 'engine_includes', 'sdk_includes', 'werror' ] bld.env.LDFLAGS += ['-fPIC'] bld.env.CFLAGS += ['-fPIC'] - bld.stlib( - source = source, - target = 'vgl_shim', - includes = includes, - use = libs, - subsystem = bld.env.MSVC_SUBSYSTEM - ) + bld.stlib(source = bld.path.ant_glob('*.c'), + target = 'vgl_shim', + use = 'engine_includes sdk_includes werror', + includes = '.') diff --git a/ref/gl/wscript b/ref/gl/wscript index 825f4a56..ffcc8845 100644 --- a/ref/gl/wscript +++ b/ref/gl/wscript @@ -17,10 +17,6 @@ def options(opt): return def configure(conf): - # check for dedicated server build - if conf.options.DEDICATED: - return - conf.define_cond('SUPPORT_BSP2_FORMAT', conf.options.SUPPORT_BSP2_FORMAT) conf.env.GL_STATIC = conf.options.GL_STATIC diff --git a/ref/soft/wscript b/ref/soft/wscript index 3f6ef8e7..f6529c35 100644 --- a/ref/soft/wscript +++ b/ref/soft/wscript @@ -12,14 +12,8 @@ def options(opt): return def configure(conf): - # check for dedicated server build - if conf.options.DEDICATED: - return - - if conf.options.SUPPORT_BSP2_FORMAT: - conf.env.append_unique('DEFINES', 'SUPPORT_BSP2_FORMAT') - - conf.env.append_unique('DEFINES', 'REF_DLL') + conf.define_cond('SUPPORT_BSP2_FORMAT', conf.options.SUPPORT_BSP2_FORMAT) + conf.define('REF_DLL', 1) def build(bld): libs = [ 'engine_includes', 'werror' ] @@ -29,10 +23,7 @@ def build(bld): else: libs += [ 'public', 'M' ] - if bld.env.DEDICATED: - return - - bld.shlib(source = bld.path.ant_glob(['*.c']), + bld.shlib(source = bld.path.ant_glob('*.c'), target = 'ref_soft', includes = '.', use = libs,