Changeset 10267

Timestamp:

Feb 12, 2015, 6:05:25 PM (10 years ago)

Author:

muemart

Message:

Add program icon for Windows builds (MSVC only for now)

Location:

code/trunk

Files:

• cmake/tools/SourceFileUtilities.cmake (modified) (1 diff)
• cmake/tools/TargetUtilities.cmake (modified) (1 diff)
• contrib/orxonox.ico (added)
• contrib/winresource.rc (added)
• src/CMakeLists.txt (modified) (1 diff)
• src/libraries/core/CMakeLists.txt (modified) (1 diff)
• src/libraries/core/GraphicsManager.cc (modified) (1 diff)

code/trunk/cmake/tools/SourceFileUtilities.cmake

@@ -81 +81 @@
       STRING(REPLACE "/" "\\\\" _group_path "${_relative_path}")
       SOURCE_GROUP("Source\\${_group_path}" FILES ${_file})
+    ELSEIF(_relative_path MATCHES ".*\\.rc") #Resource files
+      SOURCE_GROUP("Resource Files" FILES ${_file})
     ELSE()
       # File is being generated in the binary directory

code/trunk/cmake/tools/TargetUtilities.cmake

@@ -287 +287 @@
   # Don't compile header files
   FOREACH(_file ${_${_target_name}_files})
-    IF(NOT _file MATCHES "\\.(c|cc|cpp|cxx|mm)$")
+    IF(NOT _file MATCHES "\\.(c|cc|cpp|cxx|mm|rc)$")
       SET_SOURCE_FILES_PROPERTIES(${_file} PROPERTIES HEADER_FILE_ONLY TRUE)
     ENDIF()

code/trunk/src/CMakeLists.txt

@@ -58 +58 @@
 IF(APPLE)
   LIST(APPEND ORXONOX_MAIN_FILES OrxonoxMac.mm)
+# Add the icon for win32 builds
+# TODO: does this work for mingw too?
+ELSEIF(WIN32 AND MSVC)
+  LIST(APPEND ORXONOX_MAIN_FILES ${CMAKE_SOURCE_DIR}/contrib/winresource.rc)
 ENDIF()
 

code/trunk/src/libraries/core/CMakeLists.txt

@@ -68 +68 @@
 ADD_SUBDIRECTORY(object)
 
+#Add the icon (for the renderwindow)
+IF(WIN32 AND MSVC)
+  List(APPEND CORE_SRC_FILES ${CMAKE_SOURCE_DIR}/contrib/winresource.rc)
+ENDIF()
+
 ORXONOX_ADD_LIBRARY(core
   FIND_HEADER_FILES

code/trunk/src/libraries/core/GraphicsManager.cc

@@ -316 +316 @@
 
         Ogre::TextureManager::getSingleton().setDefaultNumMipmaps(Ogre::MIP_UNLIMITED);
+
+        //Add program icon
+#if defined(ORXONOX_PLATFORM_WINDOWS) && defined(_MSC_VER)
+        HWND hwnd;
+        this->renderWindow_->getCustomAttribute("WINDOW", (void*)&hwnd);
+        LONG iconID = (LONG)LoadIcon(GetModuleHandle(0), MAKEINTRESOURCE(101));
+        SetClassLong(hwnd, GCL_HICON, iconID);
+#endif
+
 
         // add console commands