Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-22 10:22:52 +01:00
Code Issues Projects Releases Activity

Fixed building on Mac.

Browse Source 
On Mavericks with Darwin Kernel Version 13.3.0 and
Apple LLVM version 5.1 (clang-503.0.40) (based on LLVM 3.4svn).
This commit is contained in:
Timmy Sjöstedt 2014-08-16 00:22:21 +02:00
commit c18badef48
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -22,6 +22,7 @@ ENDIF()
# Make GLM use radians
add_definitions(-DGLM_FORCE_RADIANS)
find_package(OpenGL REQUIRED)
find_package(Bullet REQUIRED)
IF(BUILD_OLD_TOOLS)

1
rwengine/include/script/ScriptTypes.hpp
View File

@ -3,6 +3,7 @@
#define _SCRIPTTYPES_HPP_
#include <cstdint>
#include <map>
#include <string>
#include <vector>
#include <functional>

2
rwgame/CMakeLists.txt
View File

@ -12,6 +12,6 @@ add_executable(rwgame
include_directories("${CMAKE_SOURCE_DIR}/rwengine/include" ${BULLET_INCLUDE_DIR})
target_link_libraries( rwgame rwengine sfml-graphics sfml-window sfml-system GL GLEW ${BULLET_LIBRARIES} )
target_link_libraries( rwgame rwengine sfml-graphics sfml-window sfml-system ${OPENGL_LIBRARIES} GLEW ${BULLET_LIBRARIES} iconv )
install(TARGETS rwgame RUNTIME DESTINATION bin)

2
rwviewer/CMakeLists.txt
View File

@ -17,7 +17,7 @@ add_executable(rwviewer
include_directories("${CMAKE_SOURCE_DIR}/rwengine/include" ${BULLET_INCLUDE_DIR})
target_link_libraries(rwviewer rwengine sfml-graphics sfml-system GL GLEW ${BULLET_LIBRARIES})
target_link_libraries(rwviewer rwengine sfml-graphics sfml-system ${OPENGL_LIBRARIES} GLEW ${BULLET_LIBRARIES} iconv)
qt5_use_modules(rwviewer Widgets OpenGL)
install(TARGETS rwviewer RUNTIME DESTINATION bin)

4
tests/CMakeLists.txt
View File

@ -7,8 +7,8 @@ include_directories(include)
find_package(Boost COMPONENTS unit_test_framework REQUIRED)
include_directories("${CMAKE_SOURCE_DIR}/rwengine/include" "${CMAKE_SOURCE_DIR}/rwgame" /usr/include/bullet)
include_directories("${CMAKE_SOURCE_DIR}/rwengine/include" "${CMAKE_SOURCE_DIR}/rwgame" ${BULLET_INCLUDE_DIR})
target_link_libraries(run_tests rwengine sfml-window sfml-system sfml-graphics GL GLEW BulletDynamics BulletCollision LinearMath ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
target_link_libraries(run_tests rwengine sfml-window sfml-system sfml-graphics ${OPENGL_LIBRARIES} GLEW BulletDynamics BulletCollision LinearMath ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} iconv)
add_test(UnitTests run_tests)