Skip to content

Commit

Permalink
Issue #138 - now compiles, links and runs on my Mint VM.
Browse files Browse the repository at this point in the history
  • Loading branch information
thebracket committed Jan 31, 2018
1 parent 2a13240 commit 0dacfe9
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,38 +12,32 @@ if(CCACHE_FOUND)
set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
endif(CCACHE_FOUND)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR -Wno-deprecated-declarations -O3 -march=core2 -g -fopenmp -ffast-math -funroll-loops -msse2 -mfpmath=sse")
#set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
#set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")

#find_package(PkgConfig REQUIRED)

# Require CURL (for telemetry)
find_package(CURL REQUIRED)
include_directories(${CURL_INCLUDE_DIRS})
link_libraries(${CURL_LIBRARIES})

# Require Lua
if(NOT MINGW)
find_package(Lua 5.1 REQUIRED)
include_directories(${LUA_INCLUDE_DIR})
link_libraries(${LUA_LIBRARIES})
#message("Lua libraries detected (should be both liblua and liblualib): " ${LUA_LIBRARIES} ${LUA_LIBRARY})
endif(NOT MINGW)

# Require GLEW
find_package(GLEW REQUIRED)
include_directories(${GLEW_INCLUDE_DIRS})
link_libraries(${GLEW_LIBRARIES})

# Require GLFW
find_package(glfw3 REQUIRED)
#find_package(glfw3 REQUIRED)
include_directories(${GLFW3_INCLUDE_DIRS})
link_libraries(${GLFW3_LIBRARIES})

# Require OpenGL
find_package(OpenGL REQUIRED)
include_directories( ${OPENGL_INCLUDE_DIRS})
link_libraries(${OPENGL_LIBRARIES})

# Require GLM
find_package(GLM REQUIRED)
Expand All @@ -66,12 +60,10 @@ include_directories(${CEREAL_INCLUDE_DIR})
# Zlib
find_package(ZLIB REQUIRED)
include_directories(${ZLIB_INCLUDE_DIRS})
link_libraries(${ZLIB_LIBRARIES})

#GLM
find_package(GLM REQUIRED)
include_directories(${GLM_INCLUDE_DIR})
link_libraries(${GLM_LIBRARIES})

# Include the main src folder, to keep stdafx happy
include_directories(${PROJECT_SOURCE_DIR})
Expand Down Expand Up @@ -339,9 +331,16 @@ target_link_libraries(noxfutura
systemsdamage
systemsgui
)
#target_link_libraries(noxfutura ${LUA_LIBRARIES})
#target_link_libraries(noxfutura liblua)
target_link_libraries(noxfutura ${CURL_LIBRARIES})
target_link_libraries(noxfutura ${LUA_LIBRARIES})
target_link_libraries(noxfutura ${GLEW_LIBRARIES})
target_link_libraries(noxfutura ${GLFW3_LIBRARIES})
target_link_libraries(noxfutura ${OPENGL_LIBRARIES})
target_link_libraries(noxfutura ${Boost_LIBRARIES})
target_link_libraries(noxfutura ${ZLIB_LIBRARIES})
target_link_libraries(noxfutura ${GLM_LIBRARIES})
target_link_libraries(planet ${ZLIB_LIBRARIES})
target_link_libraries(raws ${LUA_LIBRARIES})
target_link_libraries(noxfutura glfw)
cotire(noxfutura)
cotire(bengine)
Expand Down

0 comments on commit 0dacfe9

Please sign in to comment.