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

Update CMakeLists;

This commit is contained in:
bjornbytes 2017-05-28 21:53:19 -07:00
parent 61eb7d0f40
commit 1fe86d5c71
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -80,8 +80,6 @@ else()
set(LOVR_HEADSET src/headset/openvr.c) set(LOVR_HEADSET src/headset/openvr.c)
endif() endif()
add_executable(lovr ${LOVR_SRC} ${LOVR_HEADSET})
if(EMSCRIPTEN) if(EMSCRIPTEN)
set(CMAKE_EXECUTABLE_SUFFIX ".html") 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) 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 .) set(ZLIB_INCLUDE_DIR .)
endif() endif()
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src)
# Lua # Lua
if(EMSCRIPTEN) if(EMSCRIPTEN)
option(LUA_USE_RELATIVE_LOADLIB OFF) option(LUA_USE_RELATIVE_LOADLIB OFF)
@ -224,6 +220,8 @@ endif()
if (WIN32 OR EMSCRIPTEN) if (WIN32 OR EMSCRIPTEN)
add_subdirectory(deps/ode ode) add_subdirectory(deps/ode ode)
include_directories(deps/ode/include) include_directories(deps/ode/include)
include_directories("${CMAKE_CURRENT_BINARY_DIR}/ode/include")
add_definitions(-DdSINGLE)
set(LOVR_ODE ode) set(LOVR_ODE ode)
elseif(APPLE) elseif(APPLE)
pkg_search_module(ODE REQUIRED ode) pkg_search_module(ODE REQUIRED ode)
@ -256,6 +254,10 @@ if(NOT EMSCRIPTEN)
set(LOVR_OPENVR openvr_api) set(LOVR_OPENVR openvr_api)
endif() endif()
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src)
add_executable(lovr ${LOVR_SRC} ${LOVR_HEADSET})
set(LOVR_LIB set(LOVR_LIB
${LOVR_LUA} ${LOVR_LUA}
${LOVR_GL} ${LOVR_GL}