gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mac OS X port progress 

Tested-by: Christopher Eklund <eklundchristopher@gmail.com>
Signed-off-by: otfallen <f.fallen45@gmail.com>
Signed-off-by: Christopher Eklund <eklundchristopher@gmail.com>
This commit is contained in:
otfallen 2012-09-29 22:57:14 +00:00
parent 3b7ad41740
commit f0e85e21b3
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/framework/CMakeLists.txt
View File

@ -254,8 +254,16 @@ if(FRAMEWORK_GRAPHICS)
set(framework_DEFINITIONS ${framework_DEFINITIONS} -DOPENGL_ES=1) set(framework_DEFINITIONS ${framework_DEFINITIONS} -DOPENGL_ES=1)
set(framework_INCLUDE_DIRS ${framework_INCLUDE_DIRS} ${EGL_INCLUDE_DIR} ${OPENGLES1_INCLUDE_DIR}) set(framework_INCLUDE_DIRS ${framework_INCLUDE_DIRS} ${EGL_INCLUDE_DIR} ${OPENGLES1_INCLUDE_DIR})
set(framework_LIBRARIES ${framework_LIBRARIES} ${EGL_LIBRARY} ${OPENGLES1_LIBRARY}) set(framework_LIBRARIES ${framework_LIBRARIES} ${EGL_LIBRARY} ${OPENGLES1_LIBRARY})
else()
## TODO: CMake Documentation says that this is not the right
# Thing for Mac OS X, but it works for now.
if(APPLE)
include_directories(/usr/X11R6/include/)
link_directories(/usr/X11R6/lib/)
SET(OPENGL_LIBRARIES GL)
else() else()
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
endif()
find_package(GLEW REQUIRED) find_package(GLEW REQUIRED)
set(framework_LIBRARIES ${framework_LIBRARIES} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES}) set(framework_LIBRARIES ${framework_LIBRARIES} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES})
endif() endif()
@ -394,6 +402,8 @@ if(FRAMEWORK_SOUND)
if(WIN32) if(WIN32)
set(framework_LIBRARIES ${framework_LIBRARIES} winmm) set(framework_LIBRARIES ${framework_LIBRARIES} winmm)
elseif(APPLE)
set(framework_LIBRARIES ${framework_LIBRARIES} System)
else() else()
set(framework_LIBRARIES ${framework_LIBRARIES} rt) set(framework_LIBRARIES ${framework_LIBRARIES} rt)
endif() endif()