BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Semi-working Linux build

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