| 1 |
hasufell 14/08/24 16:24:11 |
| 2 |
|
| 3 |
Added: dustrac-1.7.3-cmake.patch |
| 4 |
Removed: dustrac-1.6.2-cmake.patch |
| 5 |
dustrac-1.6.2-desktopfile.patch |
| 6 |
Log: |
| 7 |
version bump, rm old |
| 8 |
|
| 9 |
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key BDEED020) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 games-sports/dustrac/files/dustrac-1.7.3-cmake.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-sports/dustrac/files/dustrac-1.7.3-cmake.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-sports/dustrac/files/dustrac-1.7.3-cmake.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: dustrac-1.7.3-cmake.patch |
| 18 |
=================================================================== |
| 19 |
From: Julian Ospald <hasufell@g.o> |
| 20 |
Date: Wed Dec 25 22:55:09 UTC 2013 |
| 21 |
Subject: respect flags, fix installation |
| 22 |
|
| 23 |
--- dustrac-1.6.2/CMakeLists.txt |
| 24 |
+++ dustrac-1.6.2/CMakeLists.txt |
| 25 |
@@ -43,7 +43,7 @@ |
| 26 |
include("InstallWindows.cmake") |
| 27 |
endif() |
| 28 |
|
| 29 |
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -W -Wall -O3 -pedantic") |
| 30 |
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -W -Wall") |
| 31 |
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fomit-frame-pointer -finline-functions -ffast-math") |
| 32 |
|
| 33 |
set(GAME_BINARY_NAME "dustrac-game") |
| 34 |
--- dustrac-1.6.2/src/game/CMakeLists.txt |
| 35 |
+++ dustrac-1.6.2/src/game/CMakeLists.txt |
| 36 |
@@ -128,16 +128,11 @@ |
| 37 |
|
| 38 |
# Copy desktop file |
| 39 |
if(ReleaseBuild AND UNIX) |
| 40 |
- set(DesktopFileSourcePath) |
| 41 |
if(USC) |
| 42 |
- set(DesktopFileSourcePath ${CMAKE_SOURCE_DIR}/src/dustrac-game.desktop.opt.in) |
| 43 |
+ configure_file(${CMAKE_SOURCE_DIR}/src/dustrac-game.desktop.opt.in ${CMAKE_BINARY_DIR}/src/dustrac-game.desktop) |
| 44 |
else() |
| 45 |
- set(DesktopFileSourcePath ${CMAKE_SOURCE_DIR}/src/dustrac-game.desktop.in) |
| 46 |
+ configure_file(${CMAKE_SOURCE_DIR}/src/dustrac-game.desktop.in ${CMAKE_BINARY_DIR}/src/dustrac-game.desktop) |
| 47 |
endif() |
| 48 |
- add_custom_target(desktop-file-game ALL |
| 49 |
- COMMAND cmake -E copy ${DesktopFileSourcePath} |
| 50 |
- ${CMAKE_BINARY_DIR}/dustrac-game.desktop |
| 51 |
- DEPENDS ${GAME_BINARY_NAME}) |
| 52 |
endif() |
| 53 |
|
| 54 |
# Resource compilation for MinGW |
| 55 |
--- dustrac-1.6.2/src/editor/CMakeLists.txt |
| 56 |
+++ dustrac-1.6.2/src/editor/CMakeLists.txt |
| 57 |
@@ -76,16 +76,11 @@ |
| 58 |
|
| 59 |
# Copy desktop file |
| 60 |
if(ReleaseBuild AND UNIX) |
| 61 |
- set(DesktopFileSourcePath) |
| 62 |
if(USC) |
| 63 |
- set(DesktopFileSourcePath ${CMAKE_SOURCE_DIR}/src/dustrac-editor.desktop.opt.in) |
| 64 |
+ configure_file(${CMAKE_SOURCE_DIR}/src/dustrac-editor.desktop.opt.in ${CMAKE_BINARY_DIR}/src/dustrac-editor.desktop) |
| 65 |
else() |
| 66 |
- set(DesktopFileSourcePath ${CMAKE_SOURCE_DIR}/src/dustrac-editor.desktop.in) |
| 67 |
+ configure_file(${CMAKE_SOURCE_DIR}/src/dustrac-editor.desktop.in ${CMAKE_BINARY_DIR}/src/dustrac-editor.desktop) |
| 68 |
endif() |
| 69 |
- add_custom_target(desktop-file-editor ALL |
| 70 |
- COMMAND cmake -E copy ${DesktopFileSourcePath} |
| 71 |
- ${CMAKE_BINARY_DIR}/dustrac-editor.desktop |
| 72 |
- DEPENDS ${EDITOR_BINARY_NAME}) |
| 73 |
endif() |
| 74 |
|
| 75 |
# Add the executable |
| 76 |
--- dustrac-1.6.2/InstallLinux.cmake |
| 77 |
+++ dustrac-1.6.2/InstallLinux.cmake |
| 78 |
@@ -58,7 +58,7 @@ |
| 79 |
install(FILES data/fonts.conf DESTINATION ${DATA_PATH}) |
| 80 |
install(FILES data/meshes.conf DESTINATION ${DATA_PATH}) |
| 81 |
install(FILES data/textures.conf DESTINATION ${DATA_PATH}) |
| 82 |
- install(FILES AUTHORS CHANGELOG COPYING README DESTINATION ${DOC_PATH}) |
| 83 |
+ install(FILES AUTHORS CHANGELOG README DESTINATION ${DOC_PATH}) |
| 84 |
install(DIRECTORY data/images DESTINATION ${DATA_PATH} FILES_MATCHING PATTERN "*.jpg") |
| 85 |
install(DIRECTORY data/images DESTINATION ${DATA_PATH} FILES_MATCHING PATTERN "*.png") |
| 86 |
install(DIRECTORY data/levels DESTINATION ${DATA_PATH} FILES_MATCHING PATTERN "*.trk") |
| 87 |
@@ -69,8 +69,8 @@ |
| 88 |
|
| 89 |
if(ReleaseBuild) |
| 90 |
# Install .desktop files |
| 91 |
- install(FILES dustrac-game.desktop DESTINATION share/applications) |
| 92 |
- install(FILES dustrac-editor.desktop DESTINATION share/applications) |
| 93 |
+ install(FILES ${CMAKE_BINARY_DIR}/src/dustrac-game.desktop DESTINATION share/applications) |
| 94 |
+ install(FILES ${CMAKE_BINARY_DIR}/src/dustrac-editor.desktop DESTINATION share/applications) |
| 95 |
|
| 96 |
# Install icons |
| 97 |
install(FILES data/icons/dustrac-game.png DESTINATION share/pixmaps) |
Archives