Semi-working Linux build

This commit is contained in:
2015-09-08 21:47:10 +02:00
parent 17a00fef85
commit 8833377855
2 changed files with 11 additions and 3 deletions
+4 -3
View File
@@ -5,7 +5,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "${PROJECT_SOURCE_DIR}/deps/include")
if(MINGW)
set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/deps/lib/mingw/x64")
elseif(MSVC)
@@ -16,8 +15,10 @@ endif()
if(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -fpermissive")
# Needed to link with debug version of bgfx
#set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -ldl")
if(UNIX)
# Needed to link with debug version of bgfx on linux
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -ldl")
endif()
endif()
set(BUILD_SHARED_LIBS OFF)
+7
View File
@@ -9,6 +9,9 @@ find_package(ZLIB REQUIRED)
find_package(PNG REQUIRED)
find_package(BGFX REQUIRED)
# GLM
if(UNIX)
find_package(X11 REQUIRED)
endif()
set(INCLUDE_PATH ${CMAKE_SOURCE_DIR}/include)
include_directories(
@@ -19,6 +22,7 @@ include_directories(
${Boost_INCLUDE_DIRS}
${assimp_INCLUDE_DIRS}
${PNG_INCLUDE_DIRS}
${X11_INCLUDE_DIRS}
${BGFX_INCLUDE_DIRS}
)
@@ -62,6 +66,8 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
endif()
add_definitions(-DBGFX_CONFIG_RENDERER_OPENGL=33)
add_library(game ${SOURCE_FILES})
target_link_libraries(game
${OPENGL_LIBRARIES}
@@ -70,6 +76,7 @@ target_link_libraries(game
${Boost_LIBRARIES}
${assimp_LIBRARIES}
${PNG_LIBRARIES}
${X11_LIBRARIES}
${BGFX_LIBRARIES}
)