From 9daeb9479bd2675d0feef1e1f7bffb3f73361e30 Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Mon, 8 Sep 2014 20:37:23 +0200
Subject: - re-enabled building of loot_cli and started developing against the
 new api - extended set of default categories - more tolerand bbcode parser -
 added a few colors for the bbcode parser - more fixes to qt5 compatibility -
 started work on ability to unloading (and thus re-loading) of plugins - names
 of plugins are no longer localizable (because those names are also used to
 store settings) - added settings to disable individual diagnosis settings -
 path of dependencies is now configured in a .pri file instead of environment
 variablees - bugfix: if the modid-input is canceled, the id was saved as -1
 and wasn't re-requested from the user - bugfix: moving files with the
 SHFileOperation-Api didn't update the vfs correctly (still not perfect but
 better) - bugfix: attempt to remove the deleter-file seems to have caused
 error messages for some users - bugfix: fixed a couple of cases that might
 have caused the tutorial to hang

---
 src/shared/directoryentry.cpp |  4 ----
 src/shared/directoryentry.h   |  2 ++
 src/shared/shared.pro         | 53 +++++++++++++++++++++++--------------------
 3 files changed, 31 insertions(+), 28 deletions(-)

(limited to 'src/shared')

diff --git a/src/shared/directoryentry.cpp b/src/shared/directoryentry.cpp
index e0914870..5d785822 100644
--- a/src/shared/directoryentry.cpp
+++ b/src/shared/directoryentry.cpp
@@ -936,10 +936,6 @@ void FileRegister::removeOriginMulti(std::set<FileEntry::Index> indices, int ori
     }
   }
 
-  if (removedFiles.size() > 0) {
-    log("%d files actually removed", removedFiles.size());
-  }
-
   // optimization: this is only called when disabling an origin and in this case we don't have
   // to remove the file from the origin
 
diff --git a/src/shared/directoryentry.h b/src/shared/directoryentry.h
index 1e904311..0ab1ee36 100644
--- a/src/shared/directoryentry.h
+++ b/src/shared/directoryentry.h
@@ -29,8 +29,10 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #define WIN32_MEAN_AND_LEAN
 #include <Windows.h>
 #include <bsatk.h>
+#ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
+#endif
 #include "util.h"
 
 
diff --git a/src/shared/shared.pro b/src/shared/shared.pro
index 84a9c274..69f6f2e6 100644
--- a/src/shared/shared.pro
+++ b/src/shared/shared.pro
@@ -11,33 +11,11 @@ TARGET = mo_shared
 TEMPLATE = lib
 CONFIG += staticlib
 
-INCLUDEPATH += ../bsatk "$(BOOSTPATH)"
 
-
-# only for custom leak detection
-DEFINES += TRACE_LEAKS
-LIBS += -lDbgHelp
-
-
-CONFIG(debug, debug|release) {
-  LIBS += -L$$OUT_PWD/../bsatk/debug
-  LIBS += -lDbgHelp
-  QMAKE_CXXFLAGS_DEBUG -= -Zi
-  QMAKE_CXXFLAGS += -Z7
-  PRE_TARGETDEPS += $$OUT_PWD/../bsatk/debug/bsatk.lib
-} else {
-  LIBS += -L$$OUT_PWD/../bsatk/release
-  PRE_TARGETDEPS += $$OUT_PWD/../bsatk/release/bsatk.lib
+!include(../LocalPaths.pri) {
+  message("paths to required libraries need to be set up in LocalPaths.pri")
 }
 
-LIBS += -lbsatk
-
-DEFINES += UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS
-
-DEFINES += BOOST_DISABLE_ASSERTS NDEBUG
-
-# QMAKE_CXXFLAGS += /analyze
-
 SOURCES += \
     inject.cpp \
     windows_error.cpp \
@@ -66,3 +44,30 @@ HEADERS += \
     appconfig.h \
     appconfig.inc \
     leaktrace.h
+
+
+# only for custom leak detection
+DEFINES += TRACE_LEAKS
+LIBS += -lDbgHelp
+
+
+CONFIG(debug, debug|release) {
+  LIBS += -L$$OUT_PWD/../bsatk/debug
+  LIBS += -lDbgHelp
+  QMAKE_CXXFLAGS_DEBUG -= -Zi
+  QMAKE_CXXFLAGS += -Z7
+  PRE_TARGETDEPS += $$OUT_PWD/../bsatk/debug/bsatk.lib
+} else {
+  LIBS += -L$$OUT_PWD/../bsatk/release
+  PRE_TARGETDEPS += $$OUT_PWD/../bsatk/release/bsatk.lib
+}
+
+LIBS += -lbsatk
+
+DEFINES += UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS
+
+DEFINES += BOOST_DISABLE_ASSERTS NDEBUG
+
+# QMAKE_CXXFLAGS += /analyze
+
+INCLUDEPATH += ../bsatk "$${BOOSTPATH}"
-- 
cgit v1.3.1