diff options
| author | Matt Liberty <matt.liberty@gmail.com> | 2013-10-25 06:57:33 -0700 |
|---|---|---|
| committer | Matt Liberty <matt.liberty@gmail.com> | 2013-10-25 06:57:33 -0700 |
| commit | 40da2cddafd0126bb6964383b4ac402bc37f3e59 (patch) | |
| tree | 7e58b54a2f55a789e7a4c7a3e843b1ec86fdae1c | |
| parent | 12d5a2b5582c762465a3173fe40bfaf9ef1f0adc (diff) | |
Reorder -lquackleio before -lquackle due to dependencies
| -rwxr-xr-x | makegaddag/makegaddag.pro | 2 | ||||
| -rw-r--r-- | makeminidawg/makeminidawg.pro | 2 | ||||
| -rw-r--r-- | quacker/quacker.pro | 2 | ||||
| -rw-r--r-- | quackleio/iotest/iotest.pro | 2 | ||||
| -rw-r--r-- | quackleio/quackleio.pro | 4 | ||||
| -rw-r--r-- | test/test.pro | 2 |
6 files changed, 5 insertions, 9 deletions
diff --git a/makegaddag/makegaddag.pro b/makegaddag/makegaddag.pro index e6a672a..a1e0075 100755 --- a/makegaddag/makegaddag.pro +++ b/makegaddag/makegaddag.pro @@ -18,7 +18,7 @@ MOC_DIR = moc CONFIG += console -LIBS += -lquackle -lquackleio +LIBS += -lquackleio -lquackle QMAKE_LFLAGS_RELEASE += -L../lib/release -L../quackleio/lib/release QMAKE_LFLAGS_DEBUG += -L../lib/debug -L../quackleio/lib/debug diff --git a/makeminidawg/makeminidawg.pro b/makeminidawg/makeminidawg.pro index 9288b92..0896874 100644 --- a/makeminidawg/makeminidawg.pro +++ b/makeminidawg/makeminidawg.pro @@ -17,7 +17,7 @@ release { OBJECTS_DIR = obj/release } -LIBS += -lquackle -lquackleio +LIBS += -lquackleio -lquackle QMAKE_LFLAGS_RELEASE += -L../lib/release -L../quackleio/lib/release QMAKE_LFLAGS_DEBUG += -L../lib/debug -L../quackleio/lib/debug diff --git a/quacker/quacker.pro b/quacker/quacker.pro index a484a0d..785761e 100644 --- a/quacker/quacker.pro +++ b/quacker/quacker.pro @@ -20,7 +20,7 @@ release { QMAKE_LFLAGS_RELEASE += -L../lib/release -L../quackleio/lib/release QMAKE_LFLAGS_DEBUG += -L../lib/debug -L../quackleio/lib/debug -LIBS += -lquackle -lquackleio +LIBS += -lquackleio -lquackle # Input HEADERS += *.h diff --git a/quackleio/iotest/iotest.pro b/quackleio/iotest/iotest.pro index a1e3670..d1b00f7 100644 --- a/quackleio/iotest/iotest.pro +++ b/quackleio/iotest/iotest.pro @@ -14,7 +14,7 @@ release { OBJECTS_DIR = obj/release } -LIBS += -lquackle -lquackleio +LIBS += -lquackleio -lquackle QMAKE_LFLAGS_RELEASE += -L../../lib/release -L../../quackleio/lib/release QMAKE_LFLAGS_DEBUG += -L../../lib/debug -L../../quackleio/lib/debug diff --git a/quackleio/quackleio.pro b/quackleio/quackleio.pro index f466620..e603da3 100644 --- a/quackleio/quackleio.pro +++ b/quackleio/quackleio.pro @@ -5,13 +5,11 @@ VERSION = 0.9 QT -= gui debug { OBJECTS_DIR = obj/debug - win32 { LIBS += -L../debug } DESTDIR = lib/debug } release { OBJECTS_DIR = obj/release - win32 { LIBS += -L../release } DESTDIR = lib/release } @@ -22,8 +20,6 @@ MOC_DIR = moc CONFIG += release staticlib CONFIG -= x11 -LIBS += -L.. -lquackle - # Input HEADERS += *.h diff --git a/test/test.pro b/test/test.pro index daba0fb..2eec3ec 100644 --- a/test/test.pro +++ b/test/test.pro @@ -17,7 +17,7 @@ release { OBJECTS_DIR = obj/release } -LIBS += -lquackle -lquackleio +LIBS += -lquackleio -lquackle QMAKE_LFLAGS_RELEASE += -L../lib/release -L../quackleio/lib/release QMAKE_LFLAGS_DEBUG += -L../lib/debug -L../quackleio/lib/debug |