Cleaning up the icon dir

[quassel.git] / build / targets / target.pri

diff --git a/build/targets/target.pri b/build/targets/target.pri
index 428daef..2bde2a3 100644 (file)
--- a/build/targets/target.pri
+++ b/build/targets/target.pri
@@ -10,7 +10,7 @@ SRCPATH = ../../src
 OBJECTS_DIR = .$$TARGET
 RCC_DIR     = .$$TARGET
 
-linux-g++:static {
+linux-g++*:static {
   # We put libs in contrib/libs that should be linked statically, especially libstdc++.a
   LIBS *= -L../contrib/libs
   QMAKE_LFLAGS *= -static-libgcc
@@ -19,7 +19,7 @@ linux-g++:static {
 for(mod, MODULES) {
   INCLUDEPATH *= $$SRCPATH/$$mod
   LIBS *= -L../modules/$$dirname(mod) -l$$basename(mod)
-  #PRE_TARGETDEPS *= ../modules/$$mod
+  PRE_TARGETDEPS *= ../modules/$$mod
 }
 PRE_TARGETDEPS *= ../../version.inc
 
@@ -31,13 +31,16 @@ SOURCES = $$SRCPATH/common/main.cpp
 # This is really annoying, but for some reason win32 libs are not included by default.
 # Ugly workaround following...
 
-win32 {
+win32:static {
   RC_FILE = win32.rc
   CONFIG += embed_manifest_exe
   LIBS *= -luser32 -lgdi32 -lkernel32 -lshell32 -lwsock32 -lwinspool -lcomdlg32 -lole32
   LIBS *= -ladvapi32 -limm32 -luuid -lwinmm -ldelayimp -lopengl32 -lglu32 -loleaut32 -lws2_32
+  LIBS *= -llibeay32MD -lssleay32MD
+  QMAKE_LFLAGS_WINDOWS += /nodefaultlib:"libcmt.lib"
+
 }
 
 macx {
-  ICON = ../../src/icons/quassel.icns
+  ICON = ../../src/icons/quassel/quassel.icns
 }