Changeset 10268 for code/trunk/src

Timestamp:

Feb 12, 2015, 11:28:26 PM (9 years ago)

Author:

landauf

Message:

program icon now works also with MinGW. but I had to exclude the PCH-file for the resource file

Location:

code/trunk/src

Files:

• CMakeLists.txt (modified) (1 diff)
• libraries/core/CMakeLists.txt (modified) (1 diff)
• libraries/core/GraphicsManager.cc (modified) (1 diff)

code/trunk/src/CMakeLists.txt

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

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

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

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

@@ -318 +318 @@
 
         //Add program icon
-#if defined(ORXONOX_PLATFORM_WINDOWS) && defined(_MSC_VER)
+#if defined(ORXONOX_PLATFORM_WINDOWS)
         HWND hwnd;
         this->renderWindow_->getCustomAttribute("WINDOW", (void*)&hwnd);