summaryrefslogtreecommitdiff
path: root/makeminidawg
diff options
context:
space:
mode:
Diffstat (limited to 'makeminidawg')
-rw-r--r--makeminidawg/makeminidawg.pro10
-rw-r--r--makeminidawg/makeminidawgmain.cpp2
2 files changed, 8 insertions, 4 deletions
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;
}