From 3961174b467e9ee221385dab95e5f184911eed86 Mon Sep 17 00:00:00 2001 From: devZoGok Date: Wed, 12 Jun 2024 20:14:52 +0300 Subject: [PATCH 1/2] building dependencies statically or dynamically --- CMakeLists.txt | 1 + external/gameBase | 2 +- external/vb01 | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dae23e7..c38193c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,7 @@ project(${GAME_NAME}) set(CMAKE_CXX_STANDART 17) set(CMAKE_BUILD_TYPE Debug) set(BUILD_TESTS ON) +set(BUILD_SHARED_LIBS ON CACHE BOOL FORCED) cmake_policy(SET CMP0015 NEW) set(UNIT_BUTTONS unitButton.cpp tradeButton.cpp buildButton.cpp trainButton.cpp researchButton.cpp) diff --git a/external/gameBase b/external/gameBase index bea2dd2..da62a04 160000 --- a/external/gameBase +++ b/external/gameBase @@ -1 +1 @@ -Subproject commit bea2dd230afff602cfe9026d18334da5b739edd8 +Subproject commit da62a04f1fc96b169e72763ddf01e762c4e04521 diff --git a/external/vb01 b/external/vb01 index bd54163..9ac52a2 160000 --- a/external/vb01 +++ b/external/vb01 @@ -1 +1 @@ -Subproject commit bd5416328ab10f3cd17b9f0d2def6ae3b7ae8b3e +Subproject commit 9ac52a2f94e9f53683bd4578662d15aa2e412ff2 From cb4991d195e1d2c3248cc2093298be0e0f52fba6 Mon Sep 17 00:00:00 2001 From: devZoGok Date: Thu, 13 Jun 2024 10:50:43 +0300 Subject: [PATCH 2/2] added and changed build flags for easier building on Windows --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c38193c..92ace01 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,9 +4,10 @@ set(GAME_NAME battleship) project(${GAME_NAME}) set(CMAKE_CXX_STANDART 17) +set(CMAKE_CXX_FLAGS "-std=c++17 -Wpedantic") set(CMAKE_BUILD_TYPE Debug) -set(BUILD_TESTS ON) -set(BUILD_SHARED_LIBS ON CACHE BOOL FORCED) +set(BUILD_TESTS OFF) +set(BUILD_SHARED_LIBS OFF CACHE BOOL FORCED) cmake_policy(SET CMP0015 NEW) set(UNIT_BUTTONS unitButton.cpp tradeButton.cpp buildButton.cpp trainButton.cpp researchButton.cpp)