From 44b96e6fb5f484e9a60fe03b99021a1c5f78488d Mon Sep 17 00:00:00 2001
From: Tannin <sherb@gmx.net>
Date: Sun, 3 Feb 2013 13:34:53 +0100
Subject: bsatk is now part of the Mod Organizer repository

---
 src/ModOrganizer.pro  | 7 ++++---
 src/organizer.pro     | 6 +++---
 src/shared/shared.pro | 6 +++---
 3 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/ModOrganizer.pro b/src/ModOrganizer.pro
index 3d7e2656..8b6db27a 100644
--- a/src/ModOrganizer.pro
+++ b/src/ModOrganizer.pro
@@ -2,14 +2,15 @@ TEMPLATE = subdirs
 CONFIG += ordered
 
 
-SUBDIRS = shared \
+SUBDIRS = bsatk \
+					shared \
 					uibase \
 					organizer \
 					hookdll \
 					archive \
 					helper \
           plugins \
-          proxydll
+					proxydll
 
 hookdll.depends = shared
 organizer.depends = shared, uibase
@@ -18,4 +19,4 @@ CONFIG(debug, debug|release) {
     DESTDIR = outputd
 } else {
     DESTDIR = output
-}
\ No newline at end of file
+}
diff --git a/src/organizer.pro b/src/organizer.pro
index 497ce3ec..29c3b5fa 100644
--- a/src/organizer.pro
+++ b/src/organizer.pro
@@ -175,7 +175,7 @@ FORMS    += \
     activatemodsdialog.ui \
     profileinputdialog.ui
 
-INCLUDEPATH += ../shared ../archive ../uibase ../../../bsatk "$(BOOSTPATH)"
+INCLUDEPATH += ../shared ../archive ../uibase ../bsatk "$(BOOSTPATH)"
 
 LIBS += -L"$(BOOSTPATH)/stage/lib"
 
@@ -183,12 +183,12 @@ LIBS += -L"$(BOOSTPATH)/stage/lib"
 CONFIG(debug, debug|release) {
 	OUTDIR = $$OUT_PWD/debug
 	DSTDIR = $$PWD/../../outputd
-	LIBS += -L$$OUT_PWD/../shared/debug -L../../../bsatk-build/debug
+	LIBS += -L$$OUT_PWD/../shared/debug -L$$OUT_PWD/../bsatk/debug
 	LIBS += -L$$OUT_PWD/../uibase/debug
 } else {
 	OUTDIR = $$OUT_PWD/release
 	DSTDIR = $$PWD/../../output
-	LIBS += -L$$OUT_PWD/../shared/release -L../../../bsatk-build/release
+	LIBS += -L$$OUT_PWD/../shared/release -L$$OUT_PWD/../bsatk/release
 	LIBS += -L$$OUT_PWD/../uibase/release
 	QMAKE_CXXFLAGS += /Zi
 	QMAKE_LFLAGS += /DEBUG
diff --git a/src/shared/shared.pro b/src/shared/shared.pro
index 3e1283e6..9489958a 100644
--- a/src/shared/shared.pro
+++ b/src/shared/shared.pro
@@ -11,13 +11,13 @@ TARGET = mo_shared
 TEMPLATE = lib
 CONFIG += staticlib
 
-INCLUDEPATH += ../../../bsatk "$(BOOSTPATH)"
+INCLUDEPATH += ../bsatk "$(BOOSTPATH)"
 
 CONFIG(debug, debug|release) {
-    LIBS += -L../../../bsatk-build/debug
+		LIBS += -L$$OUT_PWD/../bsatk/debug
 
 } else {
-    LIBS += -L../../../bsatk-build/release
+		LIBS += -L$$OUT_PWD/../bsatk/release
 }
 
 LIBS += -lbsatk
-- 
cgit v1.3.1