Attachment 830191 Details for Bug 1035756 – Patch to use systemlibs with cmake

[patch] Patch to use systemlibs with cmake

SuperTuxKart-0.8.1-sys-libs.patch (text/plain), 1.71 KB, created by Hans de Goede on 2013-11-28 11:49:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hans de Goede

Created: 2013-11-28 11:49:56 UTC

Size: 1.71 KB

patch

obsolete

>--- a/CMakeLists.txt~	2013-11-24 22:54:13.000000000 +0100
>+++ b/CMakeLists.txt	2013-11-28 12:33:26.902226729 +0100
>@@ -36,17 +36,11 @@
> set(STK_INSTALL_DATA_DIR "share/supertuxkart" CACHE
>     STRING "Install data folder to this directory, absolute or relative to CMAKE_INSTALL_PREFIX")
> 
>-# Build the Bullet physics library
>-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/bullet")
>-include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src")
>-
>-# Build the ENet UDP network library
>-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
>-include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")
>-
>-# Build the irrlicht library
>-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/irrlicht")
>-include_directories("${PROJECT_SOURCE_DIR}/lib/irrlicht/include")
>+# Include for the system Bullet physics library
>+include_directories("/usr/include/bullet")
>+
>+# Include for the system irrlicht library
>+include_directories("/usr/include/irrlicht")
> 
> # Build the Wiiuse library
> # Note: wiiuse MUST be declared after irrlicht, since otherwise
>@@ -129,13 +123,6 @@
> find_package(OpenGL REQUIRED)
> include_directories(${OPENGL_INCLUDE_DIR})
> 
>-if(UNIX AND NOT APPLE)
>-    find_library(IRRLICHT_XF86VM_LIBRARY Xxf86vm)
>-    mark_as_advanced(IRRLICHT_XF86VM_LIBRARY)
>-else()
>-    set(IRRLICHT_XF86VM_LIBRARY "")
>-endif()
>-
> 
>     
> # Set some compiler options
>@@ -222,14 +209,16 @@
> 
> # Common library dependencies
> target_link_libraries(supertuxkart
>-    bulletdynamics
>-    bulletcollision
>-    bulletmath
>+    BulletCollision
>+    BulletDynamics
>+    LinearMath
>     enet
>-    stkirrlicht
>+    Irrlicht
>+    IrrXML
>+    X11
>+    pthread
>     ${CURL_LIBRARIES}
>     ${OGGVORBIS_LIBRARIES}
>-    ${IRRLICHT_XF86VM_LIBRARY}
>     ${OPENAL_LIBRARY}
>     ${OPENGL_LIBRARIES})
>

Actions: View | Diff

Attachments on bug 1035756: 830191 | 830193 | 830194