diff options
| author | John Fultz <jfultz@wolfram.com> | 2015-07-21 10:18:57 -0500 |
|---|---|---|
| committer | John Fultz <jfultz@wolfram.com> | 2015-07-21 10:18:57 -0500 |
| commit | d912747a68c38baa1d19e07067d8c691f29f8198 (patch) | |
| tree | f221b417220ffe5b6adbf3ca8210c788379d7842 /quacker | |
| parent | 46fc18d0d167cc6feacfb41fadb207a1234ccc26 (diff) | |
Visual Studio build maintenance.
* Fix compiler warnings
* Add Visual Studio 2013 solution
* Tweak .pro files
* Most importantly, rename main 'quackle' project to
'libquackle' to avoid solution-level name conflict. This
only affects the VS build.
Diffstat (limited to 'quacker')
| -rw-r--r-- | quacker/graphicalboard.cpp | 2 | ||||
| -rw-r--r-- | quacker/graphicalboard.h | 2 | ||||
| -rw-r--r-- | quacker/quacker.pro | 21 |
3 files changed, 13 insertions, 12 deletions
diff --git a/quacker/graphicalboard.cpp b/quacker/graphicalboard.cpp index 0b273f6..12244a1 100644 --- a/quacker/graphicalboard.cpp +++ b/quacker/graphicalboard.cpp @@ -1313,7 +1313,7 @@ bool TileWidget::shouldShowVerboseLabels() const return m_alwaysShowVerboseLabels || QuackerSettings::self()->verboseLabels; } -QFont TileWidget::scaledFont(float multiplier) +QFont TileWidget::scaledFont(double multiplier) { const int smallerSideLength = qMin(size().width(), size().height()); diff --git a/quacker/graphicalboard.h b/quacker/graphicalboard.h index dd12430..98971d0 100644 --- a/quacker/graphicalboard.h +++ b/quacker/graphicalboard.h @@ -277,7 +277,7 @@ public: protected: QPixmap generateTilePixmap(); - QFont scaledFont(float multiplier); + QFont scaledFont(double multiplier); static const double s_defaultLetterScale; virtual void setOurSize(const QSize &size); diff --git a/quacker/quacker.pro b/quacker/quacker.pro index 246a261..9906e45 100644 --- a/quacker/quacker.pro +++ b/quacker/quacker.pro @@ -18,10 +18,18 @@ release { OBJECTS_DIR = obj/release } -QMAKE_LFLAGS_RELEASE += -L../lib/release -L../quackleio/lib/release -QMAKE_LFLAGS_DEBUG += -L../lib/debug -L../quackleio/lib/debug +debug { + QMAKE_LIBDIR += ../lib/debug ../quackleio/lib/debug +} +release { + QMAKE_LIBDIR += ../lib/release ../quackleio/lib/release +} -LIBS += -lquackleio -lquackle +win32:!win32-g++ { + LIBS += -lquackleio -llibquackle +} else { + LIBS += -lquackleio -lquackle +} macx:LIBS += -framework CoreFoundation # Input @@ -32,13 +40,6 @@ win32 { RC_FILE = quacker.rc } -win32:!win32-g++ { - QMAKE_CFLAGS_DEBUG ~= s/-MDd/-MTd/ - QMAKE_CXXFLAGS_DEBUG ~= s/-MDd/-MTd/ - QMAKE_CFLAGS_RELEASE ~= s/-MD/-MT/ - QMAKE_CXXFLAGS_RELEASE ~= s/-MD/-MT/ -} - macx { DEFINES += FORCE_SECONDARY_ARROW_GLYPHS=1 ICON = quacker.icns |