From: <fu...@us...> - 2011-07-24 15:29:16
|
Revision: 9341 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=9341&view=rev Author: funto66 Date: 2011-07-24 15:29:09 +0000 (Sun, 24 Jul 2011) Log Message: ----------- Removed private path for Irrlicht: one should use cmake . -DIRRLICHT_DIR=/path/to/irrlicht && make Modified Paths: -------------- main/trunk/CMakeLists.txt Modified: main/trunk/CMakeLists.txt =================================================================== --- main/trunk/CMakeLists.txt 2011-07-24 15:03:44 UTC (rev 9340) +++ main/trunk/CMakeLists.txt 2011-07-24 15:29:09 UTC (rev 9341) @@ -14,7 +14,7 @@ set(STK_SOURCE_DIR "src") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "bin") -set(IRRLICHT_DIR "/home/funto/projets/stk/irrlicht-trunk") +option(IRRLICHT_DIR "/path/to/irrlicht") # Build the Bullet physics library add_subdirectory("${STK_SOURCE_DIR}/bullet") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fu...@us...> - 2011-07-24 18:40:26
|
Revision: 9342 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=9342&view=rev Author: funto66 Date: 2011-07-24 18:40:20 +0000 (Sun, 24 Jul 2011) Log Message: ----------- Some updates to the CMake build system Modified Paths: -------------- main/trunk/CMakeLists.txt Modified: main/trunk/CMakeLists.txt =================================================================== --- main/trunk/CMakeLists.txt 2011-07-24 15:29:09 UTC (rev 9341) +++ main/trunk/CMakeLists.txt 2011-07-24 18:40:20 UTC (rev 9342) @@ -5,7 +5,6 @@ # TODO: allow to disable asserts (NDEBUG?) cmake_minimum_required(VERSION 2.8.1) -set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE) # allow endif() project(SuperTuxKart) @@ -14,30 +13,56 @@ set(STK_SOURCE_DIR "src") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "bin") -option(IRRLICHT_DIR "/path/to/irrlicht") +# Tweakable values +option(DEBUG "Enable debugging and turn assertions on" OFF) +option(USE_FRIBIDI "Support for right-to-left languages" ON) +set(IRRLICHT_DIR "/path/to/irrlicht" CACHE STRING "Path to Irrlicht") + # Build the Bullet physics library add_subdirectory("${STK_SOURCE_DIR}/bullet") # Build the ENet UDP network library add_subdirectory("${STK_SOURCE_DIR}/enet") -# Set include and lib paths +# Set include paths include_directories("${IRRLICHT_DIR}/include") include_directories("${STK_SOURCE_DIR}") include_directories("${STK_SOURCE_DIR}/enet/include") include_directories("${STK_SOURCE_DIR}/bullet/src") -link_directories("${IRRLICHT_DIR}/lib/Linux") + +# Set lib paths +if(APPLE) + link_directories("${IRRLICHT_DIR}/lib/MacOSX") +elseif(UNIX) + link_directories("${IRRLICHT_DIR}/lib/Linux") +elseif(MSVC) + link_directories("${IRRLICHT_DIR}/lib/Win32-visualstudio") +else() + link_directories("${IRRLICHT_DIR}/lib/Win32-gcc") +endif() + link_directories("${STK_SOURCE_DIR}/bullet") # Set some compiler options if(UNIX) -add_definitions(-Wall) -#add_definitions(-O3) + add_definitions(-Wall) + + if(DEBUG) + add_definitions(-g) + else() + add_definitions(-O3) + endif() endif() -add_definitions(-DHAVE_OGGVORBIS) -add_definitions(-DDEBUG) +add_definitions(-DHAVE_OGGVORBIS) # TODO: remove this switch + +if(DEBUG) + add_definitions(-DDEBUG) +else() + add_definitions(-DNDEBUG) +endif() + # TODO # include_directories("/usr/include/freetype2") #~ src/font_tool/CFontTool.cpp @@ -505,12 +530,23 @@ target_link_libraries(supertuxkart Irrlicht - GL bulletdynamics bulletcollision bulletmath enet - Xxf86vm - openal curl vorbisfile) + +if(USE_FRIBIDI) + target_link_libraries(supertuxkart + fribidi) +endif() + +if(UNIX) + target_link_libraries(supertuxkart + GL + openal + Xxf86vm) +elseif(APPLE) + # TODO! +endif() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hik...@us...> - 2011-08-25 04:26:02
|
Revision: 9621 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=9621&view=rev Author: hikerstk Date: 2011-08-25 04:25:55 +0000 (Thu, 25 Aug 2011) Log Message: ----------- Added newsly added files to cmake config file. Modified Paths: -------------- main/trunk/CMakeLists.txt Modified: main/trunk/CMakeLists.txt =================================================================== --- main/trunk/CMakeLists.txt 2011-08-25 01:52:06 UTC (rev 9620) +++ main/trunk/CMakeLists.txt 2011-08-25 04:25:55 UTC (rev 9621) @@ -204,6 +204,8 @@ src/graphics/hardware_skinning.cpp src/graphics/hardware_skinning.hpp src/graphics/hit_effect.hpp + src/graphics/hit_sfx.cpp + src/graphics/hit_sfx.hpp src/graphics/irr_driver.cpp src/graphics/irr_driver.hpp src/graphics/lod_node.cpp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2011-10-22 01:02:41
|
Revision: 10031 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=10031&view=rev Author: auria Date: 2011-10-22 01:02:35 +0000 (Sat, 22 Oct 2011) Log Message: ----------- Minor cleanup Modified Paths: -------------- main/trunk/CMakeLists.txt Modified: main/trunk/CMakeLists.txt =================================================================== --- main/trunk/CMakeLists.txt 2011-10-22 01:01:22 UTC (rev 10030) +++ main/trunk/CMakeLists.txt 2011-10-22 01:02:35 UTC (rev 10031) @@ -694,7 +694,7 @@ if(USE_FRIBIDI) if(APPLE) - target_link_libraries(supertuxkart /Library/Frameworks/fribidi.framework) + target_link_libraries(supertuxkart /Library/Frameworks/fribidi.framework) else() target_link_libraries(supertuxkart fribidi) endif() @@ -702,8 +702,7 @@ endif() if(UNIX AND NOT APPLE) - target_link_libraries(supertuxkart - Xxf86vm) + target_link_libraries(supertuxkart Xxf86vm) elseif(APPLE) # We could use smarter detection of the frameworks but supporting a single official setup makes things easy... target_link_libraries(supertuxkart /Library/Frameworks/IrrFramework.framework) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2011-10-24 23:57:02
|
Revision: 10037 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=10037&view=rev Author: auria Date: 2011-10-24 23:56:55 +0000 (Mon, 24 Oct 2011) Log Message: ----------- CMake tweak Modified Paths: -------------- main/trunk/CMakeLists.txt Modified: main/trunk/CMakeLists.txt =================================================================== --- main/trunk/CMakeLists.txt 2011-10-22 19:53:21 UTC (rev 10036) +++ main/trunk/CMakeLists.txt 2011-10-24 23:56:55 UTC (rev 10037) @@ -105,6 +105,8 @@ if(HAVE_IRRLICHT) message("-- Irrlicht found (in ${HAVE_IRRLICHT}/irrlicht.h)") + #include_directories(${IRRLICHT_DIR} ${IRRLICHT_DIR}/include /usr/include/irrlicht/ /usr/local/include/irrlicht/) + include_directories(${HAVE_IRRLICHT}) else() message(FATAL_ERROR "\n -- Irrlicht not found (can't locate irrlicht.h)\n Use -DIRRLICHT_DIR=/path/to/irrlicht") endif() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2011-11-18 20:58:42
|
Revision: 10227 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=10227&view=rev Author: auria Date: 2011-11-18 20:58:36 +0000 (Fri, 18 Nov 2011) Log Message: ----------- Link against pthread in cmake builds Modified Paths: -------------- main/trunk/CMakeLists.txt Modified: main/trunk/CMakeLists.txt =================================================================== --- main/trunk/CMakeLists.txt 2011-11-18 19:53:18 UTC (rev 10226) +++ main/trunk/CMakeLists.txt 2011-11-18 20:58:36 UTC (rev 10227) @@ -693,6 +693,7 @@ bulletcollision bulletmath enet + pthread ${CURL_LIBRARIES} ${OPENGL_LIBRARIES} ${OPENAL_LIBRARY} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <und...@us...> - 2012-03-16 23:15:30
|
Revision: 10982 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=10982&view=rev Author: undef-in-ed Date: 2012-03-16 23:15:23 +0000 (Fri, 16 Mar 2012) Log Message: ----------- CMake: finer control of install destinations https://sourceforge.net/apps/trac/supertuxkart/ticket/271 Modified Paths: -------------- main/trunk/CMakeLists.txt Modified: main/trunk/CMakeLists.txt =================================================================== --- main/trunk/CMakeLists.txt 2012-03-15 23:28:01 UTC (rev 10981) +++ main/trunk/CMakeLists.txt 2012-03-16 23:15:23 UTC (rev 10982) @@ -18,6 +18,11 @@ set(STK_DATA_DIR "${PROJECT_SOURCE_DIR}/data") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin") +# Define install paths +set(STK_INSTALL_BINARY_DIR "bin" CACHE + STRING "Install executable to this directory, absolute or relative to CMAKE_INSTALL_PREFIX") +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("${STK_SOURCE_DIR}/bullet") @@ -133,7 +138,13 @@ find_library(PTHREAD_LIBRARY NAMES pthread pthreadVC2 PATHS ${PROJECT_SOURCE_DIR}/dependencies/lib) mark_as_advanced(PTHREAD_LIBRARY) - add_definitions(-DSUPERTUXKART_DATADIR=\"${CMAKE_INSTALL_PREFIX}/share/games/supertuxkart\") + # Set data dir (absolute or relative to CMAKE_INSTALL_PREFIX) + get_filename_component(STK_INSTALL_DATA_DIR_ABSOLUTE ${STK_INSTALL_DATA_DIR} ABSOLUTE) + if(${STK_INSTALL_DATA_DIR_ABSOLUTE} STREQUAL ${STK_INSTALL_DATA_DIR}) + add_definitions(-DSUPERTUXKART_DATADIR=\"${STK_INSTALL_DATA_DIR_ABSOLUTE}\") + else() + add_definitions(-DSUPERTUXKART_DATADIR=\"${CMAKE_INSTALL_PREFIX}/${STK_INSTALL_DATA_DIR}\") + endif() # Build the final executable add_executable(supertuxkart ${STK_SOURCES} ${STK_HEADERS}) @@ -180,8 +191,8 @@ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) # ==== Install target ==== -install(TARGETS supertuxkart RUNTIME DESTINATION games BUNDLE DESTINATION .) -install(DIRECTORY "${STK_DATA_DIR}/" DESTINATION "share/games/supertuxkart/data" PATTERN ".svn" EXCLUDE) +install(TARGETS supertuxkart RUNTIME DESTINATION ${STK_INSTALL_BINARY_DIR} BUNDLE DESTINATION .) +install(DIRECTORY ${STK_DATA_DIR} DESTINATION ${STK_INSTALL_DATA_DIR} PATTERN ".svn" EXCLUDE) install(FILES ${PROJECT_BINARY_DIR}/supertuxkart.desktop DESTINATION share/applications) install(FILES data/supertuxkart_32.xpm data/supertuxkart_64.xpm DESTINATION share/pixmaps) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fu...@us...> - 2013-10-22 13:28:10
|
Revision: 14284 http://sourceforge.net/p/supertuxkart/code/14284 Author: funto66 Date: 2013-10-22 13:28:06 +0000 (Tue, 22 Oct 2013) Log Message: ----------- Enable multi-processor compilation on Visual Studio (faster) Modified Paths: -------------- main/trunk/CMakeLists.txt Modified: main/trunk/CMakeLists.txt =================================================================== --- main/trunk/CMakeLists.txt 2013-10-22 03:36:19 UTC (rev 14283) +++ main/trunk/CMakeLists.txt 2013-10-22 13:28:06 UTC (rev 14284) @@ -72,6 +72,8 @@ if(APPLE) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -arch i386") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch i386 -F/Library/Frameworks") +elseif(MSVC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") # Enable multi-processor compilation (faster) endif() # OpenAL This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hik...@us...> - 2013-11-17 23:01:24
|
Revision: 14469 http://sourceforge.net/p/supertuxkart/code/14469 Author: hikerstk Date: 2013-11-17 23:01:21 +0000 (Sun, 17 Nov 2013) Log Message: ----------- Enable wiiuse by default. Modified Paths: -------------- main/trunk/CMakeLists.txt Modified: main/trunk/CMakeLists.txt =================================================================== --- main/trunk/CMakeLists.txt 2013-11-17 23:01:02 UTC (rev 14468) +++ main/trunk/CMakeLists.txt 2013-11-17 23:01:21 UTC (rev 14469) @@ -11,7 +11,7 @@ set(CMAKE_BUILD_TYPE "STKRelease") endif() -option(USE_WIIUSE "Support for wiimote input devices" OFF) +option(USE_WIIUSE "Support for wiimote input devices" ON) option(USE_FRIBIDI "Support for right-to-left languages" ON) if(UNIX) option(USE_CPP2011 "Activate C++ 2011 mode (GCC only)" OFF) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hik...@us...> - 2014-01-07 02:04:35
|
Revision: 14956 http://sourceforge.net/p/supertuxkart/code/14956 Author: hikerstk Date: 2014-01-07 02:04:31 +0000 (Tue, 07 Jan 2014) Log Message: ----------- Remove definition of NDEBUG for VS (since VS will define this automatically in release builds), and add -DDEBUG in VS only for debug builds. Modified Paths: -------------- main/trunk/CMakeLists.txt Modified: main/trunk/CMakeLists.txt =================================================================== --- main/trunk/CMakeLists.txt 2014-01-07 01:24:48 UTC (rev 14955) +++ main/trunk/CMakeLists.txt 2014-01-07 02:04:31 UTC (rev 14956) @@ -149,18 +149,23 @@ # And shut up about unsafe stuff add_definitions(-D_CRT_SECURE_NO_WARNINGS) + # VS will automatically add NDEBUG for release mode, but only _DEBUG in debug mode. + # Since STK uses DEBUG, this is added for debug compilation only: + set_property(DIRECTORY PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG) +else() + # All non VS generators used create only a single compile mode, so + # compile flags can be simplye be added + if(CMAKE_BUILD_TYPE MATCHES Debug) + add_definitions(-DDEBUG) + else() + add_definitions(-DNDEBUG) + endif() endif() # TODO: remove this switch add_definitions(-DHAVE_OGGVORBIS) -if(CMAKE_BUILD_TYPE MATCHES Debug) - add_definitions(-DDEBUG) -else() - add_definitions(-DNDEBUG) -endif() - # Provides list of source and header files (STK_SOURCES and STK_HEADERS) include(sources.cmake) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2011-08-29 18:17:51
|
Revision: 9657 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=9657&view=rev Author: auria Date: 2011-08-29 18:17:45 +0000 (Mon, 29 Aug 2011) Log Message: ----------- Make the CMake build system work on OSX (link against frameworks, build app bundle, etc.) Modified Paths: -------------- main/trunk/CMakeLists.txt Modified: main/trunk/CMakeLists.txt =================================================================== --- main/trunk/CMakeLists.txt 2011-08-29 02:21:50 UTC (rev 9656) +++ main/trunk/CMakeLists.txt 2011-08-29 18:17:45 UTC (rev 9657) @@ -36,9 +36,30 @@ include_directories("${STK_SOURCE_DIR}/enet/include") include_directories("${STK_SOURCE_DIR}/bullet/src") +if(APPLE) + # We could use smarter detection of the frameworks but supporting a single official setup makes things easy... + include_directories("/Library/Frameworks/IrrFramework.framework/Versions/A/Headers/") + include_directories("/Library/Frameworks/fribidi.framework/Headers") + include_directories("/Library/Frameworks/Ogg.framework/Headers") + include_directories("/Library/Frameworks/Vorbis.framework/Headers") + include_directories("/usr/local/include") + include_directories("/usr/include") + find_library(Ogg /Library/Frameworks/Ogg.framework) + find_library(Vorbis /Library/Frameworks/Vorbis.framework) + #find_library(supertuxkart -framework IOKit) + #find_library(supertuxkart -framework QuickTime) + #find_library(supertuxkart -framework Carbon) + #find_library(supertuxkart -framework AudioUnit) + #find_library(supertuxkart -framework GLUT) + #find_library(find_librarysupertuxkart -framework Cocoa) + #find_library(supertuxkart -framework OpenGL) + #find_library(supertuxkart -framework AGL) + +endif() + # Set lib paths if(APPLE) - link_directories("${IRRLICHT_DIR}/lib/MacOSX") + # nothing to add elseif(UNIX) link_directories("${IRRLICHT_DIR}/lib/Linux") elseif(MSVC) @@ -50,45 +71,55 @@ link_directories("${STK_SOURCE_DIR}/bullet") # OpenGL -find_package(OpenGL) - -if(OPENGL_FOUND) - message("-- OpenGL found (include dirs: ${OPENGL_INCLUDE_DIR})") - include_directories(${OPENGL_INCLUDE_DIR}) +if(APPLE) + find_library(OpenGL /System/Library/Frameworks/OpenGL.framework /System/Library/Frameworks/AGL.framework) else() - message(FATAL_ERROR "OpenGL not found.") + find_package(OpenGL) + + if(OPENGL_FOUND) + message("-- OpenGL found (include dirs: ${OPENGL_INCLUDE_DIR})") + include_directories(${OPENGL_INCLUDE_DIR}) + else() + message(FATAL_ERROR "OpenGL not found.") + endif() + + if(UNIX) + # X11, stk requires xf86vm + find_package(X11) + + if(X11_FOUND) + message("-- X11 libs found") + else() + message(FATAL_ERROR "X11 not found.") + endif() + endif() endif() -if(UNIX) - # X11, stk requires xf86vm - find_package(X11) - - if(X11_FOUND) - message("-- X11 libs found") - else() - message(FATAL_ERROR "X11 not found.") - endif() -endif() - # OpenAL - -find_package(OpenAL) - -if(OPENAL_FOUND) - message("-- OpenAL found (include dirs: ${OPENAL_INCLUDE_DIR})") - include_directories(${OPENAL_INCLUDE_DIR}) +if(APPLE) + find_library(OpenAL /Library/Frameworks/OpenAL.framework) else() - message(FATAL_ERROR "OpenAL not found.") + find_package(OpenAL) + + if(OPENAL_FOUND) + message("-- OpenAL found (include dirs: ${OPENAL_INCLUDE_DIR})") + include_directories(${OPENAL_INCLUDE_DIR}) + else() + message(FATAL_ERROR "OpenAL not found.") + endif() endif() - # Check if we finally got irrlicht -find_path(HAVE_IRRLICHT irrlicht.h PATHS ${IRRLICHT_DIR} ${IRRLICHT_DIR}/include /usr/include/irrlicht/ /usr/local/include/irrlicht/) - -if(HAVE_IRRLICHT) - message("-- Irrlicht found (in ${HAVE_IRRLICHT}/irrlicht.h)") +if(APPLE) + find_library(Irrlicht /Library/Frameworks/IrrFramework.framework) else() - message(FATAL_ERROR "\n -- Irrlicht not found (can't locate irrlicht.h)\n Use -DIRRLICHT_DIR=/path/to/irrlicht") + find_path(HAVE_IRRLICHT irrlicht.h PATHS ${IRRLICHT_DIR} ${IRRLICHT_DIR}/include /usr/include/irrlicht/ /usr/local/include/irrlicht/) + + if(HAVE_IRRLICHT) + message("-- Irrlicht found (in ${HAVE_IRRLICHT}/irrlicht.h)") + else() + message(FATAL_ERROR "\n -- Irrlicht not found (can't locate irrlicht.h)\n Use -DIRRLICHT_DIR=/path/to/irrlicht") + endif() endif() include_directories(${HAVE_IRRLICHT}) @@ -134,9 +165,7 @@ message("-- Font tool deactivated/freetype not found, the font tool won't be built (only useful for developers)") endif() -# Build the final executable -add_executable(supertuxkart - src/main.cpp +set( SRCS ${SRCS} src/main.cpp src/main_loop.cpp src/main_loop.hpp src/addons/addon.cpp @@ -596,29 +625,86 @@ src/utils/utf8.h src/utils/utf8/unchecked.h src/utils/vec3.cpp - src/utils/vec3.hpp -) + src/utils/vec3.hpp) -target_link_libraries(supertuxkart - Irrlicht - bulletdynamics - bulletcollision - bulletmath - enet - ${CURL_LIBRARIES} - ${OPENGL_LIBRARIES} - ${OPENAL_LIBRARY} - vorbisfile) - +if (APPLE) + # icon files to copy in the bundle + set( OSX_ICON_FILES ${PROJECT_SOURCE_DIR}/src/ide/Xcode/stk.icns) + set_source_files_properties( ${OSX_ICON_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) + set( SRCS ${SRCS} ${OSX_ICON_FILES} ) + + # build the executable and create an app bundle + add_executable(supertuxkart MACOSX_BUNDLE ${SRCS} ) + + target_link_libraries(supertuxkart + bulletdynamics + bulletcollision + bulletmath + enet + ${CURL_LIBRARIES} + # We could use smarter detection of the frameworks but supporting a single official setup makes things easy... + /Library/Frameworks/IrrFramework.framework + /Library/Frameworks/Ogg.framework + /Library/Frameworks/OpenAL.framework + /Library/Frameworks/Vorbis.framework + # TODO: allow linking against frameworks from a SDK. I (Auria) just am not familiar enough with CMake to do this + /System/Library/Frameworks/AGL.framework + /System/Library/Frameworks/IOKit.framework + /System/Library/Frameworks/QuickTime.framework + /System/Library/Frameworks/Carbon.framework + /System/Library/Frameworks/AudioUnit.framework + /System/Library/Frameworks/Cocoa.framework + /System/Library/Frameworks/OpenGL.framework) + + # configure CMake to use a custom Info.plist + set_target_properties(supertuxkart PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${PROJECT_SOURCE_DIR}/src/ide/Xcode/SuperTuxKart-Info.plist ) + + install(CODE " + EXECUTE_PROCESS(COMMAND ln -sf + ${PROJECT_SOURCE_DIR}/data ${CMAKE_BINARY_DIR}/bin/supertuxkart.app/Contents/Resources + ) + ") + +else() + # Build the final executable + add_executable(supertuxkart ${SRCS}) + + target_link_libraries(supertuxkart + Irrlicht + bulletdynamics + bulletcollision + bulletmath + enet + ${CURL_LIBRARIES} + ${OPENGL_LIBRARIES} + ${OPENAL_LIBRARY} + vorbisfile) +endif() + if(USE_FRIBIDI) - target_link_libraries(supertuxkart - fribidi) + if(APPLE) + target_link_libraries(supertuxkart /Library/Frameworks/fribidi.framework) + else() + target_link_libraries(supertuxkart fribidi) + endif() endif() if(UNIX AND NOT APPLE) target_link_libraries(supertuxkart Xxf86vm) elseif(APPLE) - # TODO! - # xapantu (1/08/11): all libs are added by cmake, it should work + # We could use smarter detection of the frameworks but supporting a single official setup makes things easy... + target_link_libraries(supertuxkart /Library/Frameworks/IrrFramework.framework) + target_link_libraries(supertuxkart /Library/Frameworks/Ogg.framework) + target_link_libraries(supertuxkart /Library/Frameworks/OpenAL.framework) + target_link_libraries(supertuxkart /Library/Frameworks/Vorbis.framework) + + # TODO: allow linking against frameworks from a SDK. I (Auria) just am not familiar enough with CMake to do this + target_link_libraries(supertuxkart /System/Library/Frameworks/AGL.framework) + target_link_libraries(supertuxkart /System/Library/Frameworks/IOKit.framework) + target_link_libraries(supertuxkart /System/Library/Frameworks/QuickTime.framework) + target_link_libraries(supertuxkart /System/Library/Frameworks/Carbon.framework) + target_link_libraries(supertuxkart /System/Library/Frameworks/AudioUnit.framework) + target_link_libraries(supertuxkart /System/Library/Frameworks/Cocoa.framework) + target_link_libraries(supertuxkart /System/Library/Frameworks/OpenGL.framework) endif() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2011-08-29 18:30:25
|
Revision: 9658 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=9658&view=rev Author: auria Date: 2011-08-29 18:30:19 +0000 (Mon, 29 Aug 2011) Log Message: ----------- Improve a little CMake build on OSX Modified Paths: -------------- main/trunk/CMakeLists.txt Modified: main/trunk/CMakeLists.txt =================================================================== --- main/trunk/CMakeLists.txt 2011-08-29 18:17:45 UTC (rev 9657) +++ main/trunk/CMakeLists.txt 2011-08-29 18:30:19 UTC (rev 9658) @@ -659,11 +659,7 @@ # configure CMake to use a custom Info.plist set_target_properties(supertuxkart PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${PROJECT_SOURCE_DIR}/src/ide/Xcode/SuperTuxKart-Info.plist ) - install(CODE " - EXECUTE_PROCESS(COMMAND ln -sf - ${PROJECT_SOURCE_DIR}/data ${CMAKE_BINARY_DIR}/bin/supertuxkart.app/Contents/Resources - ) - ") + add_definitions(`ln -sf ${PROJECT_SOURCE_DIR}/data ${CMAKE_BINARY_DIR}/bin/supertuxkart.app/Contents/Resources`) else() # Build the final executable This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2011-09-06 00:15:12
|
Revision: 9765 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=9765&view=rev Author: auria Date: 2011-09-06 00:15:06 +0000 (Tue, 06 Sep 2011) Log Message: ----------- CMake : Improve error message when font tool is disabled, and add make dist target Modified Paths: -------------- main/trunk/CMakeLists.txt Modified: main/trunk/CMakeLists.txt =================================================================== --- main/trunk/CMakeLists.txt 2011-09-05 23:49:17 UTC (rev 9764) +++ main/trunk/CMakeLists.txt 2011-09-06 00:15:06 UTC (rev 9765) @@ -13,6 +13,7 @@ set(STK_SOURCE_DIR "src") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "bin") +set(PROJECT_VERSION "0.7.3") # Tweakable values if(CMAKE_BUILD_TYPE MATCHES "Debug") @@ -147,22 +148,26 @@ find_package(Freetype) -if(FREETYPE_FOUND AND FONT_TOOL) - message("-- Freetype found") - find_package(X11) - include_directories(${FREETYPE_INCLUDE_DIRS}) - add_executable(font_tool - src/font_tool/CFontTool.cpp - src/font_tool/CFontTool.h - src/font_tool/CVectorFontTool.h - src/font_tool/main.cpp - ) - target_link_libraries(font_tool ${FREETYPE_LIBRARIES}) - target_link_libraries(font_tool ${X11_Xft_LIB}) - target_link_libraries(font_tool ${OPENGL_LIBRARIES}) - target_link_libraries(font_tool Irrlicht) +if(FONT_TOOL) + if(FREETYPE_FOUND) + message("-- Freetype found") + find_package(X11) + include_directories(${FREETYPE_INCLUDE_DIRS}) + add_executable(font_tool + src/font_tool/CFontTool.cpp + src/font_tool/CFontTool.h + src/font_tool/CVectorFontTool.h + src/font_tool/main.cpp + ) + target_link_libraries(font_tool ${FREETYPE_LIBRARIES}) + target_link_libraries(font_tool ${X11_Xft_LIB}) + target_link_libraries(font_tool ${OPENGL_LIBRARIES}) + target_link_libraries(font_tool Irrlicht) + else() + message("-- Freetype was not found, the font tool won't be built (only useful for developers)") + endif() else() - message("-- Font tool deactivated/freetype not found, the font tool won't be built (only useful for developers)") + message("-- Font tool deactivated, the font tool won't be built (only useful for developers)") endif() set( SRCS ${SRCS} src/main.cpp @@ -704,3 +709,16 @@ target_link_libraries(supertuxkart /System/Library/Frameworks/Cocoa.framework) target_link_libraries(supertuxkart /System/Library/Frameworks/OpenGL.framework) endif() + +# Make dist target +add_custom_target(dist + COMMAND rm -rf ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION} && rm -f ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION}.tar.bz2 + && echo "Exporting..." + && svn export ${PROJECT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION} + && echo "Compressing..." + && cd ${CMAKE_BINARY_DIR} + && tar -cjf ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION}.tar.bz2 ./SuperTuxKart-${PROJECT_VERSION} + && echo "Done, cleaning up" + && rm -rf ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2011-10-18 22:35:46
|
Revision: 10019 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=10019&view=rev Author: auria Date: 2011-10-18 22:35:40 +0000 (Tue, 18 Oct 2011) Log Message: ----------- Minor cleanup to cmake file Modified Paths: -------------- main/trunk/CMakeLists.txt Modified: main/trunk/CMakeLists.txt =================================================================== --- main/trunk/CMakeLists.txt 2011-10-18 21:14:35 UTC (rev 10018) +++ main/trunk/CMakeLists.txt 2011-10-18 22:35:40 UTC (rev 10019) @@ -1,14 +1,10 @@ # CMakeLists.txt - root CMakeLists for the SuperTuxKart project -# TODO: fribidi -# TODO: DEBUG needs to be defined => fix that in code # TODO: make Ogg Vorbis optional (doesn't seem to work with autotools either!) -# TODO: allow to disable asserts (NDEBUG?) cmake_minimum_required(VERSION 2.8.1) project(SuperTuxKart) -#DEBUG #set(CMAKE_VERBOSE_MAKEFILE TRUE) set(STK_SOURCE_DIR "src") @@ -47,15 +43,6 @@ include_directories("/usr/include") find_library(Ogg /Library/Frameworks/Ogg.framework) find_library(Vorbis /Library/Frameworks/Vorbis.framework) - #find_library(supertuxkart -framework IOKit) - #find_library(supertuxkart -framework QuickTime) - #find_library(supertuxkart -framework Carbon) - #find_library(supertuxkart -framework AudioUnit) - #find_library(supertuxkart -framework GLUT) - #find_library(find_librarysupertuxkart -framework Cocoa) - #find_library(supertuxkart -framework OpenGL) - #find_library(supertuxkart -framework AGL) - endif() # Set lib paths This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2011-10-18 22:59:42
|
Revision: 10020 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=10020&view=rev Author: auria Date: 2011-10-18 22:59:36 +0000 (Tue, 18 Oct 2011) Log Message: ----------- More minor work on cmake Modified Paths: -------------- main/trunk/CMakeLists.txt Modified: main/trunk/CMakeLists.txt =================================================================== --- main/trunk/CMakeLists.txt 2011-10-18 22:35:40 UTC (rev 10019) +++ main/trunk/CMakeLists.txt 2011-10-18 22:59:36 UTC (rev 10020) @@ -677,8 +677,9 @@ else() target_link_libraries(supertuxkart fribidi) endif() + add_definitions(-DENABLE_BIDI=1) endif() - + if(UNIX AND NOT APPLE) target_link_libraries(supertuxkart Xxf86vm) @@ -689,7 +690,6 @@ target_link_libraries(supertuxkart /Library/Frameworks/OpenAL.framework) target_link_libraries(supertuxkart /Library/Frameworks/Vorbis.framework) - # TODO: allow linking against frameworks from a SDK. I (Auria) just am not familiar enough with CMake to do this target_link_libraries(supertuxkart /System/Library/Frameworks/AGL.framework) target_link_libraries(supertuxkart /System/Library/Frameworks/IOKit.framework) target_link_libraries(supertuxkart /System/Library/Frameworks/QuickTime.framework) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2011-10-21 01:14:53
|
Revision: 10023 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=10023&view=rev Author: auria Date: 2011-10-21 01:14:46 +0000 (Fri, 21 Oct 2011) Log Message: ----------- More minor work on CMake Modified Paths: -------------- main/trunk/CMakeLists.txt Modified: main/trunk/CMakeLists.txt =================================================================== --- main/trunk/CMakeLists.txt 2011-10-20 02:23:47 UTC (rev 10022) +++ main/trunk/CMakeLists.txt 2011-10-21 01:14:46 UTC (rev 10023) @@ -131,6 +131,7 @@ add_definitions(-DDEBUG) else() add_definitions(-DNDEBUG) + add_definitions(-O2) endif() find_package(Freetype) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2011-10-21 02:07:19
|
Revision: 10028 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=10028&view=rev Author: auria Date: 2011-10-21 02:07:12 +0000 (Fri, 21 Oct 2011) Log Message: ----------- Some work on CMake Modified Paths: -------------- main/trunk/CMakeLists.txt Modified: main/trunk/CMakeLists.txt =================================================================== --- main/trunk/CMakeLists.txt 2011-10-21 01:17:45 UTC (rev 10027) +++ main/trunk/CMakeLists.txt 2011-10-21 02:07:12 UTC (rev 10028) @@ -120,6 +120,26 @@ message(FATAL_ERROR "-- libcURL not found, please install it.") endif() +# Fribidi +if(USE_FRIBIDI) + FIND_PATH(FRIBIDI_INCLUDE_DIR fribidi/fribidi.h + /usr/local/include + /usr/include + ) + + SET(FRIBIDI_NAMES ${FRIBIDI_NAMES} fribidi libfribidi) + FIND_LIBRARY(FRIBIDI_LIBRARY + NAMES ${FRIBIDI_NAMES} + PATHS /usr/lib /usr/local/lib + ) + + IF (FRIBIDI_LIBRARY AND FRIBIDI_INCLUDE_DIR) + message("-- Fribidi found") + else() + message(FATAL_ERROR "Fribidi not found. Either install fribidi or disable bidi support with -DUSE_FRIBIDI=0 (if you don't use a right-to-left language then you don't need this).") + endif() +endif() + # Set some compiler options if(UNIX) add_definitions(-Wall) @@ -712,3 +732,8 @@ && rm -rf ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) +# Install target (WIP) +FILE(GLOB datafiles "${CMAKE_CURRENT_SOURCE_DIR}/data/*.png" "${CMAKE_CURRENT_SOURCE_DIR}/data/*.jpg" "${CMAKE_CURRENT_SOURCE_DIR}/data/*.b3d" "${CMAKE_CURRENT_SOURCE_DIR}/data/*.xml" "${CMAKE_CURRENT_SOURCE_DIR}/data/*.challenge" "${CMAKE_CURRENT_SOURCE_DIR}/data/*.stkgui" "${CMAKE_CURRENT_SOURCE_DIR}/data/*.po" "${CMAKE_CURRENT_SOURCE_DIR}/data/*.sh" "${CMAKE_CURRENT_SOURCE_DIR}/data/*.ogg" "${CMAKE_CURRENT_SOURCE_DIR}/data/*.music" "${CMAKE_CURRENT_SOURCE_DIR}/data/*.grandprix" "${CMAKE_CURRENT_SOURCE_DIR}/data/*.txt" "${CMAKE_CURRENT_SOURCE_DIR}/data/*.JPG" "${CMAKE_CURRENT_SOURCE_DIR}/data/*.stkskin") +install(FILES ${datafiles} CREDITS DESTINATION share/supertuxkart) +install(TARGETS supertuxkart RUNTIME DESTINATION games) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2011-10-22 00:36:37
|
Revision: 10029 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=10029&view=rev Author: auria Date: 2011-10-22 00:36:30 +0000 (Sat, 22 Oct 2011) Log Message: ----------- make install with CMake now mostly works Modified Paths: -------------- main/trunk/CMakeLists.txt Modified: main/trunk/CMakeLists.txt =================================================================== --- main/trunk/CMakeLists.txt 2011-10-21 02:07:12 UTC (rev 10028) +++ main/trunk/CMakeLists.txt 2011-10-22 00:36:30 UTC (rev 10029) @@ -720,7 +720,7 @@ target_link_libraries(supertuxkart /System/Library/Frameworks/OpenGL.framework) endif() -# Make dist target +# ==== Make dist target ==== add_custom_target(dist COMMAND rm -rf ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION} && rm -f ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION}.tar.bz2 && echo "Exporting..." @@ -732,8 +732,30 @@ && rm -rf ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) -# Install target (WIP) -FILE(GLOB datafiles "${CMAKE_CURRENT_SOURCE_DIR}/data/*.png" "${CMAKE_CURRENT_SOURCE_DIR}/data/*.jpg" "${CMAKE_CURRENT_SOURCE_DIR}/data/*.b3d" "${CMAKE_CURRENT_SOURCE_DIR}/data/*.xml" "${CMAKE_CURRENT_SOURCE_DIR}/data/*.challenge" "${CMAKE_CURRENT_SOURCE_DIR}/data/*.stkgui" "${CMAKE_CURRENT_SOURCE_DIR}/data/*.po" "${CMAKE_CURRENT_SOURCE_DIR}/data/*.sh" "${CMAKE_CURRENT_SOURCE_DIR}/data/*.ogg" "${CMAKE_CURRENT_SOURCE_DIR}/data/*.music" "${CMAKE_CURRENT_SOURCE_DIR}/data/*.grandprix" "${CMAKE_CURRENT_SOURCE_DIR}/data/*.txt" "${CMAKE_CURRENT_SOURCE_DIR}/data/*.JPG" "${CMAKE_CURRENT_SOURCE_DIR}/data/*.stkskin") -install(FILES ${datafiles} CREDITS DESTINATION share/supertuxkart) +# ==== Install target ==== +MACRO(installfilemacro filepath) + set(source_regex "(.*)/data/(.*)") + set(svn_regex "(.*).svn(.*)") + + string(REGEX MATCH "${svn_regex}" is_svn_dir "${curr}") + if(is_svn_dir) + # don't install SVN files + else() + string(REGEX MATCH "${source_regex}" source_path "${curr}") + if(source_path) + string(REGEX REPLACE "${source_regex}" "\\2" after_source "${source_path}") + get_filename_component(install_location ${after_source} PATH) + install(FILES ${filepath} DESTINATION "share/games/supertuxkart/data/${install_location}") + endif(source_path) + endif() +ENDMACRO(installfilemacro) + +FILE(GLOB_RECURSE datafiles "${CMAKE_CURRENT_SOURCE_DIR}/data/*") +foreach(curr ${datafiles}) + installfilemacro(${curr}) +endforeach() + install(TARGETS supertuxkart RUNTIME DESTINATION games) +install(FILES data/supertuxkart.desktop DESTINATION share/applications) +install(FILES data/supertuxkart_32.xpm data/supertuxkart_64.xpm DESTINATION share/pixmaps) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2011-10-22 01:01:29
|
Revision: 10030 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=10030&view=rev Author: auria Date: 2011-10-22 01:01:22 +0000 (Sat, 22 Oct 2011) Log Message: ----------- More work on make install target of CMake. Now works quite well Modified Paths: -------------- main/trunk/CMakeLists.txt Modified: main/trunk/CMakeLists.txt =================================================================== --- main/trunk/CMakeLists.txt 2011-10-22 00:36:30 UTC (rev 10029) +++ main/trunk/CMakeLists.txt 2011-10-22 01:01:22 UTC (rev 10030) @@ -662,7 +662,7 @@ /Library/Frameworks/Ogg.framework /Library/Frameworks/OpenAL.framework /Library/Frameworks/Vorbis.framework - # TODO: allow linking against frameworks from a SDK. I (Auria) just am not familiar enough with CMake to do this + # TODO: allow linking against frameworks from a SDK. /System/Library/Frameworks/AGL.framework /System/Library/Frameworks/IOKit.framework /System/Library/Frameworks/QuickTime.framework @@ -759,3 +759,10 @@ install(FILES data/supertuxkart.desktop DESTINATION share/applications) install(FILES data/supertuxkart_32.xpm data/supertuxkart_64.xpm DESTINATION share/pixmaps) +add_custom_target(GenerateDesktopFile + COMMAND sed 's\#PREFIX\#${CMAKE_INSTALL_PREFIX}\#' ${CMAKE_CURRENT_SOURCE_DIR}/data/supertuxkart_desktop.template | sed 's\#VERSION\#${PROJECT_VERSION}\#' > ${CMAKE_CURRENT_SOURCE_DIR}/data/supertuxkart.desktop + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) +ADD_DEPENDENCIES(supertuxkart GenerateDesktopFile) + + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2011-10-22 18:20:57
|
Revision: 10035 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=10035&view=rev Author: auria Date: 2011-10-22 18:20:51 +0000 (Sat, 22 Oct 2011) Log Message: ----------- More Cmake work Modified Paths: -------------- main/trunk/CMakeLists.txt Modified: main/trunk/CMakeLists.txt =================================================================== --- main/trunk/CMakeLists.txt 2011-10-22 15:53:27 UTC (rev 10034) +++ main/trunk/CMakeLists.txt 2011-10-22 18:20:51 UTC (rev 10035) @@ -14,9 +14,9 @@ # Tweakable values if(CMAKE_BUILD_TYPE MATCHES "Debug") set(DEBUG ON) -else(CMAKE_BUILD_TYPE MATCHES "Debug") +else() set(DEBUG OFF) -endif(CMAKE_BUILD_TYPE MATCHES "Debug") +endif() option(USE_FRIBIDI "Support for right-to-left languages" ON) option(FONT_TOOL "Compile font tool" OFF) @@ -754,7 +754,8 @@ installfilemacro(${curr}) endforeach() -install(TARGETS supertuxkart RUNTIME DESTINATION games) + +install(TARGETS supertuxkart RUNTIME DESTINATION games BUNDLE DESTINATION .) install(FILES data/supertuxkart.desktop DESTINATION share/applications) install(FILES data/supertuxkart_32.xpm data/supertuxkart_64.xpm DESTINATION share/pixmaps) @@ -764,4 +765,3 @@ ADD_DEPENDENCIES(supertuxkart GenerateDesktopFile) - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2011-10-25 01:00:40
|
Revision: 10038 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=10038&view=rev Author: auria Date: 2011-10-25 01:00:33 +0000 (Tue, 25 Oct 2011) Log Message: ----------- Add missing files in build system (/me should write a script to automatically regenerate the list as needed...) Modified Paths: -------------- main/trunk/CMakeLists.txt Modified: main/trunk/CMakeLists.txt =================================================================== --- main/trunk/CMakeLists.txt 2011-10-24 23:56:55 UTC (rev 10037) +++ main/trunk/CMakeLists.txt 2011-10-25 01:00:33 UTC (rev 10038) @@ -626,6 +626,8 @@ src/utils/aligned_array.hpp src/utils/constants.cpp src/utils/constants.hpp + src/utils/leak_check.cpp + src/utils/leak_check.hpp src/utils/no_copy.hpp src/utils/profiler.cpp src/utils/profiler.hpp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2011-11-14 23:27:38
|
Revision: 10211 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=10211&view=rev Author: auria Date: 2011-11-14 23:27:31 +0000 (Mon, 14 Nov 2011) Log Message: ----------- define SUPERTUXKART_DATADIR in CMake builds Modified Paths: -------------- main/trunk/CMakeLists.txt Modified: main/trunk/CMakeLists.txt =================================================================== --- main/trunk/CMakeLists.txt 2011-11-14 23:01:03 UTC (rev 10210) +++ main/trunk/CMakeLists.txt 2011-11-14 23:27:31 UTC (rev 10211) @@ -681,6 +681,9 @@ add_definitions(`ln -sf ${PROJECT_SOURCE_DIR}/data ${CMAKE_BINARY_DIR}/bin/supertuxkart.app/Contents/Resources`) else() + + add_definitions(-DSUPERTUXKART_DATADIR=${CMAKE_INSTALL_PREFIX}/share/games/supertuxkart) + # Build the final executable add_executable(supertuxkart ${SRCS}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hik...@us...> - 2011-11-14 23:52:57
|
Revision: 10212 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=10212&view=rev Author: hikerstk Date: 2011-11-14 23:52:50 +0000 (Mon, 14 Nov 2011) Log Message: ----------- Fixed missing "" around the string define. Modified Paths: -------------- main/trunk/CMakeLists.txt Modified: main/trunk/CMakeLists.txt =================================================================== --- main/trunk/CMakeLists.txt 2011-11-14 23:27:31 UTC (rev 10211) +++ main/trunk/CMakeLists.txt 2011-11-14 23:52:50 UTC (rev 10212) @@ -682,7 +682,7 @@ else() - add_definitions(-DSUPERTUXKART_DATADIR=${CMAKE_INSTALL_PREFIX}/share/games/supertuxkart) + add_definitions(-DSUPERTUXKART_DATADIR=\"${CMAKE_INSTALL_PREFIX}/share/games/supertuxkart\") # Build the final executable add_executable(supertuxkart ${SRCS}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2011-11-22 18:37:04
|
Revision: 10239 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=10239&view=rev Author: auria Date: 2011-11-22 18:36:58 +0000 (Tue, 22 Nov 2011) Log Message: ----------- Fixed font tool in CMake, found by wintermute Modified Paths: -------------- main/trunk/CMakeLists.txt Modified: main/trunk/CMakeLists.txt =================================================================== --- main/trunk/CMakeLists.txt 2011-11-22 05:24:39 UTC (rev 10238) +++ main/trunk/CMakeLists.txt 2011-11-22 18:36:58 UTC (rev 10239) @@ -164,10 +164,10 @@ find_package(X11) include_directories(${FREETYPE_INCLUDE_DIRS}) add_executable(font_tool - src/font_tool/CFontTool.cpp - src/font_tool/CFontTool.h - src/font_tool/CVectorFontTool.h - src/font_tool/main.cpp + tools/font_tool/CFontTool.cpp + tools/font_tool/CFontTool.h + tools/font_tool/CVectorFontTool.h + tools/font_tool/main.cpp ) target_link_libraries(font_tool ${FREETYPE_LIBRARIES}) target_link_libraries(font_tool ${X11_Xft_LIB}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <au...@us...> - 2011-12-04 01:30:56
|
Revision: 10324 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=10324&view=rev Author: auria Date: 2011-12-04 01:30:50 +0000 (Sun, 04 Dec 2011) Log Message: ----------- Added forgotten file Modified Paths: -------------- main/trunk/CMakeLists.txt Modified: main/trunk/CMakeLists.txt =================================================================== --- main/trunk/CMakeLists.txt 2011-12-04 01:29:27 UTC (rev 10323) +++ main/trunk/CMakeLists.txt 2011-12-04 01:30:50 UTC (rev 10324) @@ -603,6 +603,8 @@ src/tracks/check_sphere.hpp src/tracks/check_structure.cpp src/tracks/check_structure.hpp + src/tracks/lod_node_loader.cpp + src/tracks/lod_node_loader.hpp src/tracks/graph_node.cpp src/tracks/graph_node.hpp src/tracks/quad.cpp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |