Changeset 8285 for code/branches/kicklib2/data

Timestamp:

Apr 21, 2011, 7:43:10 PM (14 years ago)

Author:

rgrieder

Message:

Merged revisions 8098 - 8277 from kicklib to kicklib2.

Location:

code/branches/kicklib2

Files:

• . (modified) (1 prop)
• data/CMakeLists.txt (modified) (1 diff)
• data/DataInstallScript.cmake (deleted)
• data/levels/planets.oxw (copied) (copied from code/branches/kicklib/data/levels/planets.oxw)
• data/mac (copied) (copied from code/branches/kicklib/data/mac)
• data/mac/English.lproj (copied) (copied from code/branches/kicklib/data/mac/English.lproj)
• data/mac/English.lproj/InfoPlist.strings (copied) (copied from code/branches/kicklib/data/mac/English.lproj/InfoPlist.strings)
• data/mac/English.lproj/MainMenu.nib (copied) (copied from code/branches/kicklib/data/mac/English.lproj/MainMenu.nib)
• data/mac/English.lproj/MainMenu.nib/designable.nib (copied) (copied from code/branches/kicklib/data/mac/English.lproj/MainMenu.nib/designable.nib)
• data/mac/English.lproj/MainMenu.nib/keyedobjects.nib (copied) (copied from code/branches/kicklib/data/mac/English.lproj/MainMenu.nib/keyedobjects.nib)
• data/mac/English.lproj/MainMenu.xib (copied) (copied from code/branches/kicklib/data/mac/English.lproj/MainMenu.xib)
• data/mac/Icon.icns (copied) (copied from code/branches/kicklib/data/mac/Icon.icns)
• data/mac/Orxonox-Info.plist (copied) (copied from code/branches/kicklib/data/mac/Orxonox-Info.plist)

code/branches/kicklib2/data/CMakeLists.txt

@@ -59 +59 @@
   DIRECTORY ${EXTERNAL_DATA_DIRECTORY}/
   DESTINATION ${DATA_INSTALL_DIRECTORY}
-  REGEX "\\.svn$|_svn$|resources\\.oxr|AUTHORS|LICENSE" EXCLUDE
+  REGEX "\\.svn$|_svn$|AUTHORS|LICENSE" EXCLUDE
 )
-# Configure the install scripts (variables not available during installation)
-CONFIGURE_FILE(DataInstallScript.cmake ${CMAKE_CURRENT_BINARY_DIR}/DataInstallScript.cmake @ONLY)
-# Join both resources.oxr files
-INSTALL(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/DataInstallScript.cmake)