lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Tranquilize OpenAL;

This commit is contained in:
bjorn 2017-11-20 22:03:57 -08:00
parent 602e0ced7d
commit 2d588638e7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -59,11 +59,11 @@ if(EMSCRIPTEN)
set(ZLIB_LIBRARIES "-s USE_ZLIB=1") set(ZLIB_LIBRARIES "-s USE_ZLIB=1")
set(ZLIB_INCLUDE_DIR "${EMSCRIPTEN_ROOT_PATH}/tests/zlib") set(ZLIB_INCLUDE_DIR "${EMSCRIPTEN_ROOT_PATH}/tests/zlib")
add_subdirectory(deps/assimp assimp) add_subdirectory(deps/assimp assimp)
include_directories(deps/assimp/include) include_directories(deps/assimp/include ${CMAKE_BINARY_DIR}/assimp/include)
set(LOVR_ASSIMP assimp) set(LOVR_ASSIMP assimp)
elseif(WIN32) elseif(WIN32)
add_subdirectory(deps/assimp assimp) add_subdirectory(deps/assimp assimp)
include_directories(deps/assimp/include) include_directories(deps/assimp/include ${CMAKE_BINARY_DIR}/assimp/include)
set(LOVR_ASSIMP assimp) set(LOVR_ASSIMP assimp)
else() else()
pkg_search_module(ASSIMP REQUIRED assimp) pkg_search_module(ASSIMP REQUIRED assimp)
@ -174,6 +174,7 @@ if(EMSCRIPTEN)
elseif(WIN32) elseif(WIN32)
add_subdirectory(deps/openal-soft openal) add_subdirectory(deps/openal-soft openal)
include_directories(deps/openal-soft/include) include_directories(deps/openal-soft/include)
set_target_properties(OpenAL32 PROPERTIES COMPILE_FLAGS "/wd4005 /wd4098")
set(LOVR_OPENAL OpenAL32) set(LOVR_OPENAL OpenAL32)
else() else()
pkg_search_module(OPENAL openal-soft) pkg_search_module(OPENAL openal-soft)