godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

Merge pull request #2699 from ZuBsPaCe/visual-studio-2015-compilation

Browse Source 
Visual studio 2015 compilation
This commit is contained in:
Juan Linietsky
2015-11-18 23:56:06 -03:00
parent 3118c192bd fff7cedbe1
commit 33aa019e4f
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/builtin_openssl2/e_os.h
View File

@@ -318,8 +318,8 @@ static unsigned int _strlen31(const char *str)
# undef isupper # undef isupper
# undef isxdigit # undef isxdigit
# endif # endif
# if defined(_MSC_VER) && !defined(_DLL) && defined(stdin) # if defined(_MSC_VER) && !defined(_WIN32_WCE) && !defined(_DLL) && defined(stdin)
# if _MSC_VER>=1300 # if _MSC_VER>=1300 && _MSC_VER<1600
# undef stdin # undef stdin
# undef stdout # undef stdout
# undef stderr # undef stderr
@@ -327,7 +327,7 @@ static unsigned int _strlen31(const char *str)
# define stdin (&__iob_func()[0]) # define stdin (&__iob_func()[0])
# define stdout (&__iob_func()[1]) # define stdout (&__iob_func()[1])
# define stderr (&__iob_func()[2]) # define stderr (&__iob_func()[2])
# elif defined(I_CAN_LIVE_WITH_LNK4049) # elif _MSC_VER<1300 && defined(I_CAN_LIVE_WITH_LNK4049)
# undef stdin # undef stdin
# undef stdout # undef stdout
# undef stderr # undef stderr

4
platform/windows/detect.py
View File

@@ -203,14 +203,14 @@ def configure(env):
env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE']) env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE'])
elif (env["target"]=="debug_release"): elif (env["target"]=="debug_release"):
env.Append(CCFLAGS=['/Zi','/Od']) env.Append(CCFLAGS=['/Z7','/Od'])
env.Append(LINKFLAGS=['/DEBUG']) env.Append(LINKFLAGS=['/DEBUG'])
env.Append(LINKFLAGS=['/SUBSYSTEM:WINDOWS']) env.Append(LINKFLAGS=['/SUBSYSTEM:WINDOWS'])
env.Append(LINKFLAGS=['/ENTRY:mainCRTStartup']) env.Append(LINKFLAGS=['/ENTRY:mainCRTStartup'])
elif (env["target"]=="debug"): elif (env["target"]=="debug"):
env.Append(CCFLAGS=['/Zi','/DDEBUG_ENABLED','/DDEBUG_MEMORY_ENABLED','/DD3D_DEBUG_INFO','/Od']) env.Append(CCFLAGS=['/Z7','/DDEBUG_ENABLED','/DDEBUG_MEMORY_ENABLED','/DD3D_DEBUG_INFO','/Od'])
env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE']) env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE'])
env.Append(LINKFLAGS=['/DEBUG']) env.Append(LINKFLAGS=['/DEBUG'])