From a04d6679257bd89c0f6fa0ddd6399eba09485171 Mon Sep 17 00:00:00 2001 From: LaG1924 Date: Sun, 4 Jul 2021 19:35:34 +0500 Subject: Changed dynamic libs to static --- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 12ae824..7d703cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,8 +48,8 @@ CPMAddPackage( VERSION 2.0.14 GIT_TAG release-2.0.14 OPTIONS - "SDL_SHARED ON" - "SDL_STATIC OFF" + "SDL_SHARED OFF" + "SDL_STATIC ON" ) @@ -89,7 +89,7 @@ if(SDL2_net_ADDED) file(GLOB SDL2_net_sources ${SDL2_net_SOURCE_DIR}/*.c) list(REMOVE_ITEM SDL2_net_sources "${SDL2_net_SOURCE_DIR}/chatd.c") add_library(SDL2_net STATIC ${SDL2_net_sources}) - target_link_libraries(SDL2_net SDL2) + target_link_libraries(SDL2_net SDL2-static) IF (WIN32) target_link_libraries(SDL2_net ws2_32 iphlpapi) ENDIF() @@ -102,8 +102,8 @@ CPMAddPackage( GITHUB_REPOSITORY madler/zlib VERSION 1.2.11 ) -target_include_directories(zlib PUBLIC ${zlib_SOURCE_DIR}) -target_include_directories(zlib PUBLIC ${zlib_BINARY_DIR}) +target_include_directories(zlibstatic PUBLIC ${zlib_SOURCE_DIR}) +target_include_directories(zlibstatic PUBLIC ${zlib_BINARY_DIR}) CPMAddPackage( @@ -181,17 +181,17 @@ target_link_libraries(AltCraft easyloggingpp libglew_static nlohmann_json::nlohmann_json - SDL2 + SDL2-static SDL2main SDL2_net OptickCore - zlib + zlibstatic sol2 RmlLua RmlDebugger ) -set_target_properties(AltCraft SDL2 OptickCore zlib PROPERTIES +set_target_properties(AltCraft OptickCore PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR} ) -- cgit v1.2.3 From 0834b187890c0ef7b4ba8f4df6a248415ec103c8 Mon Sep 17 00:00:00 2001 From: LaG1924 Date: Mon, 5 Jul 2021 13:07:34 +0500 Subject: Fixed build for Windows-x86 --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d703cd..f7663bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,6 +50,7 @@ CPMAddPackage( OPTIONS "SDL_SHARED OFF" "SDL_STATIC ON" + "LIBC ON" ) -- cgit v1.2.3 From 48b543f81d8cb9b8cf43dcce90312637176cc5fd Mon Sep 17 00:00:00 2001 From: LaG1924 Date: Mon, 5 Jul 2021 14:59:17 +0500 Subject: Removed MacOS unnecessary dependencies --- CMakeLists.txt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index f7663bc..7a2ee79 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -143,10 +143,16 @@ endif() CPMAddPackage( - NAME Freetype - GITHUB_REPOSITORY freetype/freetype - VERSION 2.10.4 - GIT_TAG VER-2-10-4 + NAME Freetype + GITHUB_REPOSITORY freetype/freetype + VERSION 2.10.4 + GIT_TAG VER-2-10-4 + OPTIONS + "CMAKE_DISABLE_FIND_PACKAGE_ZLIB TRUE" + "CMAKE_DISABLE_FIND_PACKAGE_BZip2 TRUE" + "CMAKE_DISABLE_FIND_PACKAGE_PNG TRUE" + "CMAKE_DISABLE_FIND_PACKAGE_HarfBuzz TRUE" + "CMAKE_DISABLE_FIND_PACKAGE_BrotliDec TRUE" ) export(EXPORT freetype-targets) -- cgit v1.2.3