From d06baaaa1d252b88592fd91a318bbd52d8de508d Mon Sep 17 00:00:00 2001
From: Matt Liberty <matt.liberty@gmail.com>
Date: Fri, 25 Oct 2013 06:39:45 -0700
Subject: Clean up build of minor executables to use proper paths and obj
 subdirs

---
 encodeleaves/encodeleaves.pro | 14 +++++++++-----
 gaddagize/gaddagize.pro       |  9 ++++++++-
 makegaddag/makegaddag.pro     |  9 ++++++---
 makeminidawg/makeminidawg.pro | 14 +++++++++-----
 quackleio/iotest/iotest.pro   |  8 +++++---
 test/test.pro                 | 13 ++++++++-----
 6 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/encodeleaves/encodeleaves.pro b/encodeleaves/encodeleaves.pro
index 6a32c0a..0ee4fdc 100644
--- a/encodeleaves/encodeleaves.pro
+++ b/encodeleaves/encodeleaves.pro
@@ -4,18 +4,22 @@ INCLUDEPATH += . ..
 
 # enable/disable debug symbols
 # CONFIG += debug
+CONFIG += release
 
 CONFIG += console
 
-build_pass:CONFIG(debug, debug|release) {
-	LIBS += -L../debug -L../quackleio/debug
+debug {
+  OBJECTS_DIR = obj/debug
 }
 
-build_pass:CONFIG(release, debug|release) {
-	LIBS += -L../release -L../quackleio/release
+release {
+  OBJECTS_DIR = obj/release
 }
 
-LIBS += -L.. -L../quackleio -lquackle -lquackleio
+LIBS += -lquackle -lquackleio
+
+QMAKE_LFLAGS_RELEASE += -L../lib/release -L../quackleio/lib/release
+QMAKE_LFLAGS_DEBUG += -L../lib/debug -L../quackleio/lib/debug
 
 # Input
 SOURCES += encodeleaves.cpp
diff --git a/gaddagize/gaddagize.pro b/gaddagize/gaddagize.pro
index 83f5452..8ec1130 100755
--- a/gaddagize/gaddagize.pro
+++ b/gaddagize/gaddagize.pro
@@ -4,10 +4,17 @@ INCLUDEPATH += . ..
 
 # enable/disable debug symbols
 # CONFIG += debug
+CONFIG += release
 
 CONFIG += console
 
-#LIBS += -L.. -L../quackleio -lquackle -lquackleio
+debug {
+  OBJECTS_DIR = obj/debug
+}
+
+release {
+  OBJECTS_DIR = obj/release
+}
 
 # Input
 SOURCES += gaddagize.cpp
diff --git a/makegaddag/makegaddag.pro b/makegaddag/makegaddag.pro
index db99cbb..e6a672a 100755
--- a/makegaddag/makegaddag.pro
+++ b/makegaddag/makegaddag.pro
@@ -1,14 +1,14 @@
 TEMPLATE = app
 DEPENDPATH += .. ../quackleio
 INCLUDEPATH += . ..
+CONFIG += release
+
 debug {
   OBJECTS_DIR = obj/debug
-  win32 { LIBS += -L../debug -L../quackleio/debug }
 }
 
 release {
   OBJECTS_DIR = obj/release
-  win32 { LIBS += -L../release -L../quackleio/release }
 }
 
 MOC_DIR = moc
@@ -18,7 +18,10 @@ MOC_DIR = moc
 
 CONFIG += console
 
-LIBS += -L.. -L../quackleio -lquackle -lquackleio
+LIBS += -lquackle -lquackleio
+
+QMAKE_LFLAGS_RELEASE += -L../lib/release -L../quackleio/lib/release
+QMAKE_LFLAGS_DEBUG += -L../lib/debug -L../quackleio/lib/debug
 
 # Input
 SOURCES += makegaddag.cpp
diff --git a/makeminidawg/makeminidawg.pro b/makeminidawg/makeminidawg.pro
index d58266d..9288b92 100644
--- a/makeminidawg/makeminidawg.pro
+++ b/makeminidawg/makeminidawg.pro
@@ -4,19 +4,23 @@ INCLUDEPATH += . ..
 
 # enable/disable debug symbols
 # CONFIG += debug
+CONFIG += release
 
 CONFIG += console
 CONFIG -= x11
 
-build_pass:CONFIG(debug, debug|release) {
-	LIBS += -L../debug -L../quackleio/debug
+debug {
+  OBJECTS_DIR = obj/debug
 }
 
-build_pass:CONFIG(release, debug|release) {
-	LIBS += -L../release -L../quackleio/release
+release {
+  OBJECTS_DIR = obj/release
 }
 
-LIBS += -L.. -L../quackleio -lquackle -lquackleio
+LIBS += -lquackle -lquackleio
+
+QMAKE_LFLAGS_RELEASE += -L../lib/release -L../quackleio/lib/release
+QMAKE_LFLAGS_DEBUG += -L../lib/debug -L../quackleio/lib/debug
 
 # Input
 HEADERS += minidawgmaker.h
diff --git a/quackleio/iotest/iotest.pro b/quackleio/iotest/iotest.pro
index 86d32a3..a1e3670 100644
--- a/quackleio/iotest/iotest.pro
+++ b/quackleio/iotest/iotest.pro
@@ -4,18 +4,20 @@ INCLUDEPATH += . .. ../..
 
 # enable/disable debug symbols
 #CONFIG += debug
+CONFIG += release
 
 debug {
   OBJECTS_DIR = obj/debug
-  win32 { LIBS += -L../debug -L../../debug }
 }
 
 release {
   OBJECTS_DIR = obj/release
-  win32 { LIBS += -L../release -L../../release }
 }
 
-LIBS += -L.. -L../.. -lquackle -lquackleio
+LIBS += -lquackle -lquackleio
+
+QMAKE_LFLAGS_RELEASE += -L../../lib/release -L../../quackleio/lib/release
+QMAKE_LFLAGS_DEBUG += -L../../lib/debug -L../../quackleio/lib/debug
 
 # Input
 HEADERS += trademarkedboards.h
diff --git a/test/test.pro b/test/test.pro
index facaa35..daba0fb 100644
--- a/test/test.pro
+++ b/test/test.pro
@@ -9,15 +9,18 @@ CONFIG += console
 CONFIG -= x11
 CONFIG += release
 
-build_pass:CONFIG(debug, debug|release) {
-	LIBS += -L../debug -L../quackleio/debug
+debug {
+  OBJECTS_DIR = obj/debug
 }
 
-build_pass:CONFIG(release, debug|release) {
-	LIBS += -L../release -L../quackleio/release
+release {
+  OBJECTS_DIR = obj/release
 }
 
-LIBS += -L.. -L../quackleio -lquackle -lquackleio
+LIBS += -lquackle -lquackleio
+
+QMAKE_LFLAGS_RELEASE += -L../lib/release -L../quackleio/lib/release
+QMAKE_LFLAGS_DEBUG += -L../lib/debug -L../quackleio/lib/debug
 
 # Input
 HEADERS += testharness.h trademarkedboards.h
-- 
cgit v1.2.3