diff options
| author | John Fultz <jfultz@wolfram.com> | 2015-10-14 04:37:27 -0500 |
|---|---|---|
| committer | John Fultz <jfultz@wolfram.com> | 2015-10-14 04:37:27 -0500 |
| commit | 86e8d2a1247e8c6b00cefda10b2a96376a1540ca (patch) | |
| tree | 5b5089a9462b34ca1e0b833638b9df779c50d410 /quackleio | |
| parent | fd6daafffbcce3bfc385d7508a1ca50174840912 (diff) | |
Windows build fixes.
Diffstat (limited to 'quackleio')
| -rw-r--r-- | quackleio/dawgfactory.h | 3 | ||||
| -rw-r--r-- | quackleio/gaddagfactory.h | 3 | ||||
| -rw-r--r-- | quackleio/iotest/iotest.pro | 10 | ||||
| -rw-r--r-- | quackleio/quackleio.pro | 2 |
4 files changed, 13 insertions, 5 deletions
diff --git a/quackleio/dawgfactory.h b/quackleio/dawgfactory.h index efcc455..7af4d68 100644 --- a/quackleio/dawgfactory.h +++ b/quackleio/dawgfactory.h @@ -19,6 +19,7 @@ #ifndef QUACKLE_DAWGFACTORY_H #define QUACKLE_DAWGFACTORY_H +#include <cstdint> #include <string> #include <vector> #include "flexiblealphabet.h" @@ -82,7 +83,7 @@ private: Node m_root; union { char charptr[16]; - int32_t int32ptr[4]; + std::int32_t int32ptr[4]; } m_hash; static const char m_versionNumber = 1; diff --git a/quackleio/gaddagfactory.h b/quackleio/gaddagfactory.h index 415baff..3017085 100644 --- a/quackleio/gaddagfactory.h +++ b/quackleio/gaddagfactory.h @@ -19,6 +19,7 @@ #ifndef QUACKLE_GADDAGFACTORY_H #define QUACKLE_GADDAGFACTORY_H +#include <cstdint> #include "flexiblealphabet.h" @@ -65,7 +66,7 @@ private: Node m_root; union { char charptr[16]; - int32_t int32ptr[4]; + std::int32_t int32ptr[4]; } m_hash; }; diff --git a/quackleio/iotest/iotest.pro b/quackleio/iotest/iotest.pro index 0bf472e..c7e994f 100644 --- a/quackleio/iotest/iotest.pro +++ b/quackleio/iotest/iotest.pro @@ -8,16 +8,20 @@ CONFIG += release debug { OBJECTS_DIR = obj/debug + QMAKE_LIBDIR += ../../lib/debug ../../quackleio/lib/debug } release { OBJECTS_DIR = obj/release + QMAKE_LIBDIR += ../../lib/release ../../quackleio/lib/release } -LIBS += -lquackleio -lquackle +win32:!win32-g++ { + LIBS += -lquackleio -llibquackle +} else { + LIBS += -lquackleio -lquackle +} -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/quackleio/quackleio.pro b/quackleio/quackleio.pro index 195b0ad..8e43d29 100644 --- a/quackleio/quackleio.pro +++ b/quackleio/quackleio.pro @@ -15,6 +15,8 @@ release { MOC_DIR = moc +QMAKE_CXXFLAGS += -std=c++11 + # enable/disable debug symbols #CONFIG += debug staticlib CONFIG += release staticlib |