gfxdev
/
flasim
1
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

downgrade c++11 for now due to caudio, latter now own hosted repo

This commit is contained in:
Otto Naderer 2022-08-18 15:48:23 +02:00
parent bba4a3806c
commit d39a74277c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -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})

2
ext/cAudio

@ -1 +1 @@
Subproject commit ce5d03905a01c89c8d64dea9c3aa1cf63647d794
Subproject commit a5db74568fb88e776b8937964bb16a1822242268