diff options
| -rw-r--r-- | quacker/.gitignore | 1 | ||||
| -rw-r--r-- | quacker/quacker.pro | 18 | ||||
| -rw-r--r-- | quackle.pro | 2 | ||||
| -rw-r--r-- | quackleio/quackleio.pro | 7 |
4 files changed, 18 insertions, 10 deletions
diff --git a/quacker/.gitignore b/quacker/.gitignore index fa22076..117b6bb 100644 --- a/quacker/.gitignore +++ b/quacker/.gitignore @@ -3,6 +3,7 @@ moc_* moc obj quacker +quacker.app Makefile.Debug Makefile.Release debug diff --git a/quacker/quacker.pro b/quacker/quacker.pro index 5e30da2..a484a0d 100644 --- a/quacker/quacker.pro +++ b/quacker/quacker.pro @@ -9,20 +9,22 @@ MOC_DIR = moc #CONFIG += debug 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 +QMAKE_LFLAGS_RELEASE += -L../lib/release -L../quackleio/lib/release +QMAKE_LFLAGS_DEBUG += -L../lib/debug -L../quackleio/lib/debug -# Input -HEADERS += bagdisplay.h boarddisplay.h boardsetup.h boardsetupdialog.h brb.h configdialog.h configpages.h customqsettings.h dashboard.h geometry.h graphicalboard.h graphicalreporter.h history.h letterbox.h letterboxsettings.h lister.h movebox.h newgame.h noteeditor.h quacker.h quackersettings.h rackdisplay.h settings.h simviewer.h view.h widgetfactory.h oppothread.h oppothreadprogressbar.h -SOURCES += bagdisplay.cpp boarddisplay.cpp boardsetup.cpp boardsetupdialog.cpp brb.cpp configdialog.cpp configpages.cpp dashboard.cpp geometry.cpp graphicalboard.cpp graphicalreporter.cpp history.cpp letterbox.cpp letterboxsettings.cpp lister.cpp movebox.cpp newgame.cpp noteeditor.cpp quacker.cpp quackersettings.cpp rackdisplay.cpp settings.cpp simviewer.cpp view.cpp widgetfactory.cpp oppothread.cpp oppothreadprogressbar.cpp main.cpp +LIBS += -lquackle -lquackleio +# Input +HEADERS += *.h +SOURCES += *.cpp win32 { RC_FILE = quacker.rc diff --git a/quackle.pro b/quackle.pro index 001f31b..2316cf7 100644 --- a/quackle.pro +++ b/quackle.pro @@ -5,10 +5,12 @@ VERSION = 0.9 QT -= gui core debug { OBJECTS_DIR = obj/debug + DESTDIR = lib/debug } release { OBJECTS_DIR = obj/release + DESTDIR = lib/release } # enable/disable debug symbols diff --git a/quackleio/quackleio.pro b/quackleio/quackleio.pro index 3b88779..f466620 100644 --- a/quackleio/quackleio.pro +++ b/quackleio/quackleio.pro @@ -6,11 +6,13 @@ 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 } MOC_DIR = moc @@ -23,8 +25,9 @@ CONFIG -= x11 LIBS += -L.. -lquackle # Input -HEADERS += gcgio.h logania.h queenie.h streamingreporter.h flexiblealphabet.h util.h froggetopt.h dict.h dictfactory.h dictimplementation.h -SOURCES += gcgio.cpp queenie.cpp streamingreporter.cpp flexiblealphabet.cpp util.cpp froggetopt.cpp dict.cpp dictfactory.cpp dictimplementation.cpp +HEADERS += *.h + +SOURCES += *.cpp win32:!win32-g++ { QMAKE_CFLAGS_DEBUG ~= s/-MDd/-MTd/ |