Sophie

Sophie

distrib > Mandriva > 2010.2 > i586 > media > main-release-src > by-pkgid > 3ed25ece1cf79a2321e312c1ea5137a1 > files > 1

supertux-0.3.3-3mdv2010.1.src.rpm

diff -p -up supertux-0.3.3/CMakeLists.txt.0000 supertux-0.3.3/CMakeLists.txt
--- supertux-0.3.3/CMakeLists.txt.0000	2010-03-01 13:40:55.000000000 +0100
+++ supertux-0.3.3/CMakeLists.txt	2010-03-23 12:10:15.000000000 +0100
@@ -149,17 +149,17 @@ INCLUDE(ConfigureChecks)
 
 ## Also execute instructions in src/squirrel/CMakeLists.txt
 
-ADD_SUBDIRECTORY(external/squirrel)
+##ADD_SUBDIRECTORY(external/squirrel)
 
 ## Add squirrel lib dir to search path
 
-LINK_DIRECTORIES(external/squirrel)
+LINK_DIRECTORIES(/usr/lib/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/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/)
@@ -334,6 +334,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})