Merge pull request #1 from ZachHaber/master

Updating for changes to gamebryo
This commit is contained in:
Brian Munro
2017-01-17 10:44:27 -08:00
committed by GitHub
2 changed files with 4 additions and 1 deletions
+1
View File
@@ -8,6 +8,7 @@ SET(DEPENDENCIES_DIR CACHE PATH "")
# hint to find qt in dependencies path
LIST(APPEND CMAKE_PREFIX_PATH ${DEPENDENCIES_DIR}/qt5/lib/cmake)
LIST(APPEND CMAKE_PREFIX_PATH ${DEPENDENCIES_DIR}/lz4/dll)
FILE(GLOB_RECURSE BOOST_ROOT ${DEPENDENCIES_DIR}/boost*/project-config.jam)
GET_FILENAME_COMPONENT(BOOST_ROOT ${BOOST_ROOT} DIRECTORY)
+3 -1
View File
@@ -38,7 +38,8 @@ INCLUDE_DIRECTORIES(${project_path}/uibase/src
${project_path}/game_features/src
${project_path}/game_gamebryo/src)
LINK_DIRECTORIES(${project_path}/uibase/build/src
${lib_path})
${lib_path}
${project_path}/../lz4/dll)
ADD_LIBRARY(${PROJ_NAME} SHARED ${${PROJ_NAME}_HDRS} ${${PROJ_NAME}_SRCS} ${${PROJ_NAME}_UIHDRS} ${${PROJ_NAME}_RCCPPS} ${${PROJ_NAME}_translations_qm})
@@ -47,6 +48,7 @@ TARGET_LINK_LIBRARIES(${PROJ_NAME}
${Boost_LIBRARIES}
uibase
Version
liblz4
game_gamebryo)
IF(MSVC)