#1269: fixed console output for windows

nesbox · Dec 16, 2020 · 1ae0545 · 1ae0545
1 parent 662d266
commit 1ae0545
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -740,12 +740,6 @@ if(BUILD_SDL)
         configure_file("${PROJECT_SOURCE_DIR}/build/windows/tic80.rc.in" "${PROJECT_SOURCE_DIR}/build/windows/tic80.rc")
         set(TIC80_SRC ${TIC80_SRC} "${PROJECT_SOURCE_DIR}/build/windows/tic80.rc")
 
-        # Debug build is a console app.
-        if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-        else()
-            set(SYSTEM_TYPE WIN32)
-        endif()
-
         add_executable(tic80 ${SYSTEM_TYPE} ${TIC80_SRC})
 
     elseif(ANDROID)
@@ -827,11 +821,10 @@ if(BUILD_SOKOL)
         configure_file("${PROJECT_SOURCE_DIR}/build/windows/tic80.rc.in" "${PROJECT_SOURCE_DIR}/build/windows/tic80.rc")
         set(TIC80_SRC ${TIC80_SRC} "${PROJECT_SOURCE_DIR}/build/windows/tic80.rc")
 
-        add_executable(tic80-sokol WIN32 ${TIC80_SRC})        
-    else()
-        add_executable(tic80-sokol ${TIC80_SRC})
     endif()
 
+    add_executable(tic80-sokol ${TIC80_SRC})
+
     target_include_directories(tic80-sokol PRIVATE 
         ${CMAKE_SOURCE_DIR}/include
         ${CMAKE_SOURCE_DIR}/src

diff --git a/src/system/sdl/main.c b/src/system/sdl/main.c
@@ -1760,6 +1760,11 @@ static s32 emsStart(s32 argc, char **argv, const char* folder)
 
 s32 main(s32 argc, char **argv)
 {
+#if defined(__TIC_WINDOWS__)
+    if (argc == 1)
+        FreeConsole();
+#endif
+
     const char* folder = getAppFolder();
 
 #if defined(__EMSCRIPTEN__)

diff --git a/src/system/sokol/sokol.c b/src/system/sokol/sokol.c
@@ -419,6 +419,11 @@ static void app_cleanup(void)
 
 sapp_desc sokol_main(s32 argc, char* argv[])
 {
+#if defined(__TIC_WINDOWS__)
+    if (argc == 1)
+        FreeConsole();
+#endif
+
     memset(&platform, 0, sizeof platform);
 
     platform.audio.desc.num_channels = TIC_STEREO_CHANNELS;