From 2a31eb40fbc9f68cb23755349b8c4c976d8a2bb7 Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Wed, 28 May 2014 14:14:28 +0200
Subject: small bugfixes

---
 src/organizer.pro | 38 ++++++--------------------------------
 1 file changed, 6 insertions(+), 32 deletions(-)

(limited to 'src/organizer.pro')

diff --git a/src/organizer.pro b/src/organizer.pro
index 2f34c1c1..073d2906 100644
--- a/src/organizer.pro
+++ b/src/organizer.pro
@@ -256,6 +256,8 @@ TRANSLATIONS = organizer_de.ts \
 
 LIBS += -lmo_shared -luibase -lshell32 -lole32 -luser32 -ladvapi32 -lgdi32 -lPsapi -lVersion -lbsatk -lshlwapi
 
+LIBS += -L"$(ZLIBPATH)/build" -lzlibstatic
+
 DEFINES += UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS NOMINMAX
 
 DEFINES += BOOST_DISABLE_ASSERTS NDEBUG
@@ -264,6 +266,10 @@ DEFINES += BOOST_DISABLE_ASSERTS NDEBUG
 HGID = $$system(hg id -i)
 DEFINES += HGID=\\\"$${HGID}\\\"
 
+load(moc)
+include(../common.pri)
+QMAKE_MOC += $$MOCDEFINES
+
 SRCDIR = $$PWD
 SRCDIR ~= s,/,$$QMAKE_DIR_SEP,g
 OUTDIR ~= s,/,$$QMAKE_DIR_SEP,g
@@ -312,38 +318,6 @@ OTHER_FILES += \
     tutorials/tutorials_installdialog.qml
 
 
-load(moc)
-
-# for each Boost header you include...
-QMAKE_MOC += \
-	-DBOOST_MPL_IF_HPP_INCLUDED \
-	-DBOOST_TT_TYPE_WITH_ALIGNMENT_INCLUDED \
-	-DBOOST_MPL_VOID_HPP_INCLUDED \
-	-DBOOST_MPL_NOT_HPP_INCLUDED \
-	-DBOOST_MPL_IDENTITY_HPP_INCLUDED \
-	-DBOOST_VARIANT_VARIANT_FWD_HPP \
-	-DBOOST_MPL_NEXT_PRIOR_HPP_INCLUDED \
-	-DBOOST_MPL_O1_SIZE_HPP_INCLUDED \
-	-DBOOST_MPL_DEREF_HPP_INCLUDED \
-	-DBOOST_MPL_PAIR_HPP_INCLUDED \
-	-DBOOST_MPL_ITER_FOLD_HPP_INCLUDED \
-	-DBOOST_MPL_PROTECT_HPP_INCLUDED \
-	-DBOOST_MPL_EVAL_IF_HPP_INCLUDED \
-	-DBOOST_MPL_SEQUENCE_TAG_HPP_INCLUDED \
-	-DBOOST_MPL_EMPTY_HPP_INCLUDED \
-	-DBOOST_MPL_ALWAYS_HPP_INCLUDED \
-	-DBOOST_MPL_TRANSFORM_HPP_INCLUDED \
-	-DBOOST_MPL_CLEAR_HPP_INCLUDED \
-	-DBOOST_MPL_BEGIN_END_HPP_INCLUDED \
-	-DBOOST_MPL_FOLD_HPP_INCLUDED \
-	-DBOOST_MPL_FRONT_HPP_INCLUDED \
-	-DBOOST_MPL_IS_SEQUENCE_HPP_INCLUDED \
-	-DBOOST_MPL_ITERATOR_RANGE_HPP_INCLUDED \
-	-DBOOST_MPL_MAX_ELEMENT_HPP_INCLUDED \
-	-DBOOST_MPL_PUSH_FRONT_HPP_INCLUDED \
-	-DBOOST_RESULT_OF_HPP \
-	-DBOOST_MPL_ITER_FOLD_IF_HPP_INCLUDED
-
 # leak detection with vld
 #INCLUDEPATH += "E:/Visual Leak Detector/include"
 #LIBS += -L"E:/Visual Leak Detector/lib/Win32"
-- 
cgit v1.3.1