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 /makegaddag | |
| parent | fd6daafffbcce3bfc385d7508a1ca50174840912 (diff) | |
Windows build fixes.
Diffstat (limited to 'makegaddag')
| -rw-r--r-- | makegaddag/makegaddag.cpp | 6 | ||||
| -rwxr-xr-x | makegaddag/makegaddag.pro | 10 |
2 files changed, 10 insertions, 6 deletions
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 |