Page MenuHome
Files F5860

optional_console_for_windows-20070710.diff
Public
Actions

optional_console_for_windows-20070710.diff
View Options

Index: config/win32-mingw-config.py
===================================================================
--- config/win32-mingw-config.py (revision 11195)
+++ config/win32-mingw-config.py (working copy)
@@ -152,6 +152,7 @@
CC_WARN = [ '-Wall' ]
LLIBS = ['-lshell32', '-lshfolder', '-ldxguid', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++']
+PLATFORM_LINKFLAGS = '-mwindows'
BF_DEBUG = 'false'
BF_DEBUG_FLAGS= '-g'
Index: source/creator/creator.c
===================================================================
--- source/creator/creator.c (revision 11195)
+++ source/creator/creator.c (working copy)
@@ -234,6 +234,35 @@
int audio = 0;
#endif
+#if defined(WIN32)
+ int showcon = 0;
+
+ for(a=1; a<argc; a++) {
+ if(argv[a][0] == '-' && argv[a][1] == 'c') {
+ /* only catch the -c switch */
+ showcon = 1;
+ break;
+ }
+ }
+
+ if (showcon == 1) {
+ FILE* fp;
+
+ /* open the console */
+ AllocConsole();
+
+ /* redirect stdin to console */
+ fp = freopen("CON", "r", stdin);
+ SetStdHandle(STD_INPUT_HANDLE, (HANDLE)_get_osfhandle(_fileno(fp)));
+ /* redirect stdout to console */
+ fp = freopen("CON", "w", stdout);
+ SetStdHandle(STD_OUTPUT_HANDLE, (HANDLE)_get_osfhandle(_fileno(fp)));
+ /* redirect stderr to console */
+ fp = freopen("CON", "w", stderr);
+ SetStdHandle(STD_ERROR_HANDLE, (HANDLE)_get_osfhandle(_fileno(fp)));
+ }
+#endif
+
setCallbacks();
#ifdef __APPLE__
/* patch to ignore argument finder gives us (pid?) */
@@ -693,6 +722,12 @@
screenmain();
+#if defined(WIN32)
+ if (showcon == 1){
+ FreeConsole();
+ }
+#endif
+
return 0;
} /* end of int main(argc,argv) */
Index: tools/Blender.py
===================================================================
--- tools/Blender.py (revision 11195)
+++ tools/Blender.py (working copy)
@@ -429,6 +429,8 @@
lenv.Append(LINKFLAGS = lenv['PLATFORM_LINKFLAGS'])
lenv.Append(LINKFLAGS = lenv['BF_PYTHON_LINKFLAGS'])
lenv.Append(LINKFLAGS = lenv['BF_OPENGL_LINKFLAGS'])
+ if lenv['OURPLATFORM']=='win32-mingw':
+ lenv.Append(LINKFLAGS = lenv['PLATFORM_LINKFLAGS'])
if lenv['BF_PROFILE']:
lenv.Append(LINKFLAGS = lenv['BF_PROFILE_FLAGS'])
lenv.Append(CPPPATH=includes)

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
7b/19/34800bef86dfcdb62360658e8d0a

Event Timeline