From d39a74277c26a50df1f5e01dbdb9d635a791479a Mon Sep 17 00:00:00 2001 From: Otto Naderer Date: Thu, 18 Aug 2022 15:48:23 +0200 Subject: [PATCH 1/3] downgrade c++11 for now due to caudio, latter now own hosted repo --- CMakeLists.txt | 8 ++++++-- ext/cAudio | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 46f36f4..873348b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.10) set(FS_TARGET flasim) -set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/lib") @@ -25,7 +25,9 @@ add_subdirectory(${CAUDIO_DIR} EXCLUDE_FROM_ALL) #irrlicht stuff -set(IRRLICHT_INC_DIR /usr/include/irrlicht) +if (UNIX) + set(IRRLICHT_INC_DIR /usr/include/irrlicht) +endif() set(IRRLICHT_TARGET Irrlicht) project(${FS_TARGET}) @@ -52,5 +54,7 @@ if(UNIX) # relocatable linking for unixoids set_target_properties(flasim PROPERTIES LINK_FLAGS "-Wl,-rpath,$ORIGIN/") endif() +target_link_directories(${FS_TARGET} PRIVATE ${IRRLICHT_LIB_DIR}) + target_link_libraries(${FS_TARGET} ${CAUDIO_TARGET} ${IRRLICHT_TARGET}) diff --git a/ext/cAudio b/ext/cAudio index ce5d039..a5db745 160000 --- a/ext/cAudio +++ b/ext/cAudio @@ -1 +1 @@ -Subproject commit ce5d03905a01c89c8d64dea9c3aa1cf63647d794 +Subproject commit a5db74568fb88e776b8937964bb16a1822242268 From d13ab1bc94aa0157d373c6e8b9f61cdd3935b38d Mon Sep 17 00:00:00 2001 From: Otto Naderer Date: Thu, 18 Aug 2022 16:55:51 +0200 Subject: [PATCH 2/3] updated caudio submod location --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 3bbb231..0399fb0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "ext/cAudio"] path = ext/cAudio - url = https://github.com/R4stl1n/cAudio.git + url = https://git.socialnerds.org/otto/caudio.git From 2507ce2051ae90459c9a5a2cd3d7789616b8c693 Mon Sep 17 00:00:00 2001 From: Otto Naderer Date: Thu, 18 Aug 2022 17:50:52 +0200 Subject: [PATCH 3/3] c++ std differentiation due to caudio --- CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 873348b..e0714a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,16 @@ -# cmake for tes, ottona, 2022-03-09 +# cmake for flasim, ottona, 2022-03-09 cmake_minimum_required(VERSION 3.10) set(FS_TARGET flasim) -set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD 17) +if (WIN32) # unfortunately necessary due to caudio's incompatibility with c++17 on win + set(CMAKE_CXX_STANDARD 11) +endif() + + set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/lib")