Changeset 10267 for code/trunk/src
- Timestamp:
- Feb 12, 2015, 6:05:25 PM (10 years ago)
- Location:
- code/trunk/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/CMakeLists.txt
r10186 r10267 58 58 IF(APPLE) 59 59 LIST(APPEND ORXONOX_MAIN_FILES OrxonoxMac.mm) 60 # Add the icon for win32 builds 61 # TODO: does this work for mingw too? 62 ELSEIF(WIN32 AND MSVC) 63 LIST(APPEND ORXONOX_MAIN_FILES ${CMAKE_SOURCE_DIR}/contrib/winresource.rc) 60 64 ENDIF() 61 65 -
code/trunk/src/libraries/core/CMakeLists.txt
r9667 r10267 68 68 ADD_SUBDIRECTORY(object) 69 69 70 #Add the icon (for the renderwindow) 71 IF(WIN32 AND MSVC) 72 List(APPEND CORE_SRC_FILES ${CMAKE_SOURCE_DIR}/contrib/winresource.rc) 73 ENDIF() 74 70 75 ORXONOX_ADD_LIBRARY(core 71 76 FIND_HEADER_FILES -
code/trunk/src/libraries/core/GraphicsManager.cc
r9675 r10267 316 316 317 317 Ogre::TextureManager::getSingleton().setDefaultNumMipmaps(Ogre::MIP_UNLIMITED); 318 319 //Add program icon 320 #if defined(ORXONOX_PLATFORM_WINDOWS) && defined(_MSC_VER) 321 HWND hwnd; 322 this->renderWindow_->getCustomAttribute("WINDOW", (void*)&hwnd); 323 LONG iconID = (LONG)LoadIcon(GetModuleHandle(0), MAKEINTRESOURCE(101)); 324 SetClassLong(hwnd, GCL_HICON, iconID); 325 #endif 326 318 327 319 328 // add console commands
Note: See TracChangeset
for help on using the changeset viewer.