Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
In progress : work to make exe show qgis icon properly
git-svn-id: http://svn.osgeo.org/qgis/branches/Release-0_8_0@6706 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Feb 26, 2007
1 parent 84e2312 commit b378749
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 9 deletions.
17 changes: 12 additions & 5 deletions src/gui/CMakeLists.txt
Expand Up @@ -24,11 +24,18 @@ 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)

Expand Down
1 change: 1 addition & 0 deletions src/gui/qgis_win32.rc
@@ -0,0 +1 @@
IDI_ICON1 ICON DISCARDABLE "qgis_win322.ico"
File renamed without changes.
4 changes: 0 additions & 4 deletions src/qgis_win32.rc

This file was deleted.

0 comments on commit b378749

Please sign in to comment.