diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-06-07 19:59:33 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2016-06-08 00:16:27 +0200 |
| commit | 768e9252714b57421b5c893a8258469a14630a30 (patch) | |
| tree | ab2299c7533af5dc207b2c43d14a3c242cd0974b /platform/windows | |
| parent | 4c658dc52303ece088a245ede2835a68b78530b2 (diff) | |
GLEW: Define static + enabled and includes via SCons
This allows us not to have to hack our definitions in the upstream files,
making it easier to upgrade to newer versions in the future.
For the include paths to work, the headers are moved to a GL subfolder to
match their upstream location.
Diffstat (limited to 'platform/windows')
| -rw-r--r-- | platform/windows/detect.py | 4 | ||||
| -rw-r--r-- | platform/windows/platform_config.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/platform/windows/detect.py b/platform/windows/detect.py index 97d2461e58..a6a949a11a 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -169,6 +169,7 @@ def get_flags(): return [ ('freetype','builtin'), #use builtin freetype + ('glew','yes'), ('openssl','builtin'), #use builtin openssl ] @@ -242,7 +243,6 @@ def configure(env): env.Append(CCFLAGS=['/DGLES2_ENABLED']) - env.Append(CCFLAGS=['/DGLEW_ENABLED']) LIBS=['winmm','opengl32','dsound','kernel32','ole32','oleaut32','user32','gdi32', 'IPHLPAPI','Shlwapi', 'wsock32', 'shell32','advapi32','dinput8','dxguid'] env.Append(LINKFLAGS=[p+env["LIBSUFFIX"] for p in LIBS]) @@ -369,7 +369,7 @@ def configure(env): env.Append(CCFLAGS=['-DWINDOWS_ENABLED','-mwindows']) env.Append(CPPFLAGS=['-DRTAUDIO_ENABLED']) - env.Append(CCFLAGS=['-DGLES2_ENABLED','-DGLEW_ENABLED']) + env.Append(CCFLAGS=['-DGLES2_ENABLED']) env.Append(LIBS=['mingw32','opengl32', 'dsound', 'ole32', 'd3d9','winmm','gdi32','iphlpapi','shlwapi','wsock32','kernel32', 'oleaut32', 'dinput8', 'dxguid']) # if (env["bits"]=="32"): diff --git a/platform/windows/platform_config.h b/platform/windows/platform_config.h index 55f6b5547e..9e20750816 100644 --- a/platform/windows/platform_config.h +++ b/platform/windows/platform_config.h @@ -30,6 +30,6 @@ //#else //#include <alloca.h> //#endif -#define GLES2_INCLUDE_H "gl_context/glew.h" +#define GLES2_INCLUDE_H "gl_context/GL/glew.h" |