diff options
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/directoryentry.cpp | 4 | ||||
| -rw-r--r-- | src/shared/directoryentry.h | 2 | ||||
| -rw-r--r-- | src/shared/shared.pro | 53 |
3 files changed, 31 insertions, 28 deletions
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 7836d719..096f373e 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}"
|
