Blob Blame History Raw
diff -urN supertux-0.3.4.old/CMakeLists.txt supertux-0.3.4/CMakeLists.txt
--- supertux-0.3.4.old/CMakeLists.txt	2013-07-09 00:03:39.000000000 +0100
+++ supertux-0.3.4/CMakeLists.txt	2014-11-11 09:07:18.163568669 +0000
@@ -148,19 +148,10 @@
 
 INCLUDE(ConfigureChecks)
 
-## Also execute instructions in external/squirrel/CMakeLists.txt
-
-ADD_SUBDIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel)
-
-## Add squirrel lib dir to search path
-
-LINK_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/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/)
@@ -342,6 +333,7 @@
 ## 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})