From f6f61017621be1d6380d2682e1f53561799875b7 Mon Sep 17 00:00:00 2001 From: tildearrow Date: Tue, 15 Nov 2022 22:24:23 -0500 Subject: [PATCH] Revert "no WinMain experiment - TEST!" This reverts commit 4e2dd5ec631ab73b0ad177f70237ec4a53ab026d. --- CMakeLists.txt | 3 +-- src/main.cpp | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e0506dcb2..d79cfffbc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -698,7 +698,6 @@ if (WIN32) list(APPEND DEPENDENCIES_LIBRARIES shlwapi) if (NOT MSVC) list(APPEND DEPENDENCIES_LIBRARIES -static) - list(APPEND DEPENDENCIES_LINK_OPTIONS "-mconsole") endif() endif() @@ -743,7 +742,7 @@ if (WARNINGS_ARE_ERRORS) endif() if (MSVC) - add_executable(furnace ${USED_SOURCES}) + add_executable(furnace WIN32 ${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 984494f78..5c668a9eb 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