Stratagus

Merge lp:~timfelgentreff/stratagus/stratagus into lp:stratagus

  1. stratagus
  2. Merge into trunk
Proposed by timfelgentreff
Status: Merged
Approved by: cybermind
Approved revision: 8816
Merged at revision: 8898
Proposed branch: lp:~timfelgentreff/stratagus/stratagus
Merge into: lp:stratagus
Diff against target: 22 lines (+5/-0)
1 file modified
CMakeLists.txt (+5/-0)
To merge this branch: bzr merge lp:~timfelgentreff/stratagus/stratagus
Reviewer Review Type Date Requested Status
Stratagus Pending
Review via email: mp+188857@code.launchpad.net

Description of the change

This adds flags link SDL and libpng on Mac OS X. Looks small enough to me, but I don't know enough about cmake to decide whether this can go in.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-09-01 05:44:48 +0000
3+++ CMakeLists.txt 2013-10-02 14:36:35 +0000
4@@ -811,6 +811,7 @@
5
6 if(APPLE)
7 add_definitions(-DUSE_MAC)
8+ set(SDL_LIBRARY ${SDL_LIBRARY} SDLmain)
9 endif()
10
11 if(BSD)
12@@ -1070,6 +1071,10 @@
13 set_target_properties(stratagus PROPERTIES LINK_FLAGS "${LINK_FLAGS} -static-libgcc -static-libstdc++ -Wl,--stack,10485760")
14 endif()
15
16+if(APPLE)
17+ set_target_properties(stratagus PROPERTIES LINK_FLAGS "${LINK_FLAGS} -framework libpng -lSDLmain")
18+endif()
19+
20 ########### next target ###############
21
22 set(metaserver_SRCS

Subscribers

People subscribed via source and target branches

to status/vote changes: