From 1e056623b7c9b8c6a7993d94164a26d2f55bdea2 Mon Sep 17 00:00:00 2001 From: athairus Date: Wed, 11 May 2016 22:34:40 -0400 Subject: [PATCH 1/2] Added .gitignore --- .gitignore | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f99650a --- /dev/null +++ b/.gitignore @@ -0,0 +1,37 @@ +# C++ objects and libs + +*.slo +*.lo +*.o +*.a +*.la +*.lai +*.so +*.dll +*.dylib + +# Qt-es + +/.qmake.cache +/.qmake.stash +*.pro.user +*.pro.user.* +*.qbs.user +*.qbs.user.* +*.moc +moc_*.cpp +qrc_*.cpp +ui_*.h +Makefile* +*build-* + +# QtCreator + +*.autosave + +# QtCtreator Qml +*.qmlproject.user +*.qmlproject.user.* + +# QtCtreator CMake +CMakeLists.txt.user From afd472854755af1cfa1670fba700bd81a164b6a4 Mon Sep 17 00:00:00 2001 From: athairus Date: Wed, 11 May 2016 22:45:57 -0400 Subject: [PATCH 2/2] Windows MinGW support Builds on msys2/mingw64, should also build with bundled 32-bit MinGW --- lib/lib.pri | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/lib.pri b/lib/lib.pri index 7d48f57..293f727 100644 --- a/lib/lib.pri +++ b/lib/lib.pri @@ -1,3 +1,16 @@ -LIBS += $$OUT_PWD/../lib/librenderlib.a -PRE_TARGETDEPS = $$OUT_PWD/../lib/librenderlib.a +win32: Debug: { + PRE_TARGETDEPS = $$OUT_PWD/../lib/debug/librenderlib.a + LIBS += $$OUT_PWD/../lib/debug/librenderlib.a +} + +win32: Release: { + PRE_TARGETDEPS = $$OUT_PWD/../lib/release/librenderlib.a + LIBS += $$OUT_PWD/../lib/release/librenderlib.a +} + +!win32: { + PRE_TARGETDEPS = $$OUT_PWD/../lib/librenderlib.a + LIBS += $$OUT_PWD/../lib/librenderlib.a +} + INCLUDEPATH += ../lib/