diff --git a/ZFLoader/zfproj/cmake/ZFLoader/CMakeLists.txt b/ZFLoader/zfproj/cmake/ZFLoader/CMakeLists.txt index 6049b1c..eecd22e 100644 --- a/ZFLoader/zfproj/cmake/ZFLoader/CMakeLists.txt +++ b/ZFLoader/zfproj/cmake/ZFLoader/CMakeLists.txt @@ -7,6 +7,7 @@ add_compile_options("$<$:-DDEBUG>") include("${PROJECT_SOURCE_DIR}/zfprojConfig.cmake" OPTIONAL) if(WIN32) + set(CMAKE_WIN32_EXECUTABLE TRUE) execute_process(COMMAND "${ZF_ROOT_PATH}\\tools\\release\\release_cmake.bat" 1) else() execute_process(COMMAND sh "${ZF_ROOT_PATH}/tools/release/release_cmake.sh" 1) diff --git a/ZFLoader/zfproj/cmake/ZFLoader/cmake_main.cpp b/ZFLoader/zfproj/cmake/ZFLoader/cmake_main.cpp index 919e9ca..d992df5 100644 --- a/ZFLoader/zfproj/cmake/ZFLoader/cmake_main.cpp +++ b/ZFLoader/zfproj/cmake/ZFLoader/cmake_main.cpp @@ -1,3 +1,5 @@ +#define SDL_MAIN_HANDLED + #include "ZFCore.h" #include "ZFCore/protocol/ZFProtocolZFMainEntry.h" diff --git a/ZFLoader/zfproj_with_src/cmake/ZFLoader/CMakeLists.txt b/ZFLoader/zfproj_with_src/cmake/ZFLoader/CMakeLists.txt index bd700bb..fe6dcc5 100644 --- a/ZFLoader/zfproj_with_src/cmake/ZFLoader/CMakeLists.txt +++ b/ZFLoader/zfproj_with_src/cmake/ZFLoader/CMakeLists.txt @@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.4.1) project(ZFLoader) if(WIN32) + set(CMAKE_WIN32_EXECUTABLE TRUE) execute_process(COMMAND "${PROJECT_SOURCE_DIR}\\..\\..\\..\\..\\zfsetup.bat") else() execute_process(COMMAND sh "${PROJECT_SOURCE_DIR}/../../../../zfsetup.sh") diff --git a/ZFLoader/zfproj_with_src/cmake/ZFLoader/cmake_main.cpp b/ZFLoader/zfproj_with_src/cmake/ZFLoader/cmake_main.cpp index 919e9ca..d992df5 100644 --- a/ZFLoader/zfproj_with_src/cmake/ZFLoader/cmake_main.cpp +++ b/ZFLoader/zfproj_with_src/cmake/ZFLoader/cmake_main.cpp @@ -1,3 +1,5 @@ +#define SDL_MAIN_HANDLED + #include "ZFCore.h" #include "ZFCore/protocol/ZFProtocolZFMainEntry.h"