diff --git a/CMakeLists.txt b/CMakeLists.txt index d7d1a848..44d5d071 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,8 +80,6 @@ else() set(LOVR_HEADSET src/headset/openvr.c) endif() -add_executable(lovr ${LOVR_SRC} ${LOVR_HEADSET}) - if(EMSCRIPTEN) set(CMAKE_EXECUTABLE_SUFFIX ".html") add_definitions(-s USE_ZLIB=1 -s ASSERTIONS=2 -s FULL_ES2=1 -O3 -s AGGRESSIVE_VARIABLE_ELIMINATION=1 -s NO_EXIT_RUNTIME=1) @@ -91,8 +89,6 @@ if(EMSCRIPTEN) set(ZLIB_INCLUDE_DIR .) endif() -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src) - # Lua if(EMSCRIPTEN) option(LUA_USE_RELATIVE_LOADLIB OFF) @@ -224,6 +220,8 @@ endif() if (WIN32 OR EMSCRIPTEN) add_subdirectory(deps/ode ode) include_directories(deps/ode/include) + include_directories("${CMAKE_CURRENT_BINARY_DIR}/ode/include") + add_definitions(-DdSINGLE) set(LOVR_ODE ode) elseif(APPLE) pkg_search_module(ODE REQUIRED ode) @@ -256,6 +254,10 @@ if(NOT EMSCRIPTEN) set(LOVR_OPENVR openvr_api) endif() +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src) + +add_executable(lovr ${LOVR_SRC} ${LOVR_HEADSET}) + set(LOVR_LIB ${LOVR_LUA} ${LOVR_GL}