diff --git a/common/backends.h b/common/backends.h index f95a551f..bd0d7769 100644 --- a/common/backends.h +++ b/common/backends.h @@ -18,7 +18,6 @@ GNU General Public License for more details. #define BACKENDS_H // video backends (XASH_VIDEO) -#define VIDEO_DONTCARE -1 // a special mode for ref_dll #define VIDEO_NULL 0 #define VIDEO_SDL 1 #define VIDEO_ANDROID 2 diff --git a/common/defaults.h b/common/defaults.h index da4d07b2..367355e8 100644 --- a/common/defaults.h +++ b/common/defaults.h @@ -95,11 +95,7 @@ SETUP BACKENDS DEFINITIONS // fallback to NULL // #ifndef XASH_VIDEO - #ifdef REF_DLL - #define XASH_VIDEO VIDEO_DONTCARE - #else - #define XASH_VIDEO VIDEO_NULL - #endif + #define XASH_VIDEO VIDEO_NULL #endif #ifndef XASH_SOUND @@ -132,10 +128,6 @@ Default build-depended cvar and constant values // You need add library loading code to library.c when adding new platform #endif -#if defined XASH_NANOGL || defined XASH_WES || defined XASH_REGAL -#define XASH_GL_STATIC -#endif - #define DEFAULT_SV_MASTER "ms.xash.su:27010" // Set ForceSimulating to 1 by default for dedicated, because AMXModX timers require this // TODO: enable simulating for any server? diff --git a/ref_gl/gl_local.h b/ref_gl/gl_local.h index 11595dc9..33c55a45 100644 --- a/ref_gl/gl_local.h +++ b/ref_gl/gl_local.h @@ -16,7 +16,6 @@ GNU General Public License for more details. #ifndef GL_LOCAL_H #define GL_LOCAL_H #include "port.h" -#include "defaults.h" #include "xash3d_types.h" #include "cvardef.h" #include "const.h" @@ -35,6 +34,11 @@ GNU General Public License for more details. #include "pm_movevars.h" //#include "cvar.h" +#if defined XASH_NANOGL || defined XASH_WES || defined XASH_REGAL +#define XASH_GLES +#define XASH_GL_STATIC +#endif + #ifndef offsetof #define offsetof(s,m) (size_t)&(((s *)0)->m) #endif // offsetof diff --git a/ref_gl/wscript b/ref_gl/wscript index 5e7d3c44..89425694 100644 --- a/ref_gl/wscript +++ b/ref_gl/wscript @@ -79,23 +79,23 @@ def build(bld): if bld.env.NANOGL: bld.recurse('nanogl') bld.shlib( - source = source, + source = source, target = 'ref_gles1', features = 'c', includes = includes, - use = libs + ['nanogl', 'DL' ], - defines = ['XASH_GLES', 'XASH_NANOGL'], + use = libs + ['DL', 'nanogl'], + defines = ['XASH_NANOGL'], install_path = bld.env.LIBDIR, subsystem = bld.env.MSVC_SUBSYSTEM) if bld.env.GLWES: bld.recurse('gl-wes-v2') bld.shlib( - source = source, + source = source, target = 'ref_gles2', features = 'c', includes = includes, - use = libs + ['gl-wes-v2', 'DL'], - defines = ['XASH_GLES', 'XASH_WES'], + use = libs + ['DL', 'gl-wes-v2'], + defines = ['XASH_WES'], install_path = bld.env.LIBDIR, subsystem = bld.env.MSVC_SUBSYSTEM)