From 4e2dd5ec631ab73b0ad177f70237ec4a53ab026d Mon Sep 17 00:00:00 2001 From: tildearrow Date: Tue, 15 Nov 2022 21:29:49 -0500 Subject: [PATCH] no WinMain experiment - TEST! --- CMakeLists.txt | 3 ++- src/main.cpp | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d79cfffb..e0506dcb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -698,6 +698,7 @@ if (WIN32) list(APPEND DEPENDENCIES_LIBRARIES shlwapi) if (NOT MSVC) list(APPEND DEPENDENCIES_LIBRARIES -static) + list(APPEND DEPENDENCIES_LINK_OPTIONS "-mconsole") endif() endif() @@ -742,7 +743,7 @@ if (WARNINGS_ARE_ERRORS) endif() if (MSVC) - add_executable(furnace WIN32 ${USED_SOURCES}) + add_executable(furnace ${USED_SOURCES}) elseif(ANDROID AND NOT TERMUX) add_library(furnace SHARED ${USED_SOURCES}) else() diff --git a/src/main.cpp b/src/main.cpp index 5c668a9e..984494f7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -591,6 +591,6 @@ int main(int argc, char** argv) { return 0; } -#ifdef _WIN32 -#include "winMain.cpp" -#endif +//#ifdef _WIN32 +//#include "winMain.cpp" +//#endif