From 3a1dd24afe094d68259b59273e2970e461f2718a Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Thu, 20 Mar 2008 19:10:15 +0000 Subject: [PATCH] Adding static build stuff to trunk instead of a branch... -_- --- build/buildconf.pri | 12 +++++++++--- build/targets/target.pri | 6 ++++++ version.inc | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/build/buildconf.pri b/build/buildconf.pri index e4a57104..458d3521 100644 --- 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 9db3081b..48ed6e55 100644 --- 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 20604aa2..dd60c4a1 100644 --- 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; -- 2.20.1