edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #781 from Learath2/dd_pr_cmakeosx

Browse source 
Fix OSX cmake build
This commit is contained in:
Dennis Felsing 2017-06-09 17:36:44 +02:00 committed by GitHub
parent 1a9710ae5e 3406f01ff9
commit 9fe362e099
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
CMakeLists.txt
View file

@ -118,6 +118,9 @@ endif()
if(TARGET_OS STREQUAL "windows") if(TARGET_OS STREQUAL "windows")
set(PLATFORM_CLIENT_LIBS opengl32 glu32 winmm) set(PLATFORM_CLIENT_LIBS opengl32 glu32 winmm)
set(PLATFORM_LIBS ws2_32) # Windows sockets set(PLATFORM_LIBS ws2_32) # Windows sockets
elseif(TARGET_OS STREQUAL "mac")
set(PLATFORM_CLIENT_LIBS "-framework OpenGL" "-framework Cocoa" "-framework AGL" "-framework Carbon" "-framework NotificationCenter")
set(PLATFORM_SERVER_LIBS "-framework Carbon")
else() else()
set(PLATFORM_CLIENT_LIBS GL GLU X11) set(PLATFORM_CLIENT_LIBS GL GLU X11)
if(TARGET_OS STREQUAL "linux") if(TARGET_OS STREQUAL "linux")
@ -252,6 +255,15 @@ else()
set(DEP_WEBSOCKETS) set(DEP_WEBSOCKETS)
endif() endif()
if(TARGET_OS STREQUAL "mac")
file(GLOB DEP_OSX_SRC "src/osx/*.mm")
add_library(osx EXCLUDE_FROM_ALL OBJECT ${DEP_OSX_SRC})
set(DEP_OSX $<TARGET_OBJECTS:osx>)
list(APPEND TARGETS_DEP osx)
else()
set(DEP_OSX)
endif()
set(DEPS ${DEP_MD5} ${DEP_WEBSOCKETS} ${DEP_ZLIB}) set(DEPS ${DEP_MD5} ${DEP_WEBSOCKETS} ${DEP_ZLIB})
# Libraries # Libraries
@ -275,7 +287,7 @@ if(CLIENT)
set(GAME_GENERATED_CLIENT "src/game/generated/client_data.cpp" "src/game/generated/client_data.h") set(GAME_GENERATED_CLIENT "src/game/generated/client_data.cpp" "src/game/generated/client_data.h")
set(CLIENT_SRC ${ENGINE_CLIENT} ${GAME_CLIENT} ${GAME_EDITOR} ${GAME_GENERATED_CLIENT}) set(CLIENT_SRC ${ENGINE_CLIENT} ${GAME_CLIENT} ${GAME_EDITOR} ${GAME_GENERATED_CLIENT})
set(DEPS_CLIENT ${DEPS} ${DEP_JSON} ${DEP_PNG} ${DEP_WAV}) set(DEPS_CLIENT ${DEPS} ${DEP_JSON} ${DEP_PNG} ${DEP_WAV} ${DEP_OSX})
# Libraries # Libraries
set(LIBS_CLIENT set(LIBS_CLIENT
@ -337,7 +349,7 @@ else()
endif() endif()
# Libraries # Libraries
set(LIBS_SERVER ${LIBS} ${MYSQL_LIBRARIES}) set(LIBS_SERVER ${LIBS} ${MYSQL_LIBRARIES} ${PLATFORM_SERVER_LIBS})
# Target # Target
set(TARGET_SERVER ${SERVER_EXECUTABLE}) set(TARGET_SERVER ${SERVER_EXECUTABLE})

6
src/engine/client/client.cpp
View file

@ -3482,14 +3482,14 @@ static CClient *CreateClient()
Upstream latency Upstream latency
*/ */
#if defined(CONF_PLATFORM_MACOSX) || defined(__ANDROID__) /*#if defined(CONF_PLATFORM_MACOSX) || defined(__ANDROID__)
extern "C" int SDL_main(int argc, char **argv_) // ignore_convention extern "C" int SDL_main(int argc, char **argv_) // ignore_convention
{ {
const char **argv = const_cast<const char **>(argv_); const char **argv = const_cast<const char **>(argv_);
#else #else*/
int main(int argc, const char **argv) // ignore_convention int main(int argc, const char **argv) // ignore_convention
{ {
#endif //#endif
#if defined(CONF_FAMILY_WINDOWS) #if defined(CONF_FAMILY_WINDOWS)
for(int i = 1; i < argc; i++) // ignore_convention for(int i = 1; i < argc; i++) // ignore_convention
{ {

0
src/osx/notification.m → src/osx/notification.mm
View file