merge winbuild, caudio remake
This commit is contained in:
commit
d85b61c3ef
|
@ -1,3 +1,3 @@
|
||||||
[submodule "ext/cAudio"]
|
[submodule "ext/cAudio"]
|
||||||
path = ext/cAudio
|
path = ext/cAudio
|
||||||
url = https://github.com/R4stl1n/cAudio.git
|
url = https://git.socialnerds.org/otto/caudio.git
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# cmake for tes, ottona, 2022-03-09
|
# cmake for flasim, ottona, 2022-03-09
|
||||||
|
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.10)
|
cmake_minimum_required(VERSION 3.10)
|
||||||
|
@ -6,6 +6,11 @@ cmake_minimum_required(VERSION 3.10)
|
||||||
set(FS_TARGET flasim)
|
set(FS_TARGET flasim)
|
||||||
|
|
||||||
set(CMAKE_CXX_STANDARD 17)
|
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_CXX_STANDARD_REQUIRED ON)
|
||||||
|
|
||||||
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/lib")
|
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/lib")
|
||||||
|
@ -25,7 +30,9 @@ add_subdirectory(${CAUDIO_DIR} EXCLUDE_FROM_ALL)
|
||||||
|
|
||||||
|
|
||||||
#irrlicht stuff
|
#irrlicht stuff
|
||||||
set(IRRLICHT_INC_DIR /usr/include/irrlicht)
|
if (UNIX)
|
||||||
|
set(IRRLICHT_INC_DIR /usr/include/irrlicht)
|
||||||
|
endif()
|
||||||
set(IRRLICHT_TARGET Irrlicht)
|
set(IRRLICHT_TARGET Irrlicht)
|
||||||
|
|
||||||
project(${FS_TARGET})
|
project(${FS_TARGET})
|
||||||
|
@ -52,5 +59,7 @@ if(UNIX) # relocatable linking for unixoids
|
||||||
set_target_properties(flasim PROPERTIES LINK_FLAGS "-Wl,-rpath,$ORIGIN/")
|
set_target_properties(flasim PROPERTIES LINK_FLAGS "-Wl,-rpath,$ORIGIN/")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
target_link_directories(${FS_TARGET} PRIVATE ${IRRLICHT_LIB_DIR})
|
||||||
|
|
||||||
target_link_libraries(${FS_TARGET} ${CAUDIO_TARGET} ${IRRLICHT_TARGET})
|
target_link_libraries(${FS_TARGET} ${CAUDIO_TARGET} ${IRRLICHT_TARGET})
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit ce5d03905a01c89c8d64dea9c3aa1cf63647d794
|
Subproject commit a5db74568fb88e776b8937964bb16a1822242268
|
Loading…
Reference in New Issue