Merge branch 'master' of git@git.quassel-irc.org:quassel

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

diff --git a/build/targets/target.pri b/build/targets/target.pri
index ed9423e..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
 
@@ -42,5 +42,5 @@ win32:static {
 }
 
 macx {
-  ICON = ../../src/icons/quassel.icns
+  ICON = ../../src/icons/quassel/quassel.icns
 }