diff options
Diffstat (limited to 'platform/windows')
| -rw-r--r-- | platform/windows/detect.py | 8 | ||||
| -rw-r--r-- | platform/windows/os_windows.cpp | 1 | ||||
| -rw-r--r-- | platform/windows/platform_config.h | 4 |
3 files changed, 5 insertions, 8 deletions
diff --git a/platform/windows/detect.py b/platform/windows/detect.py index 12ea5a93ee..a5b26930be 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -176,7 +176,7 @@ def get_opts(): def get_flags(): return [ - ('glew','yes'), + ('builtin_zlib', 'yes'), ('openssl','builtin'), #use builtin openssl ] @@ -279,13 +279,13 @@ def configure(env): # Forcing bits argument because MSVC does not have a flag to set this through SCons... it's different compilers (cl.exe's) called from the propper command prompt # that decide the architecture that is build for. Scons can only detect the os.getenviron (because vsvarsall.bat sets a lot of stuff for cl.exe to work with) env["bits"]="32" - env["x86_opt_vc"]=True + env["x86_libtheora_opt_vc"]=True print "Detected MSVC compiler: "+compiler_version_str # If building for 64bit architecture, disable assembly optimisations for 32 bit builds (theora as of writting)... vc compiler for 64bit can not compile _asm if(compiler_version_str == "amd64" or compiler_version_str == "x86_amd64"): env["bits"]="64" - env["x86_opt_vc"]=False + env["x86_libtheora_opt_vc"]=False print "Compiled program architecture will be a 64 bit executable (forcing bits=64)." elif (compiler_version_str=="x86" or compiler_version_str == "amd64_x86"): print "Compiled program architecture will be a 32 bit executable. (forcing bits=32)." @@ -365,7 +365,7 @@ def configure(env): env['AR'] = mingw_prefix+"ar" env['RANLIB'] = mingw_prefix+"ranlib" env['LD'] = mingw_prefix+"g++" - env["x86_opt_gcc"]=True + env["x86_libtheora_opt_gcc"]=True #env['CC'] = "winegcc" #env['CXX'] = "wineg++" diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 35d90a8308..0ca5d3bd0f 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -29,7 +29,6 @@ #include "drivers/gles2/rasterizer_gles2.h" #include "os_windows.h" -#include "drivers/nedmalloc/memory_pool_static_nedmalloc.h" #include "drivers/unix/memory_pool_static_malloc.h" #include "os/memory_pool_dynamic_static.h" #include "drivers/windows/thread_windows.h" diff --git a/platform/windows/platform_config.h b/platform/windows/platform_config.h index 9e20750816..31512a1054 100644 --- a/platform/windows/platform_config.h +++ b/platform/windows/platform_config.h @@ -30,6 +30,4 @@ //#else //#include <alloca.h> //#endif -#define GLES2_INCLUDE_H "gl_context/GL/glew.h" - - +#define GLES2_INCLUDE_H "GL/glew.h" |