Adding static build stuff to trunk instead of a branch... -_-

diff --git a/build/buildconf.pri b/build/buildconf.pri
index e4a5710..458d352 100644 (file)
--- a/build/buildconf.pri
+++ b/build/buildconf.pri
@@ -1,6 +1,12 @@
-CONFIG += debug warn_on uic resources qt
+CONFIG += warn_on uic resources qt
 # CONFIG += incremental link_prl nostrip qt_no_framework
 
-win32{ 
-CONFIG = release warn_on uic resources qt windows static
+release {
+  CONFIG *= release strip
+} else {
+  CONFIG *= debug
+}
+
+win32 { 
+  CONFIG = release warn_on uic resources qt windows static
 }

diff --git a/build/targets/target.pri b/build/targets/target.pri
index 9db3081..48ed6e5 100644 (file)
--- a/build/targets/target.pri
+++ b/build/targets/target.pri
@@ -10,6 +10,12 @@ SRCPATH = ../../src
 OBJECTS_DIR = .$$TARGET
 RCC_DIR     = .$$TARGET
 
+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
+}
+
 for(mod, MODULES) {
   INCLUDEPATH *= $$SRCPATH/$$mod
   LIBS *= -L../modules/$$dirname(mod) -l$$basename(mod)

diff --git a/version.inc b/version.inc
index 20604aa..dd60c4a 100644 (file)
--- a/version.inc
+++ b/version.inc
@@ -5,7 +5,7 @@
 
   quasselVersion = "0.2.0-alpha4-pre";
   quasselDate = "2008-03-20";
-  quasselBuild = 651;
+  quasselBuild = 653;
 
   //! Minimum client build number the core needs
   clientBuildNeeded = 642;