Add ability to create console apps

1k/build.ps1

@@ -1800,6 +1800,7 @@ if (!$setupOnly) {
                     }
                     $b1k.println("BUILD_ALL_OPTIONS=$BUILD_ALL_OPTIONS, Count={0}" -f $BUILD_ALL_OPTIONS.Count)
 
+                    $b1k.println("cmake --build $BUILD_DIR $BUILD_ALL_OPTIONS")
                     cmake --build $BUILD_DIR $BUILD_ALL_OPTIONS | Out-Host
                 }
             }

cmake/Modules/AXBuildHelpers.cmake

@@ -363,8 +363,9 @@ endfunction()
 
 # setup a ax application
 function(ax_setup_app_config app_name)
-    set(options RUNTIME_OUTPUT_DIR opt_RUNTIME_OUTPUT_DIR)
-    cmake_parse_arguments(opt "" "${options}" ""
+    set(options CONSOLE)
+    set(oneValueArgs RUNTIME_OUTPUT_DIR)
+    cmake_parse_arguments(opt "${options}" "${oneValueArgs}" ""
                           "" ${ARGN} )
     if (WINRT)
         target_include_directories(${app_name} 
@@ -394,10 +395,23 @@ function(ax_setup_app_config app_name)
         endif()
     elseif(WINDOWS)
         # windows: visual studio/LLVM-clang default is Console app, but we need Windows app
-        if(MSVC)
-            set_property(TARGET ${app_name} APPEND PROPERTY LINK_FLAGS "/SUBSYSTEM:WINDOWS")
-        elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-            set_property(TARGET ${app_name} APPEND PROPERTY LINK_FLAGS "-Xlinker /subsystem:windows")
+        set(_win32_linker_flags "")
+        set(_win32_console_app FALSE)
+
+        if (NOT opt_CONSOLE OR WINRT)
+            set(_win32_linker_flags "/SUBSYSTEM:WINDOWS")
+        else()
+            set(_win32_linker_flags "/SUBSYSTEM:CONSOLE")
+            set(_win32_console_app TRUE)
+        endif()
+
+        if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+            set(_win32_linker_flags "-Xlinker ${_win32_linker_flags}")
+        endif()
+
+        set_property(TARGET ${app_name} APPEND PROPERTY LINK_FLAGS "${_win32_linker_flags}")
+        if (_win32_console_app)
+            set_source_files_properties(proj.win32/main.cpp PROPERTIES COMPILE_DEFINITIONS _CONSOLE=1)
         endif()
     endif()
     # auto mark code files for IDE when mark app

templates/common/proj.win32/main.cpp

@@ -28,10 +28,18 @@
 #include "axmol.h"
 
 // Uncomment to enable win32 console
-// #define USE_WIN32_CONSOLE
+#define USE_WIN32_CONSOLE
 
 USING_NS_AX;
 
+int axmol_main() {
+    // create the application instance
+    AppDelegate app;
+    int ret = Application::getInstance()->run();
+    return ret;
+}
+
+#if !defined(_CONSOLE)
 int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow)
 {
     UNREFERENCED_PARAMETER(hPrevInstance);
@@ -43,8 +51,10 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL
 #endif
 
     // create the application instance
-    AppDelegate app;
-    int ret = Application::getInstance()->run();
-
-    return ret;
+    return axmol_main();
+}
+#else
+int main(int, char**) {
+    return axmol_main();
 }
+#endif

tests/cpp-tests/proj.win32/main.cpp

@@ -1,5 +1,6 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
+ Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
 
  https://axmolengine.github.io/
 
@@ -24,17 +25,35 @@
 
 #include "main.h"
 #include "AppDelegate.h"
+#include "axmol.h"
+
+// Uncomment to enable win32 console
+#define USE_WIN32_CONSOLE
 
 USING_NS_AX;
 
+static int axmol_main() {
+    // create the application instance
+    AppDelegate app;
+    return Application::getInstance()->run();
+}
+
+#if !defined(_CONSOLE)
 int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow)
 {
     UNREFERENCED_PARAMETER(hPrevInstance);
     UNREFERENCED_PARAMETER(lpCmdLine);
 
-    #include "platform/win32/EmbedConsole.h"
+    // create the application instance
+#ifdef USE_WIN32_CONSOLE
+#    include "platform/win32/EmbedConsole.h"
+#endif
 
     // create the application instance
-    AppDelegate app;
-    return Application::getInstance()->run();
+    return axmol_main();
+}
+#else
+int main(int, char**) {
+    return axmol_main();
 }
+#endif

tests/fairygui-tests/proj.win32/main.cpp

@@ -1,18 +1,19 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
-
+ Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
+
  https://axmolengine.github.io/
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -24,18 +25,35 @@
 
 #include "main.h"
 #include "AppDelegate.h"
