diff options
Diffstat (limited to 'src/commonplatform.pri')
-rw-r--r-- | src/commonplatform.pri | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/commonplatform.pri b/src/commonplatform.pri index 28ceff7a..6ee5eb6d 100644 --- a/src/commonplatform.pri +++ b/src/commonplatform.pri @@ -266,7 +266,7 @@ android { } win32 { - DEFINES += QT3DS_OS_WINDOWS _WIN32 _PCPLATFORM \ + DEFINES += QT3DS_OS_WINDOWS _PCPLATFORM \ WIDE_IS_DIFFERENT_TYPE_THAN_CHAR16_T KDWIN NOMINMAX win32-msvc { @@ -291,12 +291,27 @@ win32 { contains(QT_ARCH, x86_64) { DEFINES += _WIN64 + } else { + DEFINES += _WIN32 } } BINDIR = $$MODULE_BASE_OUTDIR/bin LIBDIR = $$MODULE_BASE_OUTDIR/lib + +exists($$MODULE_BASE_OUTDIR/src/Runtime/ogl-runtime/bin) { + RUNTIME_BINDIR = $$MODULE_BASE_OUTDIR/src/Runtime/ogl-runtime/bin + RUNTIME_LIBDIR = $$MODULE_BASE_OUTDIR/src/Runtime/ogl-runtime/lib + RUNTIME_INCLUDEDIR = $$MODULE_BASE_OUTDIR/src/Runtime/ogl-runtime/include + LIBS += -L"$$RUNTIME_LIBDIR" +} else { + RUNTIME_BINDIR = $$BINDIR + RUNTIME_LIBDIR = $$LIBDIR + RUNTIME_INCLUDEDIR = $$MODULE_BASE_OUTDIR/include +} + LIBS += -L"$$LIBDIR" + !testcase { contains(TEMPLATE, app) { DESTDIR = $$BINDIR |