diff options
| author | John Fultz <jfultz@wolfram.com> | 2015-10-18 23:35:21 -0500 |
|---|---|---|
| committer | John Fultz <jfultz@wolfram.com> | 2015-10-18 23:35:21 -0500 |
| commit | 2c2a91a6154a8dafa1415ec546ac07b2486b6743 (patch) | |
| tree | cc2f799c30b4d1fdcfaac9970680998abb0788ec /quacker/quacker.pro | |
| parent | 06b0b048147df0387001f8c4bf8f52851d722240 (diff) | |
| parent | 23f13f666c42068ed086c5a5791063465db653c7 (diff) | |
Merge branch 'feature/editablesettings'
Diffstat (limited to 'quacker/quacker.pro')
| -rw-r--r-- | quacker/quacker.pro | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/quacker/quacker.pro b/quacker/quacker.pro index 9906e45..6e3f2e0 100644 --- a/quacker/quacker.pro +++ b/quacker/quacker.pro @@ -1,5 +1,5 @@ TEMPLATE = app -VERSION = 0.99 +VERSION = 1.0 TARGET = Quackle DEPENDPATH += .. ../quackleio INCLUDEPATH += . .. @@ -10,19 +10,18 @@ MOC_DIR = moc #CONFIG += debug CONFIG += release +#Um, why is this necessary? I don't know. But if this isn't here, +#qmake messes up resulting Visual Studio project files. +CONFIG -= debug + debug { OBJECTS_DIR = obj/debug + QMAKE_LIBDIR += ../lib/debug ../quackleio/lib/debug } release { OBJECTS_DIR = obj/release -} - -debug { - QMAKE_LIBDIR += ../lib/debug ../quackleio/lib/debug -} -release { - QMAKE_LIBDIR += ../lib/release ../quackleio/lib/release + QMAKE_LIBDIR += ../lib/release ../quackleio/lib/release } win32:!win32-g++ { @@ -32,6 +31,8 @@ win32:!win32-g++ { } macx:LIBS += -framework CoreFoundation +QMAKE_CXXFLAGS += -std=c++11 + # Input HEADERS += *.h SOURCES += *.cpp |