Simplify CMakeLists;

This commit is contained in:
bjorn 2017-06-01 22:06:13 -07:00
parent 338a544c78
commit 851e528d57
1 changed files with 1 additions and 5 deletions

View File

@ -201,7 +201,6 @@ endif()
# FreeType # FreeType
if (EMSCRIPTEN) if (EMSCRIPTEN)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s USE_FREETYPE=1") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s USE_FREETYPE=1")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_FREETYPE=1")
elseif (WIN32) elseif (WIN32)
set(BUILD_SHARED_LIBS OFF) set(BUILD_SHARED_LIBS OFF)
set(FREETYPE_NO_DIST TRUE CACHE BOOL "") set(FREETYPE_NO_DIST TRUE CACHE BOOL "")
@ -254,7 +253,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src)
add_executable(lovr ${LOVR_SRC} ${LOVR_HEADSET}) add_executable(lovr ${LOVR_SRC} ${LOVR_HEADSET})
set(LOVR_LIB target_link_libraries(lovr
${LOVR_LUA} ${LOVR_LUA}
${LOVR_GL} ${LOVR_GL}
${LOVR_GLFW} ${LOVR_GLFW}
@ -266,8 +265,6 @@ set(LOVR_LIB
${LOVR_ODE} ${LOVR_ODE}
) )
target_link_libraries(lovr ${LOVR_LIB})
if(WIN32) if(WIN32)
move_dll(${LOVR_LUA}) move_dll(${LOVR_LUA})
move_dll(${LOVR_GLFW}) move_dll(${LOVR_GLFW})
@ -275,5 +272,4 @@ if(WIN32)
move_dll(${LOVR_ASSIMP}) move_dll(${LOVR_ASSIMP})
move_dll(${LOVR_OPENAL}) move_dll(${LOVR_OPENAL})
move_dll(${LOVR_OPENVR}) move_dll(${LOVR_OPENVR})
move_dll(${LOVR_FREETYPE})
endif() endif()