1 files changed, 22 insertions, 18 deletions
diff --git a/src/organizer.pro b/src/organizer.pro
index 4e46d1c1..77408cc5 100644
--- a/src/organizer.pro
+++ b/src/organizer.pro
@@ -14,6 +14,10 @@ greaterThan(QT_MAJOR_VERSION, 4) {
   QT       += core gui network xml declarative script sql xmlpatterns webkit
 }
 
+!include(../LocalPaths.pri) {
+  message("paths to required libraries need to be set up in LocalPaths.pri")
+}
+
 SOURCES += \
     transfersavesdialog.cpp \
     syncoverwritedialog.cpp \
@@ -246,9 +250,9 @@ LIBS += -lDbgHelp
 #DEFINES += TEST_MODELS
 
 
-INCLUDEPATH += ../shared ../archive ../uibase ../bsatk ../esptk ../boss_modified/boss-api "$(BOOSTPATH)"
+INCLUDEPATH += ../shared ../archive ../uibase ../bsatk ../esptk ../boss_modified/boss-api "$${BOOSTPATH}"
 
-LIBS += -L"$(BOOSTPATH)/stage/lib"
+LIBS += -L"$${BOOSTPATH}/stage/lib"
 
 CONFIG(debug, debug|release) {
   LIBS += -L$$OUT_PWD/../shared/debug
@@ -256,7 +260,8 @@ CONFIG(debug, debug|release) {
   LIBS += -L$$OUT_PWD/../uibase/debug
   LIBS += -L$$OUT_PWD/../boss_modified/debug
   LIBS += -lDbgHelp
-  PRE_TARGETDEPS += $$OUT_PWD/../shared/debug/mo_shared.lib \
+  PRE_TARGETDEPS += \
+    $$OUT_PWD/../shared/debug/mo_shared.lib \
     $$OUT_PWD/../bsatk/debug/bsatk.lib
 } else {
   LIBS += -L$$OUT_PWD/../shared/release
@@ -264,20 +269,19 @@ CONFIG(debug, debug|release) {
   LIBS += -L$$OUT_PWD/../uibase/release
   LIBS += -L$$OUT_PWD/../boss_modified/release
   QMAKE_CXXFLAGS += /Zi# /GL
-#  QMAKE_CXXFLAGS -= -O2
   QMAKE_LFLAGS += /DEBUG# /LTCG /OPT:REF /OPT:ICF
-  PRE_TARGETDEPS += $$OUT_PWD/../shared/release/mo_shared.lib \
+  PRE_TARGETDEPS += \
+    $$OUT_PWD/../shared/release/mo_shared.lib \
     $$OUT_PWD/../bsatk/release/bsatk.lib
 }
 
 #QMAKE_CXXFLAGS_WARN_ON -= -W3
 #QMAKE_CXXFLAGS_WARN_ON += -W4
-QMAKE_CXXFLAGS += -wd4127 -wd4512 -wd4189
+QMAKE_CXXFLAGS += -wd4100 -wd4127 -wd4512 -wd4189
 
 CONFIG += embed_manifest_exe
 
 # QMAKE_CXXFLAGS += /analyze
-
 # QMAKE_LFLAGS += /MANIFESTUAC:\"level=\'highestAvailable\' uiAccess=\'false\'\"
 
 TRANSLATIONS = organizer_de.ts \
@@ -311,9 +315,9 @@ TRANSLATIONS = organizer_de.ts \
 
 LIBS += -lmo_shared -luibase -lshell32 -lole32 -luser32 -ladvapi32 -lgdi32 -lPsapi -lVersion -lbsatk -lshlwapi
 
-LIBS += -L"$(ZLIBPATH)/build" -lzlibstatic
+LIBS += -L"$${ZLIBPATH}/build" -lzlibstatic
 
-DEFINES += UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS NOMINMAX
+DEFINES += UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS _SCL_SECURE_NO_WARNINGS NOMINMAX
 
 DEFINES += BOOST_DISABLE_ASSERTS NDEBUG
 #DEFINES += QMLJSDEBUGGER
@@ -322,23 +326,23 @@ HGID = $$system(hg id -i)
 DEFINES += HGID=\\\"$${HGID}\\\"
 
 CONFIG(debug, debug|release) {
-  OUTDIR = $$OUT_PWD/debug
+  SRCDIR = $$OUT_PWD/debug
   DSTDIR = $$PWD/../../outputd
 } else {
-  OUTDIR = $$OUT_PWD/release
+  SRCDIR = $$OUT_PWD/release
   DSTDIR = $$PWD/../../output
 }
 
-SRCDIR = $$PWD
+BASEDIR = $$PWD
+BASEDIR ~= s,/,$$QMAKE_DIR_SEP,g
 SRCDIR ~= s,/,$$QMAKE_DIR_SEP,g
-OUTDIR ~= s,/,$$QMAKE_DIR_SEP,g
 DSTDIR ~= s,/,$$QMAKE_DIR_SEP,g
 
-QMAKE_POST_LINK += xcopy /y /I $$quote($$OUTDIR\\ModOrganizer*.exe) $$quote($$DSTDIR) $$escape_expand(\\n)
-QMAKE_POST_LINK += xcopy /y /I $$quote($$OUTDIR\\ModOrganizer*.pdb) $$quote($$DSTDIR) $$escape_expand(\\n)
-QMAKE_POST_LINK += xcopy /y /s /I $$quote($$SRCDIR\\stylesheets) $$quote($$DSTDIR)\\stylesheets $$escape_expand(\\n)
-QMAKE_POST_LINK += xcopy /y /s /I $$quote($$SRCDIR\\tutorials) $$quote($$DSTDIR)\\tutorials $$escape_expand(\\n)
-QMAKE_POST_LINK += xcopy /y /s /I $$quote($$SRCDIR\\*.qm) $$quote($$DSTDIR)\\translations $$escape_expand(\\n)
+QMAKE_POST_LINK += xcopy /y /I $$quote($$SRCDIR\\ModOrganizer*.exe) $$quote($$DSTDIR) $$escape_expand(\\n)
+QMAKE_POST_LINK += xcopy /y /I $$quote($$SRCDIR\\ModOrganizer*.pdb) $$quote($$DSTDIR) $$escape_expand(\\n)
+QMAKE_POST_LINK += xcopy /y /s /I $$quote($$BASEDIR\\stylesheets) $$quote($$DSTDIR)\\stylesheets $$escape_expand(\\n)
+QMAKE_POST_LINK += xcopy /y /s /I $$quote($$BASEDIR\\tutorials) $$quote($$DSTDIR)\\tutorials $$escape_expand(\\n)
+QMAKE_POST_LINK += xcopy /y /s /I $$quote($$BASEDIR\\*.qm) $$quote($$DSTDIR)\\translations $$escape_expand(\\n)
 
 CONFIG(debug, debug|release) {
   QMAKE_POST_LINK += xcopy /y /s /I $$quote($$SRCDIR\\..\\dlls.*manifest.debug) $$quote($$DSTDIR)\\dlls $$escape_expand(\\n)