packages (DEVEL): supertux/supertux-system_squirrel.patch (NEW) - use syste...
lisu
lisu at pld-linux.org
Fri Mar 11 10:31:17 CET 2011
Author: lisu Date: Fri Mar 11 09:31:17 2011 GMT
Module: packages Tag: DEVEL
---- Log message:
- use system squirrel libraries
---- Files affected:
packages/supertux:
supertux-system_squirrel.patch (NONE -> 1.1.2.1) (NEW)
---- Diffs:
================================================================
Index: packages/supertux/supertux-system_squirrel.patch
diff -u /dev/null packages/supertux/supertux-system_squirrel.patch:1.1.2.1
--- /dev/null Fri Mar 11 10:31:17 2011
+++ packages/supertux/supertux-system_squirrel.patch Fri Mar 11 10:31:12 2011
@@ -0,0 +1,31 @@
+diff -up supertux-0.3.3/CMakeLists.txt~ supertux-0.3.3/CMakeLists.txt
+--- supertux-0.3.3/CMakeLists.txt~ 2010-03-01 13:40:55.000000000 +0100
++++ supertux-0.3.3/CMakeLists.txt 2010-04-07 11:34:40.349816531 +0200
+@@ -147,19 +147,10 @@ SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURR
+
+ INCLUDE(ConfigureChecks)
+
+-## Also execute instructions in src/squirrel/CMakeLists.txt
+-
+-ADD_SUBDIRECTORY(external/squirrel)
+-
+-## Add squirrel lib dir to search path
+-
+-LINK_DIRECTORIES(external/squirrel)
+-
+ ## Some additional include paths
+
+ include_directories (${CMAKE_BINARY_DIR}/)
+ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/src/)
+-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel/include/)
+ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/tinygettext/)
+ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/findlocale/)
+ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/)
+@@ -325,6 +325,7 @@ ADD_DEPENDENCIES(supertux2 svnversion)
+ ## Link supertux binary with squirrel and other libraries
+
+ TARGET_LINK_LIBRARIES(supertux2 squirrel)
++TARGET_LINK_LIBRARIES(supertux2 sqstdlib)
+ TARGET_LINK_LIBRARIES(supertux2 ${SDL_LIBRARY})
+ TARGET_LINK_LIBRARIES(supertux2 ${SDLIMAGE_LIBRARY})
+ TARGET_LINK_LIBRARIES(supertux2 ${OPENAL_LIBRARY})
================================================================
More information about the pld-cvs-commit
mailing list