+#include "axmol.h"
+
+// Uncomment to enable win32 console
+// #define USE_WIN32_CONSOLE
 
 USING_NS_AX;
 
-int WINAPI _tWinMain(HINSTANCE hInstance,
-                       HINSTANCE hPrevInstance,
-                       LPTSTR    lpCmdLine,
-                       int       nCmdShow)
+static int axmol_main() {
+    // create the application instance
+    AppDelegate app;
+    return Application::getInstance()->run();
+}
+
+#if !defined(_CONSOLE)
+int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow)
 {
     UNREFERENCED_PARAMETER(hPrevInstance);
     UNREFERENCED_PARAMETER(lpCmdLine);
 
     // create the application instance
-    AppDelegate app;
-    return Application::getInstance()->run();
+#ifdef USE_WIN32_CONSOLE
+#    include "platform/win32/EmbedConsole.h"
+#endif
+
+    // create the application instance
+    return axmol_main();
+}
+#else
+int main(int, char**) {
+    return axmol_main();
 }
+#endif

tests/live2d-tests/proj.win32/main.cpp

@@ -1,18 +1,19 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
-
+ Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
+
  https://axmolengine.github.io/
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -24,18 +25,35 @@
 
 #include "main.h"
 #include "AppDelegate.h"
+#include "axmol.h"
+
+// Uncomment to enable win32 console
+// #define USE_WIN32_CONSOLE
 
 USING_NS_AX;
 
-int WINAPI _tWinMain(HINSTANCE hInstance,
-                       HINSTANCE hPrevInstance,
-                       LPTSTR    lpCmdLine,
-                       int       nCmdShow)
+static int axmol_main() {
+    // create the application instance
+    AppDelegate app;
+    return Application::getInstance()->run();
+}
+
+#if !defined(_CONSOLE)
+int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow)
 {
     UNREFERENCED_PARAMETER(hPrevInstance);
     UNREFERENCED_PARAMETER(lpCmdLine);
 
     // create the application instance
-    AppDelegate app;
-    return Application::getInstance()->run();
+#ifdef USE_WIN32_CONSOLE
+#    include "platform/win32/EmbedConsole.h"
+#endif
+
+    // create the application instance
+    return axmol_main();
+}
+#else
+int main(int, char**) {
+    return axmol_main();
 }
+#endif

tests/lua-tests/CMakeLists.txt

@@ -174,7 +174,7 @@ target_include_directories(${APP_NAME} PRIVATE ${GAME_INC_DIRS})
 if(NOT _AX_USE_PREBUILT)
     target_link_libraries(${APP_NAME} ${_AX_LUA_LIB})
 endif()
-ax_setup_app_config(${APP_NAME})
+ax_setup_app_config(${APP_NAME} CONSOLE)
 
 if(APPLE)
     set_target_properties(${APP_NAME} PROPERTIES RESOURCE "${APP_UI_RES}")

tests/lua-tests/Source/AppDelegate.cpp

@@ -45,6 +45,8 @@ void AppDelegate::initGLContextAttrs()
 
 bool AppDelegate::applicationDidFinishLaunching()
 {
+    ax::setLogFmtFlag(ax::LogFmtFlag::Colored);
+
     // register lua engine
     LuaEngine* pEngine = LuaEngine::getInstance();
     ScriptEngineManager::getInstance()->setScriptEngine(pEngine);

tests/lua-tests/proj.win32/main.cpp

@@ -1,5 +1,6 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
+ Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
 
  https://axmolengine.github.io/
 
@@ -24,27 +25,35 @@
 
 #include "main.h"
 #include "AppDelegate.h"
-#include "cocos2d.h"
+#include "axmol.h"
+
+// Uncomment to enable win32 console
+// #define USE_WIN32_CONSOLE
 
 USING_NS_AX;
 
-// uncomment below line, open debug console
-#define USE_WIN32_CONSOLE
+static int axmol_main() {
+    // create the application instance
+    AppDelegate app;
+    return Application::getInstance()->run();
+}
 
+#if !defined(_CONSOLE)
 int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow)
 {
     UNREFERENCED_PARAMETER(hPrevInstance);
     UNREFERENCED_PARAMETER(lpCmdLine);
 
+    // create the application instance
 #ifdef USE_WIN32_CONSOLE
-    ax::setLogFmtFlag(ax::LogFmtFlag::Colored);
-    #include "platform/win32/EmbedConsole.h"
+#    include "platform/win32/EmbedConsole.h"
 #endif
 
     // create the application instance
-    AppDelegate app;
-
-    int ret = Application::getInstance()->run();
-
-    return ret;
+    return axmol_main();
 }
+#else
+int main(int, char**) {
+    return axmol_main();
+}
+#endif