X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=build%2Ftargets%2Ftarget.pri;h=2bde2a389968cef53c4bb3b3db92c89510001157;hb=8a863642c897762cbf5361a9f2998db568b7e23b;hp=428daeff5cec97e3c7b0d6bdd3c854321625aa8a;hpb=4f57130f3cf27a397d04a5f6fe468e8e1108034d;p=quassel.git

diff --git a/build/targets/target.pri b/build/targets/target.pri
index 428daeff..2bde2a38 100644
--- 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
 }