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