Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Aug 13, 2009, 10:50:07 PM (15 years ago)
Author:
rgrieder
Message:

Renamed media to data to restore consistency with game/data/trunk folder name.
Couldn't yet rename the media folder though probably due to some fundamental limitations of SVN (believe me, I tried).

Location:
code/branches/resource2
Files:
1 edited
1 moved

Legend:

Unmodified
Added
Removed

  • code/branches/resource2

    • Property svn:externals

      •  

        old new  
        1 media_stripped http://svn.orxonox.net/game/data/branches/media_stripped
         1data_stripped https://svn.orxonox.net/game/data/branches/media_stripped

  • code/branches/resource2/media/DataInstallScript.cmake

    r5644 r5645  
    2929
    3030# Write some comment
    31 FILE(APPEND @MEDIA_INSTALL_DIRECTORY@/resources.oxr "\n\n\n <!-- ----------------------------------------- -->")
    32 FILE(APPEND @MEDIA_INSTALL_DIRECTORY@/resources.oxr     "\n <!-- Content from the external media directory -->")
    33 FILE(APPEND @MEDIA_INSTALL_DIRECTORY@/resources.oxr     "\n <!-- ----------------------------------------- -->\n\n")
     31FILE(APPEND @DATA_INSTALL_DIRECTORY@/resources.oxr "\n\n\n <!-- ---------------------------------------- -->")
     32FILE(APPEND @DATA_INSTALL_DIRECTORY@/resources.oxr     "\n <!-- Content from the external data directory -->")
     33FILE(APPEND @DATA_INSTALL_DIRECTORY@/resources.oxr     "\n <!-- ---------------------------------------- -->\n\n")
    3434
    3535# Append the external file
    36 FILE(READ   @EXTERNAL_MEDIA_DIRECTORY@/resources.oxr _external_file)
    37 FILE(APPEND @MEDIA_INSTALL_DIRECTORY@/resources.oxr ${_external_file})
     36FILE(READ   @EXTERNAL_DATA_DIRECTORY@/resources.oxr _external_file)
     37FILE(APPEND @DATA_INSTALL_DIRECTORY@/resources.oxr ${_external_file})
Note: See TracChangeset for help on using the changeset viewer.