Attachment 404186 Details for Bug 575533 – patch to use system squirrel libs, not own copy

[patch] patch to use system squirrel libs, not own copy

supertux-0.3.3-squirrel.patch (text/plain), 3.56 KB, created by Nils Philippsen on 2010-04-02 14:02:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nils Philippsen

Created: 2010-04-02 14:02:24 UTC

Size: 3.56 KB

patch

obsolete

>diff -up supertux-0.3.3/CMakeLists.txt.squirrel supertux-0.3.3/CMakeLists.txt
>--- supertux-0.3.3/CMakeLists.txt.squirrel	2010-03-01 13:40:55.000000000 +0100
>+++ supertux-0.3.3/CMakeLists.txt	2010-04-02 13:25:30.964894224 +0200
>@@ -106,6 +106,9 @@ ENDIF(CURL_FOUND)
> #INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR})
> #LINK_LIBRARIES(${ICONV_LIBRARY})
> 
>+FIND_PACKAGE(Squirrel REQUIRED)
>+INCLUDE_DIRECTORIES(${SQUIRREL_INCLUDE_DIR})
>+
> ## Find revision of WC
> MARK_AS_ADVANCED(SVNVERSION_EXECUTABLE)
> FIND_PROGRAM(SVNVERSION_EXECUTABLE svnversion)
>@@ -147,19 +150,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/)
>@@ -333,7 +327,8 @@ ADD_DEPENDENCIES(supertux2 svnversion)
> 
> ## Link supertux binary with squirrel and other libraries
> 
>-TARGET_LINK_LIBRARIES(supertux2 squirrel)
>+TARGET_LINK_LIBRARIES(supertux2 ${SQUIRREL_LIBRARY})
>+TARGET_LINK_LIBRARIES(supertux2 ${SQSTDLIB_LIBRARY})
> TARGET_LINK_LIBRARIES(supertux2 ${SDL_LIBRARY})
> TARGET_LINK_LIBRARIES(supertux2 ${SDLIMAGE_LIBRARY})
> TARGET_LINK_LIBRARIES(supertux2 ${OPENAL_LIBRARY})
>diff -up supertux-0.3.3/mk/cmake/FindSquirrel.cmake.squirrel supertux-0.3.3/mk/cmake/FindSquirrel.cmake
>--- supertux-0.3.3/mk/cmake/FindSquirrel.cmake.squirrel	2010-04-02 13:24:31.911641355 +0200
>+++ supertux-0.3.3/mk/cmake/FindSquirrel.cmake	2010-04-02 13:24:31.911641355 +0200
>@@ -0,0 +1,66 @@
>+## Squirrel
>+
>+FIND_PATH(SQUIRREL_INCLUDE_DIR squirrel.h
>+    HINTS
>+    $ENV{SQUIRRELDIR}
>+    PATH_SUFFIXES include
>+    PATHS
>+    ~/Library/Frameworks
>+    /Library/Frameworks
>+    /usr/local/include/squirrel
>+    /usr/include/squirrel
>+    /usr/local/include
>+    /usr/include
>+    /sw/include/squirrel # Fink
>+    /sw/include
>+    /opt/local/include/squirrel # DarwinPorts
>+    /opt/local/include
>+    /opt/csw/include/squirrel # Blastwave
>+    /opt/csw/include
>+    /opt/include/squirrel
>+    /opt/include
>+)
>+
>+FIND_LIBRARY(SQUIRREL_LIBRARY
>+    NAMES squirrel
>+    HINTS
>+    $ENV{SQUIRRELDIR}
>+    PATH_SUFFIXES lib64 lib
>+    PATHS
>+    /usr/local
>+    /usr
>+    /sw
>+    /opt/local
>+    /opt/csw
>+    /opt
>+)
>+
>+FIND_LIBRARY(SQSTDLIB_LIBRARY
>+    NAMES sqstdlib
>+    HINTS
>+    $ENV{SQUIRRELDIR}
>+    PATH_SUFFIXES lib64 lib
>+    PATHS
>+    /usr/local
>+    /usr
>+    /sw
>+    /opt/local
>+    /opt/csw
>+    /opt
>+)
>+
>+IF(SQUIRREL_INCLUDE_DIR AND SQUIRREL_LIBRARY AND SQSTDLIB_LIBRARY)
>+    IF(NOT Squirrel_FIND_QUIETLY)
>+        MESSAGE(STATUS "Found Squirrel: ${SQUIRREL_LIBRARY} ${SQSTDLIB_LIBRARY}")
>+    ENDIF(NOT Squirrel_FIND_QUIETLY)
>+    SET(SQUIRREL_FOUND "YES")
>+ELSE(NOT SQUIRREL_INCLUDE_DIR AND SQUIRREL_LIBRARY AND SQSTDLIB_LIBRARY)
>+    IF(Squirrel_FIND_REQUIRED)
>+        MESSAGE(FATAL_ERROR "Could NOT find Squirrel libraries")
>+    ELSE(NOT Squirrel_FIND_REQUIRED)
>+        IF(NOT Squirrel_FIND_QUIETLY)
>+            MESSAGE(STATUS "Could NOT find Squirrel libraries")
>+        ENDIF(NOT Squirrel_FIND_QUIETLY)
>+    ENDIF(Squirrel_FIND_REQUIRED)
>+    SET(SQUIRREL_FOUND "NO")
>+ENDIF(SQUIRREL_INCLUDE_DIR AND SQUIRREL_LIBRARY AND SQSTDLIB_LIBRARY)

Actions: View | Diff

Attachments on bug 575533: 404185 | 404186 | 404187