Upstream fixes to make app icon work

git-svn-id: http://svn.osgeo.org/qgis/trunk@6710 c8812cc2-4d05-0410-92ff-de0c093fc19c

src/app/CMakeLists.txt

@@ -164,11 +164,19 @@ IF (WIN32)
     ENDIF (NOT WINDRES)
   ENDIF (NOT WINDRES)
 
-  ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgis_win32.obj
-                     COMMAND ${WINDRES}  -I${CMAKE_CURRENT_SOURCE_DIR}/..
-                                         -i${CMAKE_CURRENT_SOURCE_DIR}/../qgis_win32.rc
-                                         -o ${CMAKE_CURRENT_BINARY_DIR}/qgis_win32.obj)
-  SET(QGIS_APP_SRCS ${QGIS_APP_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/qgis_win32.obj)
+
+
+  #############################################################
+  # application icon
+  IF( MINGW )
+    # resource compilation for MinGW
+    ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/icon.o
+      COMMAND windres.exe -I${CMAKE_CURRENT_SOURCE_DIR} -i${CMAKE_CURRENT_SOURCE_DIR}/qgis_win32.rc 
+      -o ${CMAKE_CURRENT_BINARY_DIR}/icon.o )
+    SET(QGIS_APP_SRCS ${QGIS_APP_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/icon.o)
+  ELSE( MINGW )
+    SET(QGIS_APP_SRCS ${QGIS_APP_SRCS} icon.rc)
+  ENDIF( MINGW )
 
 ENDIF (WIN32)
 

src/app/qgis_win32.rc

@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qgis.ico"

src/qgis_win32.rc

@@ -1,4 +0,0 @@
-
-101                     ICON                    "qgis_win322.ico"
-
-IDI_ICON1               ICON                    "qgis_win322.ico"