Changeset 6259 for code/branches
- Timestamp:
- Dec 6, 2009, 8:16:04 PM (15 years ago)
- Location:
- code/branches/presentation2
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation2/data/gui/scripts/GraphicsMenu.lua
r6258 r6259 13 13 14 14 function P:init() 15 file = "C:\\Games\\Orxonox\\menu\\build\\config\\Debug\\" .. orxonox.getConfig("GraphicsManager", "ogreConfigFile_") 15 file = orxonox.PathConfig:getConfigPathString() .. orxonox.getConfig("GraphicsManager", "ogreConfigFile_") 16 --file = "C:\\Games\\Orxonox\\menu\\build\\config\\Debug\\" .. orxonox.getConfig("GraphicsManager", "ogreConfigFile_") 16 17 search_mode = 0 17 18 f = io.open(file, "r") -
code/branches/presentation2/src/libraries/core/CMakeLists.txt
r6243 r6259 90 90 Loader.h 91 91 LuaState.h 92 PathConfig.h 92 93 input/InputManager.h 93 94 input/KeyBinder.h -
code/branches/presentation2/src/libraries/core/PathConfig.h
r5929 r6259 36 36 #include "util/Singleton.h" 37 37 38 //tolua_begin 38 39 namespace orxonox 39 40 { 41 //tolua_end 40 42 /** 41 43 @brief … … 50 52 - externalData only for development builds in the build tree 51 53 */ 52 class _CoreExport PathConfig : public Singleton<PathConfig> 53 { 54 class _CoreExport PathConfig //tolua_export 55 : public Singleton<PathConfig> 56 { //tolua_export 54 57 friend class Singleton<PathConfig>; 55 58 friend class Core; … … 99 102 static std::string getExternalDataPathString(); 100 103 //! Returns the path to the config files as std::string 101 static std::string getConfigPathString(); 104 static std::string getConfigPathString(); //tolua_export 102 105 //! Returns the path to the log files as std::string 103 106 static std::string getLogPathString(); … … 132 135 bool bDevRun_; //!< True for runs in the build directory (not installed) 133 136 static PathConfig* singletonPtr_s; 134 }; 135 } 137 }; //tolua_export 138 } //tolua_export 136 139 137 140 #endif /* _PathConfig_H__ */
Note: See TracChangeset
for help on using the changeset viewer.