From d371af3f99a3d2f7b1137ee862babe4735e8fbd7 Mon Sep 17 00:00:00 2001 From: Wang Yang Date: Wed, 10 Jul 2024 01:32:13 +0800 Subject: [PATCH 1/2] enable '/mt' on windows --- CMakeLists.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e7d9bf..c406cfd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,6 +69,17 @@ if (USE_LIBPNG_AND_ZLIB) file(RENAME ${EGE_ZLIB_SOURCE_DIR}/zconf.h.included ${EGE_ZLIB_SOURCE_DIR}/zconf.h) endif () + if (MSVC) + target_compile_options(png_static PUBLIC + /MP + "$<$:/MTd>" + "$<$:/MT>") + target_compile_options(zlibstatic PUBLIC + /MP + "$<$:/MTd>" + "$<$:/MT>") + endif() + target_include_directories(xege PRIVATE ${EGE_ZLIB_BINARY_DIR} PRIVATE ${EGE_ZLIB_SOURCE_DIR} @@ -77,6 +88,7 @@ if (USE_LIBPNG_AND_ZLIB) PRIVATE ${EGE_LIBPNG_BINARY_DIR} PRIVATE ${EGE_LIBPNG_SOURCE_DIR} ) + target_sources(xege PRIVATE $ PRIVATE $ @@ -111,6 +123,10 @@ endif () # 打印编译器信息 if (MSVC) message(STATUS "${TARGET_BITS}bit MSVC target: MSVC ${MSVC_VERSION}") + target_compile_options(xege PUBLIC + /MP + "$<$:/MTd>" + "$<$:/MT>") elseif (CMAKE_CXX_COMPILER_ID MATCHES "GNU") message(STATUS "${TARGET_BITS}bit GNU target: GCC ${CMAKE_C_COMPILER_VERSION}") else () From 17735dd92b16179d63e55c4c9bab74e4404dcbf5 Mon Sep 17 00:00:00 2001 From: wy Date: Fri, 5 Jul 2024 11:21:29 +0800 Subject: [PATCH 2/2] better tasks (cherry picked from commit 874d8f7e42e1b5e66e29b46ebeb55719e5a6826e) --- tasks.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tasks.sh b/tasks.sh index b828ce9..d4135db 100755 --- a/tasks.sh +++ b/tasks.sh @@ -102,6 +102,9 @@ while [[ $# > 0 ]]; do ;; --build) echo "build" + if [[ ! -f "$CMAKE_VS_DIR/CMakeCache.txt" ]]; then + loadCMakeProject + fi cmakeBuildAll shift # past argument ;;