better height for nick combobox and style button

[quassel.git] / pics / CMakeLists.txt

diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt
index 89402a5..1455011 100644 (file)
--- a/pics/CMakeLists.txt
+++ b/pics/CMakeLists.txt
@@ -1,15 +1,21 @@
 # pics/ contains non-themed icons and other graphical resources
 
 if(WIN32)
-  set(COMMON_DEPS ${COMMON_DEPS} ../pics/win32.rc PARENT_SCOPE)
+    if(MINGW)
+       set(COMMON_DEPS ${COMMON_DEPS} ../pics/win32.o PARENT_SCOPE)
+    else(MINGW)
+       set(COMMON_DEPS ${COMMON_DEPS} ../pics/win32.rc PARENT_SCOPE)
+    endif(MINGW)
 endif(WIN32)
 
 if(WANT_MONO OR WANT_QTCLIENT)
   if(EMBED_DATA)
     set(CLIENT_RCS ${CLIENT_RCS} ../pics/pics.qrc PARENT_SCOPE)
   else(EMBED_DATA)
-    install(FILES qt-logo.png
-                  quassel-large.png
-            DESTINATION ${DATA_INSTALL_DIR}/quassel/pics)
+    # We don't find them yet externally, so disable installation
+    set(CLIENT_RCS ${CLIENT_RCS} ../pics/pics.qrc PARENT_SCOPE)
+    # install(FILES qt-logo.png
+    #               quassel-large.png
+    #         DESTINATION ${DATA_INSTALL_DIR}/quassel/pics)
   endif(EMBED_DATA)
 endif(WANT_MONO OR WANT_QTCLIENT)