summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwithmorten <morten.with@gmail.com>2020-11-28 17:57:10 +0100
committerwithmorten <morten.with@gmail.com>2020-11-28 17:57:10 +0100
commitb1a431a740c9bde92e9169c041909cebfa705ae5 (patch)
tree3911ad72c48364369f4e3452f5ee2a5cff0a8302
parentMake texture conversion work a bit faster (diff)
downloadre3-b1a431a740c9bde92e9169c041909cebfa705ae5.tar
re3-b1a431a740c9bde92e9169c041909cebfa705ae5.tar.gz
re3-b1a431a740c9bde92e9169c041909cebfa705ae5.tar.bz2
re3-b1a431a740c9bde92e9169c041909cebfa705ae5.tar.lz
re3-b1a431a740c9bde92e9169c041909cebfa705ae5.tar.xz
re3-b1a431a740c9bde92e9169c041909cebfa705ae5.tar.zst
re3-b1a431a740c9bde92e9169c041909cebfa705ae5.zip
Diffstat (limited to '')
-rw-r--r--src/skel/glfw/glfw.cpp14
-rw-r--r--src/skel/win/win.cpp18
2 files changed, 18 insertions, 14 deletions
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index 617fee18..c4a3cad1 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -1453,12 +1453,14 @@ WinMain(HINSTANCE instance,
RwChar** argv;
SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, nil, SPIF_SENDCHANGE);
-#if 0
- // TODO: make this an option somewhere
- AllocConsole();
- freopen("CONIN$", "r", stdin);
- freopen("CONOUT$", "w", stdout);
- freopen("CONOUT$", "w", stderr);
+#ifndef MASTER
+ if (strstr(cmdLine, "-console"))
+ {
+ AllocConsole();
+ freopen("CONIN$", "r", stdin);
+ freopen("CONOUT$", "w", stdout);
+ freopen("CONOUT$", "w", stderr);
+ }
#endif
#else
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index b4897d67..4dc8c3f0 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -2011,16 +2011,18 @@ WinMain(HINSTANCE instance,
RwChar **argv;
SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, nil, SPIF_SENDCHANGE);
-#ifdef USE_CUSTOM_ALLOCATOR
- InitMemoryMgr();
+#ifndef MASTER
+ if (strstr(cmdLine, "-console"))
+ {
+ AllocConsole();
+ freopen("CONIN$", "r", stdin);
+ freopen("CONOUT$", "w", stdout);
+ freopen("CONOUT$", "w", stderr);
+ }
#endif
-#if 1
- // TODO: make this an option somewhere
- AllocConsole();
- freopen("CONIN$", "r", stdin);
- freopen("CONOUT$", "w", stdout);
- freopen("CONOUT$", "w", stderr);
+#ifdef USE_CUSTOM_ALLOCATOR
+ InitMemoryMgr();
#endif
/*