| 1 |
hasufell 12/09/29 20:21:46 |
| 2 |
|
| 3 |
Modified: opensonic-0.1.4-r1-cmake.patch |
| 4 |
Log: |
| 5 |
fix compilation for --as-needed |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha134/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: opensonic-0.1.4-r1-cmake.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- opensonic-0.1.4-r1-cmake.patch 17 May 2012 00:42:37 -0000 1.1 |
| 23 |
+++ opensonic-0.1.4-r1-cmake.patch 29 Sep 2012 20:21:46 -0000 1.2 |
| 24 |
@@ -6,6 +6,7 @@ |
| 25 |
remove "-O2" from pre-defined CFLAGS |
| 26 |
make paths modifiable |
| 27 |
add rules for icon, desktop-file and game-wrapper |
| 28 |
+fix compilation for as-needed |
| 29 |
|
| 30 |
--- CMakeLists.txt |
| 31 |
+++ CMakeLists.txt |
| 32 |
@@ -39,16 +40,19 @@ |
| 33 |
IF(NOT ALLEGRO_UNIX_VERSION STREQUAL ALLEGRO_RECOMMENDED_VERSION) |
| 34 |
MESSAGE("\nWARNING: your Allegro version is ${ALLEGRO_UNIX_VERSION}. The recommended version is ${ALLEGRO_RECOMMENDED_VERSION}.\n ${GAME_NAME} may not compile properly!.\n") |
| 35 |
ENDIF(NOT ALLEGRO_UNIX_VERSION STREQUAL ALLEGRO_RECOMMENDED_VERSION) |
| 36 |
-@@ -251,7 +250,7 @@ |
| 37 |
+@@ -249,9 +248,8 @@ |
| 38 |
+ IF(UNIX) |
| 39 |
+ SET(GAME_SRCS ${GAME_SRCS} src/misc/iconlin.c) |
| 40 |
ADD_EXECUTABLE(${GAME_UNIXNAME} ${GAME_SRCS}) |
| 41 |
- SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES LINK_FLAGS ${ALLEGRO_UNIX_LIBS}) |
| 42 |
- TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} m logg vorbisfile vorbis ogg jpgalleg z png loadpng) |
| 43 |
+- SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES LINK_FLAGS ${ALLEGRO_UNIX_LIBS}) |
| 44 |
+- TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} m logg vorbisfile vorbis ogg jpgalleg z png loadpng) |
| 45 |
- SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES COMPILE_FLAGS "-Wall -O2 ${CFLAGS} ${CFLAGS_EXTRA}") |
| 46 |
++ TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} m logg vorbisfile vorbis ogg jpgalleg z png loadpng ${ALLEGRO_UNIX_LIBS}) |
| 47 |
+ SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES COMPILE_FLAGS "-Wall") |
| 48 |
ENDIF(UNIX) |
| 49 |
|
| 50 |
|
| 51 |
-@@ -407,19 +406,43 @@ |
| 52 |
+@@ -407,19 +405,43 @@ |
| 53 |
SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES PROJECT_NAME "${GAME_NAME}") |
Archives