Windows build fixes.

12 files changed, 51 insertions, 28 deletions

diff --git a/encodeleaves/encodeleaves.pro b/encodeleaves/encodeleaves.pro
index f1a51bb..559df28 100644
--- a/encodeleaves/encodeleaves.pro
+++ b/encodeleaves/encodeleaves.pro
@@ -11,16 +11,20 @@ CONFIG -= app_bundle
 
 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
 SOURCES += encodeleaves.cpp
diff --git a/makegaddag/makegaddag.cpp b/makegaddag/makegaddag.cpp
index 7a768cd..ef2c439 100644
--- a/makegaddag/makegaddag.cpp
+++ b/makegaddag/makegaddag.cpp
@@ -62,7 +62,7 @@ int main(int argc, char **argv)
 
 	QString alphabetFile = QString("../data/alphabets/%1.quackle_alphabet").arg(alphabet);
 	UVcout << "Using alphabet file: " << QuackleIO::Util::qstringToString(alphabetFile) << endl;
-	GaddagFactory factory(alphabetFile);
+	GaddagFactory factory(QuackleIO::Util::qstringToString(alphabetFile));
 
 	QFile file(inputFilename);
 	if (!file.exists())
@@ -88,7 +88,7 @@ int main(int argc, char **argv)
 		if (stream.atEnd())
 			break;
 
-		if (!factory.pushWord(originalQString))
+		if (!factory.pushWord(QuackleIO::Util::qstringToString(originalQString)))
 			UVcout << "not encodable without leftover: " << QuackleIO::Util::qstringToString(originalQString) << endl;
 	}
 	
@@ -99,7 +99,7 @@ int main(int argc, char **argv)
 	factory.generate();
 
 	UVcout << "Writing index...";
-	factory.writeIndex(outputFilename);
+	factory.writeIndex(outputFilename.toUtf8().constData());
 
 	UVcout << endl;
 
diff --git a/makegaddag/makegaddag.pro b/makegaddag/makegaddag.pro
index dfd1259..9895c99 100755
--- a/makegaddag/makegaddag.pro
+++ b/makegaddag/makegaddag.pro
@@ -5,10 +5,12 @@ 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
 }
 
 MOC_DIR = moc
@@ -19,10 +21,12 @@ MOC_DIR = moc
 CONFIG += console
 CONFIG -= app_bundle
 
-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
 SOURCES += makegaddag.cpp
diff --git a/makeminidawg/makeminidawg.pro b/makeminidawg/makeminidawg.pro
index 729e6b4..e728a8a 100644
--- a/makeminidawg/makeminidawg.pro
+++ b/makeminidawg/makeminidawg.pro
@@ -12,16 +12,20 @@ CONFIG -= app_bundle
 
 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 += 
diff --git a/makeminidawg/makeminidawgmain.cpp b/makeminidawg/makeminidawgmain.cpp
index eee2b37..dfd3c82 100644
--- a/makeminidawg/makeminidawgmain.cpp
+++ b/makeminidawg/makeminidawgmain.cpp
@@ -125,7 +125,7 @@ int main(int argc, char **argv)
 		if (stream.atEnd())
 			break;
 
-		if (!factory.pushWord(word, inSmaller, pb))
+		if (!factory.pushWord(QuackleIO::Util::qstringToString(word), inSmaller, pb))
 			UVcout << "not encodable without leftover: " << QuackleIO::Util::qstringToString(word) << endl;
 	}
 
diff --git a/quacker/quacker.pro b/quacker/quacker.pro
index 9906e45..8bd1e4f 100644
--- a/quacker/quacker.pro
+++ b/quacker/quacker.pro
@@ -12,17 +12,12 @@ CONFIG += release
 
 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 +27,8 @@ win32:!win32-g++ {
 }
 macx:LIBS += -framework CoreFoundation
 
+QMAKE_CXXFLAGS += -std=c++11
+
 # Input
 HEADERS += *.h
 SOURCES += *.cpp
diff --git a/quackle.pro b/quackle.pro
index 18d9a33..4bd40f4 100644
--- a/quackle.pro
+++ b/quackle.pro
@@ -17,6 +17,8 @@ release {
   DESTDIR = lib/release
 }
 
+QMAKE_CXXFLAGS += -std=c++11
+
 # enable/disable debug symbols
 #CONFIG += debug staticlib
 CONFIG += release staticlib
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
diff --git a/test/test.pro b/test/test.pro
index 0284f47..99a378e 100644
--- a/test/test.pro
+++ b/test/test.pro
@@ -12,16 +12,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 += testharness.h trademarkedboards.h