Changeset 3430 for d-collide

Show
Ignore:
Timestamp:
05/06/08 21:36:52 (2 years ago)
Author:
andi
Message:

fix installation: don't install to <prefix>/resources, but to
<prefix>/share/d-collide/resources

Location:
d-collide/trunk/d-collide/testapp
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • d-collide/trunk/d-collide/testapp/CMakeLists.txt

    r3359 r3430  
    145145    install(TARGETS testapp DESTINATION bin) 
    146146    install(DIRECTORY resources/cegui-skin resources/models resources/textures 
    147             DESTINATION resources 
     147            DESTINATION share/d-collide/resources 
    148148            PATTERN ".svn" EXCLUDE) 
    149149 

  • d-collide/trunk/d-collide/testapp/gui.cpp

    r3375 r3430  
    241241 
    242242    // add resource path for GUI-scheme and layout 
    243     mOgreRoot->addResourceLocation(DCOLLIDE_TESTAPP_INSTALL_PREFIX + std::string("/resources/cegui-skin"), "FileSystem"); 
     243    mOgreRoot->addResourceLocation(DCOLLIDE_TESTAPP_INSTALL_PREFIX + std::string("/share/d-collide/resources/cegui-skin"), "FileSystem"); 
    244244    mOgreRoot->addResourceLocation(DCOLLIDE_TESTAPP_SOURCE_PREFIX + std::string("/resources/cegui-skin"), "FileSystem"); 
    245245    mOgreRoot->addResourceLocation("../resources/cegui-skin", "FileSystem"); 
    246246 
    247     mOgreRoot->addResourceLocation(DCOLLIDE_TESTAPP_INSTALL_PREFIX + std::string("/resources"), "FileSystem"); 
     247    mOgreRoot->addResourceLocation(DCOLLIDE_TESTAPP_INSTALL_PREFIX + std::string("/share/d-collide/resources"), "FileSystem"); 
    248248    mOgreRoot->addResourceLocation(DCOLLIDE_TESTAPP_SOURCE_PREFIX + std::string("/resources"), "FileSystem"); 
    249249    mOgreRoot->addResourceLocation("../resources", "FileSystem"); 

  • d-collide/trunk/d-collide/testapp/testapp.cpp

    r3347 r3430  
    236236    mWindowEventListener = new MyWindowEventListener(mRenderWindow); 
    237237 
    238     mOgreRoot->addResourceLocation(DCOLLIDE_TESTAPP_INSTALL_PREFIX + std::string("/resources/textures"), "FileSystem", "DCollideMaterials"); 
     238    mOgreRoot->addResourceLocation(DCOLLIDE_TESTAPP_INSTALL_PREFIX + std::string("/share/d-collide/resources/textures"), "FileSystem", "DCollideMaterials"); 
    239239    mOgreRoot->addResourceLocation(DCOLLIDE_TESTAPP_SOURCE_PREFIX + std::string("/resources/textures"), "FileSystem", "DCollideMaterials"); 
    240240    mOgreRoot->addResourceLocation("../resources/textures", "FileSystem", "DCollideMaterials"); 
    241241 
    242     mOgreRoot->addResourceLocation(DCOLLIDE_TESTAPP_INSTALL_PREFIX + std::string("/resources/models"), "FileSystem", "DCollideModels"); 
     242    mOgreRoot->addResourceLocation(DCOLLIDE_TESTAPP_INSTALL_PREFIX + std::string("/share/d-collide/resources/models"), "FileSystem", "DCollideModels"); 
    243243    mOgreRoot->addResourceLocation(DCOLLIDE_TESTAPP_SOURCE_PREFIX + std::string("/resources/models"), "FileSystem", "DCollideModels"); 
    244244    mOgreRoot->addResourceLocation("../resources/models", "FileSystem", "DCollideModels");