From 2b5748003d2ae4de1b897041f92df3e0495b2825 Mon Sep 17 00:00:00 2001
From: TheBloke <devnull@localhost>
Date: Mon, 7 Jul 2014 23:32:18 +0100
Subject: .pro files - formatting/consistency fixes  Many small formatting
 changes to the majority of .pro files  Consistent style for Qt version
 checking, using greaterThan(QT_MAJOR_VERSION, 4)   This seems safest, as
 would continue to work for a future Qt 6 etc.   Note that this makes
 redudundant the commit before this one, to organizer.pro  Consistent
 indenting  Moved some file configuration sections to be together with related
 sections  Moved some installation-related sections (e.g. OUTDIR/DSTDIR) to be
 at the bottom,   immediately before the related POST_LINK install lines. 
 Similarly, in some cases separated out CONFIG(debug,.. checks into separate  
 LIB/INCLUDE sections (high in file) and installation directory sections (low 
   in file)

---
 src/shared/shared.pro | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/shared/shared.pro')

diff --git a/src/shared/shared.pro b/src/shared/shared.pro
index 992fd7f2..5f327fa3 100644
--- a/src/shared/shared.pro
+++ b/src/shared/shared.pro
@@ -21,11 +21,11 @@ INCLUDEPATH += ../bsatk "$(BOOSTPATH)"
 
 CONFIG(debug, debug|release) {
   LIBS += -L$$OUT_PWD/../bsatk/debug
-	LIBS += -lDbgHelp
+  LIBS += -lDbgHelp
   QMAKE_CXXFLAGS_DEBUG -= -Zi
   QMAKE_CXXFLAGS += -Z7
 } else {
-		LIBS += -L$$OUT_PWD/../bsatk/release
+  LIBS += -L$$OUT_PWD/../bsatk/release
 }
 
 LIBS += -lbsatk
-- 
cgit v1.3.1


From 0046d8710e895a158b7e49678eae1514c5b7dc88 Mon Sep 17 00:00:00 2001
From: TheBloke <devnull@localhost>
Date: Tue, 8 Jul 2014 04:01:24 +0100
Subject: Compilation dependency tracking enabled for organizer, hook,
 bsaExtractor, shared  Previously, qmake did not detect when code was changed
 in the static libraries  So for example, changing code in shared/*.cpp and
 then Build, would not cause   a re-link and re-deploy of ModOrganizer.exe. 
 This has been fixed by adding PRE_TARGETDEPS references to each project that 
  depend on static libraries provided by other sub-projects.  These checks are
 conditional on debug|release, to point to the correct lib.

 List of currently configured static library dependency checks -
  organizer - mo_shared.lib, bsatk.lib
  hookdll - mo_shared.lib, bsatk.lib
  shared - bsatk.lib
  bsaExtractor - bsatk.lib

 I have tested to confirm that changing a shared file results in re-linking and
  re-deplomyent of both ModOrganizer.exe and hook.dll.

 Note that dependencies have not been configured for DLLs, as these are
  loaded dynamically and so recompilation is not required.
  But there could be an argument for configuring DLLs as dependencies too -
   as if you make a change in DLL code, you might want all clients of the DLL to
    be recompiled to check that they have not been broken by the changes?
  The downside of that would be extra re-compilation every time.
---
 src/organizer.pro     | 4 ++++
 src/shared/shared.pro | 2 ++
 2 files changed, 6 insertions(+)

(limited to 'src/shared/shared.pro')

diff --git a/src/organizer.pro b/src/organizer.pro
index 5be205b4..e013aab7 100644
--- a/src/organizer.pro
+++ b/src/organizer.pro
@@ -252,6 +252,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 \
+    $$OUT_PWD/../bsatk/debug/bsatk.lib
 } else {
   LIBS += -L$$OUT_PWD/../shared/release
   LIBS += -L$$OUT_PWD/../bsatk/release
@@ -260,6 +262,8 @@ CONFIG(debug, debug|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 \
+    $$OUT_PWD/../bsatk/release/bsatk.lib
 }
 
 #QMAKE_CXXFLAGS_WARN_ON -= -W3
diff --git a/src/shared/shared.pro b/src/shared/shared.pro
index 5f327fa3..c5925c24 100644
--- a/src/shared/shared.pro
+++ b/src/shared/shared.pro
@@ -24,8 +24,10 @@ CONFIG(debug, debug|release) {
   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
-- 
cgit v1.3.1