From db4f0fe66f363ee8bdcdc20b1e6b1b6954069b8c Mon Sep 17 00:00:00 2001
From: adrpo <adrpo@20e99eb2-9666-4e79-a4bd-0251279e2d9b>
Date: Tue, 29 Nov 2016 22:01:02 +0000
Subject: [PATCH] - use C:\OMDev by default in msys Qt5 files - fix pthread.h
so that it can be used with VS2015
git-svn-id: https://openmodelica.org/svn/OpenModelicaExternal/trunk@196 20e99eb2-9666-4e79-a4bd-0251279e2d9b
---
include/pthread/pthread.h | 5 +++++
tools/msys/mingw32/bin/Qt5Core.dll | Bin 4422656 -> 4422656 bytes
tools/msys/mingw32/bin/qmake.exe | Bin 3992064 -> 3992064 bytes
tools/msys/mingw32/lib/pkgconfig/Enginio.pc | 4 ++--
tools/msys/mingw32/lib/pkgconfig/Qt53DCore.pc | 2 +-
.../msys/mingw32/lib/pkgconfig/Qt53DInput.pc | 2 +-
.../msys/mingw32/lib/pkgconfig/Qt53DLogic.pc | 2 +-
.../msys/mingw32/lib/pkgconfig/Qt53DQuick.pc | 2 +-
.../mingw32/lib/pkgconfig/Qt53DQuickInput.pc | 2 +-
.../mingw32/lib/pkgconfig/Qt53DQuickRender.pc | 2 +-
.../msys/mingw32/lib/pkgconfig/Qt53DRender.pc | 2 +-
tools/msys/mingw32/lib/pkgconfig/Qt5AxBase.pc | 2 +-
.../mingw32/lib/pkgconfig/Qt5AxContainer.pc | 2 +-
.../msys/mingw32/lib/pkgconfig/Qt5AxServer.pc | 2 +-
.../mingw32/lib/pkgconfig/Qt5Bluetooth.pc | 2 +-
.../mingw32/lib/pkgconfig/Qt5Concurrent.pc | 2 +-
tools/msys/mingw32/lib/pkgconfig/Qt5Core.pc | 2 +-
tools/msys/mingw32/lib/pkgconfig/Qt5DBus.pc | 2 +-
.../msys/mingw32/lib/pkgconfig/Qt5Designer.pc | 2 +-
tools/msys/mingw32/lib/pkgconfig/Qt5Gui.pc | 2 +-
tools/msys/mingw32/lib/pkgconfig/Qt5Help.pc | 2 +-
.../msys/mingw32/lib/pkgconfig/Qt5Location.pc | 2 +-
.../mingw32/lib/pkgconfig/Qt5Multimedia.pc | 2 +-
.../lib/pkgconfig/Qt5MultimediaWidgets.pc | 2 +-
.../msys/mingw32/lib/pkgconfig/Qt5Network.pc | 2 +-
tools/msys/mingw32/lib/pkgconfig/Qt5Nfc.pc | 2 +-
tools/msys/mingw32/lib/pkgconfig/Qt5OpenGL.pc | 2 +-
.../lib/pkgconfig/Qt5OpenGLExtensions.pc | 2 +-
.../mingw32/lib/pkgconfig/Qt5Positioning.pc | 2 +-
.../mingw32/lib/pkgconfig/Qt5PrintSupport.pc | 2 +-
tools/msys/mingw32/lib/pkgconfig/Qt5Qml.pc | 2 +-
tools/msys/mingw32/lib/pkgconfig/Qt5Quick.pc | 2 +-
.../mingw32/lib/pkgconfig/Qt5QuickTest.pc | 2 +-
.../mingw32/lib/pkgconfig/Qt5QuickWidgets.pc | 2 +-
tools/msys/mingw32/lib/pkgconfig/Qt5Script.pc | 2 +-
.../mingw32/lib/pkgconfig/Qt5ScriptTools.pc | 2 +-
.../msys/mingw32/lib/pkgconfig/Qt5Sensors.pc | 2 +-
.../mingw32/lib/pkgconfig/Qt5SerialBus.pc | 2 +-
.../mingw32/lib/pkgconfig/Qt5SerialPort.pc | 2 +-
tools/msys/mingw32/lib/pkgconfig/Qt5Sql.pc | 2 +-
tools/msys/mingw32/lib/pkgconfig/Qt5Svg.pc | 2 +-
tools/msys/mingw32/lib/pkgconfig/Qt5Test.pc | 2 +-
.../msys/mingw32/lib/pkgconfig/Qt5UiTools.pc | 2 +-
.../mingw32/lib/pkgconfig/Qt5WebChannel.pc | 2 +-
tools/msys/mingw32/lib/pkgconfig/Qt5WebKit.pc | 2 +-
.../mingw32/lib/pkgconfig/Qt5WebKitWidgets.pc | 2 +-
.../mingw32/lib/pkgconfig/Qt5WebSockets.pc | 2 +-
.../msys/mingw32/lib/pkgconfig/Qt5Widgets.pc | 2 +-
.../mingw32/lib/pkgconfig/Qt5WinExtras.pc | 2 +-
tools/msys/mingw32/lib/pkgconfig/Qt5Xml.pc | 2 +-
.../mingw32/lib/pkgconfig/Qt5XmlPatterns.pc | 2 +-
.../mingw32/share/qt5/mkspecs/qconfig.pri | 4 ++--
.../mingw32/share/qt5/mkspecs/qmodule.pri | 2 +-
tools/msys/mingw64/bin/Qt5Core.dll | Bin 4317184 -> 4317184 bytes
tools/msys/mingw64/bin/qmake.exe | Bin 3980288 -> 3980288 bytes
tools/msys/mingw64/lib/pkgconfig/Enginio.pc | 4 ++--
tools/msys/mingw64/lib/pkgconfig/Qt53DCore.pc | 2 +-
.../msys/mingw64/lib/pkgconfig/Qt53DInput.pc | 2 +-
.../msys/mingw64/lib/pkgconfig/Qt53DLogic.pc | 2 +-
.../msys/mingw64/lib/pkgconfig/Qt53DQuick.pc | 2 +-
.../mingw64/lib/pkgconfig/Qt53DQuickInput.pc | 2 +-
.../mingw64/lib/pkgconfig/Qt53DQuickRender.pc | 2 +-
.../msys/mingw64/lib/pkgconfig/Qt53DRender.pc | 2 +-
tools/msys/mingw64/lib/pkgconfig/Qt5AxBase.pc | 2 +-
.../mingw64/lib/pkgconfig/Qt5AxContainer.pc | 2 +-
.../msys/mingw64/lib/pkgconfig/Qt5AxServer.pc | 2 +-
.../mingw64/lib/pkgconfig/Qt5Bluetooth.pc | 2 +-
.../mingw64/lib/pkgconfig/Qt5Concurrent.pc | 2 +-
tools/msys/mingw64/lib/pkgconfig/Qt5Core.pc | 2 +-
tools/msys/mingw64/lib/pkgconfig/Qt5DBus.pc | 2 +-
.../msys/mingw64/lib/pkgconfig/Qt5Designer.pc | 2 +-
tools/msys/mingw64/lib/pkgconfig/Qt5Gui.pc | 2 +-
tools/msys/mingw64/lib/pkgconfig/Qt5Help.pc | 2 +-
.../msys/mingw64/lib/pkgconfig/Qt5Location.pc | 2 +-
.../mingw64/lib/pkgconfig/Qt5Multimedia.pc | 2 +-
.../lib/pkgconfig/Qt5MultimediaWidgets.pc | 2 +-
.../msys/mingw64/lib/pkgconfig/Qt5Network.pc | 2 +-
tools/msys/mingw64/lib/pkgconfig/Qt5Nfc.pc | 2 +-
tools/msys/mingw64/lib/pkgconfig/Qt5OpenGL.pc | 2 +-
.../lib/pkgconfig/Qt5OpenGLExtensions.pc | 2 +-
.../mingw64/lib/pkgconfig/Qt5Positioning.pc | 2 +-
.../mingw64/lib/pkgconfig/Qt5PrintSupport.pc | 2 +-
tools/msys/mingw64/lib/pkgconfig/Qt5Qml.pc | 2 +-
tools/msys/mingw64/lib/pkgconfig/Qt5Quick.pc | 2 +-
.../mingw64/lib/pkgconfig/Qt5QuickTest.pc | 2 +-
.../mingw64/lib/pkgconfig/Qt5QuickWidgets.pc | 2 +-
tools/msys/mingw64/lib/pkgconfig/Qt5Script.pc | 2 +-
.../mingw64/lib/pkgconfig/Qt5ScriptTools.pc | 2 +-
.../msys/mingw64/lib/pkgconfig/Qt5Sensors.pc | 2 +-
.../mingw64/lib/pkgconfig/Qt5SerialBus.pc | 2 +-
.../mingw64/lib/pkgconfig/Qt5SerialPort.pc | 2 +-
tools/msys/mingw64/lib/pkgconfig/Qt5Sql.pc | 2 +-
tools/msys/mingw64/lib/pkgconfig/Qt5Svg.pc | 2 +-
tools/msys/mingw64/lib/pkgconfig/Qt5Test.pc | 2 +-
.../msys/mingw64/lib/pkgconfig/Qt5UiTools.pc | 2 +-
.../mingw64/lib/pkgconfig/Qt5WebChannel.pc | 2 +-
tools/msys/mingw64/lib/pkgconfig/Qt5WebKit.pc | 2 +-
.../mingw64/lib/pkgconfig/Qt5WebKitWidgets.pc | 2 +-
.../mingw64/lib/pkgconfig/Qt5WebSockets.pc | 2 +-
.../msys/mingw64/lib/pkgconfig/Qt5Widgets.pc | 2 +-
.../mingw64/lib/pkgconfig/Qt5WinExtras.pc | 2 +-
tools/msys/mingw64/lib/pkgconfig/Qt5Xml.pc | 2 +-
.../mingw64/lib/pkgconfig/Qt5XmlPatterns.pc | 2 +-
.../mingw64/share/qt5/mkspecs/qconfig.pri | 4 ++--
.../mingw64/share/qt5/mkspecs/qmodule.pri | 2 +-
tools/msys/usr/bin/e-git.sh | 18 +++++++++++++++++-
tools/msys/usr/bin/e.sh | 17 ++++++++++++++++-
107 files changed, 142 insertions(+), 106 deletions(-)
diff --git a/include/pthread/pthread.h b/include/pthread/pthread.h
index 436ea8b6b1..4c96c34d09 100644
--- a/include/pthread/pthread.h
+++ b/include/pthread/pthread.h
@@ -205,6 +205,11 @@
typedef unsigned long DWORD_PTR;
typedef unsigned long ULONG_PTR;
#endif
+
+#if defined(_MSC_VER) && _MSC_VER >= 1900 && !defined(_CRT_NO_TIME_T)
+#define _TIMESPEC_DEFINED
+#endif
+
/*
* -----------------
* autoconf switches
diff --git a/tools/msys/mingw32/bin/Qt5Core.dll b/tools/msys/mingw32/bin/Qt5Core.dll
index d3f0b5c3662a9941f07eb573352bdc52ba963994..ca7f1d9c732b055ab18e76c97de459ebe16577ee 100644
GIT binary patch
delta 213
zcmZqp(aQwJEsQNpEzB(}EvzkUE$l5EEu1Y}E!-_UExav!E&MG4ErKmVEy67#Eut-A
zE#fT_Es`x#Ez&JAEwU|gE%Gf2Es8BlEy^t_TU2{o8J*jET~*tAUDeuqUDexrT{YT!
zT{YW#UA5YKUA5bLU3J=fU3J@gUG>^~UG>|0T@BiMT@BlNU5(m%U5(p&T}|41T}|72
zUCr8iUCrBjT`k&sT`k*tU9H-CU9H=DU2WQXU2WTYUG3U?UG3X@T^-tcT^-wdU7fb~
Jx;ht|0RWptOp^cr
delta 213
zcmZqp(aQwJEsQNpEzB(}EvzkUE$l5EEu1Y}E!-_UExav!E&MG4ErKmVEy67#Eut-A
zE#fT_Es`x#Ez&JAEwU|gE%Gf2Es8BlEy^t_TU2{o8Qt1@T~*tAUDeuqUDexrT{YT!
zT{YW#UA5YKUA5bLU3J=fU3J@gUG>^~UG>|0T@BiMT@BlNU5(m%U5(p&T}|41T}|72
zUCr8iUCrBjT`k&sT`k*tU9H-CU9H=DU2WQXU2WTYUG3U?UG3X@T^-tcT^-wdU7fb~
Jx;ht|0RWuBOqKuu
diff --git a/tools/msys/mingw32/bin/qmake.exe b/tools/msys/mingw32/bin/qmake.exe
index f5e0212fe0795e6e9f66e8734ca987d203c1b37f..12aa06eac173c3fa1695f9c612e2b50c0e07e30c 100644
GIT binary patch
delta 181
zcmZp;@|h8gTNqoIT9{i{T3B1yTG(4SS~y#{TDV(yT6kOdTKHQ8S_E5!T7+9fT0~pK
zTEtr<S|nSfTBKWKT4Y<~TI5?4S`=H9T9jK<T2x!qTGU%KS~Od<TC`hqT6A0Vw&>>w
zGdge271oz$Vszf#D+;FD*NW@6uN60FUn_3dzE<3*eXY20`&x06_O;@s?Q6x&+SiJk
bx33kqXkROC*}hiXs(r1v_4c*mHo=zwCA~bn
delta 181
zcmZp;@|h8gTNqoIT9{i{T3B1yTG(4SS~y#{TDV(yT6kOdTKHQ8S_E5!T7+9fT0~pK
zTEtr<S|nSfTBKWKT4Y<~TI5?4S`=H9T9jK<T2x!qTGU%KS~Od<TC`hqT6A0Vw&>>w
zGrDch71oz$VszWyD+;FD*NW@6uN60FUn_3dzE<3*eXY20`&x06_O;@s?Q6x&+SiJk
bx33kqXkROC*}hiXs(r1v_4c*mHo=zwC>T7&
diff --git a/tools/msys/mingw32/lib/pkgconfig/Enginio.pc b/tools/msys/mingw32/lib/pkgconfig/Enginio.pc
index 022623b28b..4fd79b6850 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Enginio.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Enginio.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
@@ -8,7 +8,7 @@ Name: Enginio
Description: Enginio module
Version: 1.6.0
Libs: -L${libdir} -lEnginio
-Libs.private: -LF:/OMDev/tools/msys/mingw32/lib F:/OMDev/tools/msys/mingw32/lib/libQt5Network.dll.a F:/OMDev/tools/msys/mingw32/lib/libQt5Core.dll.a
+Libs.private: -LC:/OMDev/tools/msys/mingw32/lib C:/OMDev/tools/msys/mingw32/lib/libQt5Network.dll.a C:/OMDev/tools/msys/mingw32/lib/libQt5Core.dll.a
Cflags: -I${includedir}/Enginio -I${includedir}
Requires: Qt5Core Qt5Network
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt53DCore.pc b/tools/msys/mingw32/lib/pkgconfig/Qt53DCore.pc
index 8e670e08c1..5d2c0b39e3 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt53DCore.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt53DCore.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt53DInput.pc b/tools/msys/mingw32/lib/pkgconfig/Qt53DInput.pc
index 628c9da725..9008e15c6b 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt53DInput.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt53DInput.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt53DLogic.pc b/tools/msys/mingw32/lib/pkgconfig/Qt53DLogic.pc
index 2adcab2446..243f08e731 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt53DLogic.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt53DLogic.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt53DQuick.pc b/tools/msys/mingw32/lib/pkgconfig/Qt53DQuick.pc
index 12a316beeb..773f942ee3 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt53DQuick.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt53DQuick.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt53DQuickInput.pc b/tools/msys/mingw32/lib/pkgconfig/Qt53DQuickInput.pc
index 4888505941..346ef85cda 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt53DQuickInput.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt53DQuickInput.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt53DQuickRender.pc b/tools/msys/mingw32/lib/pkgconfig/Qt53DQuickRender.pc
index acd643a7ca..f6abcd2643 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt53DQuickRender.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt53DQuickRender.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt53DRender.pc b/tools/msys/mingw32/lib/pkgconfig/Qt53DRender.pc
index 563d9371e8..1ca966b84c 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt53DRender.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt53DRender.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5AxBase.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5AxBase.pc
index 05d01eae05..e8715a1b37 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5AxBase.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5AxBase.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5AxContainer.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5AxContainer.pc
index 86538e80c6..4690c8c9f3 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5AxContainer.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5AxContainer.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5AxServer.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5AxServer.pc
index 0f82fe85e1..58e62df531 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5AxServer.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5AxServer.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5Bluetooth.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5Bluetooth.pc
index ff4a4a7596..52911bcfb7 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5Bluetooth.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5Bluetooth.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5Concurrent.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5Concurrent.pc
index babea77e43..097f7b9e25 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5Concurrent.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5Concurrent.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5Core.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5Core.pc
index 50faada1fc..561cb7880a 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5Core.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5Core.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5DBus.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5DBus.pc
index 7836c9e29a..e295ac13b5 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5DBus.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5DBus.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5Designer.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5Designer.pc
index 24ae9db97c..db3c38f2c3 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5Designer.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5Designer.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5Gui.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5Gui.pc
index 46420481e0..d22cbb00e2 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5Gui.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5Gui.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5Help.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5Help.pc
index b182f49592..f0325bf621 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5Help.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5Help.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5Location.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5Location.pc
index 1a2e30899d..cb462ba04c 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5Location.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5Location.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5Multimedia.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5Multimedia.pc
index 1d319693c0..c9da00c72a 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5Multimedia.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5Multimedia.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5MultimediaWidgets.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5MultimediaWidgets.pc
index 0e49b77d41..b268ff9b2d 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5MultimediaWidgets.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5MultimediaWidgets.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5Network.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5Network.pc
index cdd9283800..eb3276a13f 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5Network.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5Network.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5Nfc.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5Nfc.pc
index 4735d4d499..976d241697 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5Nfc.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5Nfc.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5OpenGL.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5OpenGL.pc
index 7e964ad462..2b926f12fa 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5OpenGL.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5OpenGL.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5OpenGLExtensions.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5OpenGLExtensions.pc
index 8531a9b3cc..18a937ae7b 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5OpenGLExtensions.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5OpenGLExtensions.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5Positioning.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5Positioning.pc
index 17ca80afc9..1dedc705e7 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5Positioning.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5Positioning.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5PrintSupport.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5PrintSupport.pc
index df6de57612..60b97e79fb 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5PrintSupport.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5PrintSupport.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5Qml.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5Qml.pc
index 5cee0dcee9..dbb6ec3c3e 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5Qml.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5Qml.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5Quick.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5Quick.pc
index b295959fe6..fc0a47b10a 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5Quick.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5Quick.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5QuickTest.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5QuickTest.pc
index 763ba875e5..5b1f3e331d 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5QuickTest.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5QuickTest.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5QuickWidgets.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5QuickWidgets.pc
index 5d42718df8..d59f7ead9b 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5QuickWidgets.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5QuickWidgets.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5Script.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5Script.pc
index 1d74dfd750..792d8244a5 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5Script.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5Script.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5ScriptTools.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5ScriptTools.pc
index 1875ce9069..94322b343f 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5ScriptTools.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5ScriptTools.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5Sensors.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5Sensors.pc
index 5f924dcedb..a6789ab406 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5Sensors.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5Sensors.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5SerialBus.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5SerialBus.pc
index a51fb4e71a..2d24146419 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5SerialBus.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5SerialBus.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5SerialPort.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5SerialPort.pc
index b1fd7da1ea..f4c889d034 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5SerialPort.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5SerialPort.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5Sql.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5Sql.pc
index 5f1b78b23f..7bb889cda9 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5Sql.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5Sql.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5Svg.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5Svg.pc
index 7916912c9f..38d4dcf1e5 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5Svg.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5Svg.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5Test.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5Test.pc
index 8acef07fb3..a1ee3c4c9e 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5Test.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5Test.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5UiTools.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5UiTools.pc
index 0fbaaab85a..cfd64f4a68 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5UiTools.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5UiTools.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5WebChannel.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5WebChannel.pc
index 80c2efbfe0..2c36155db2 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5WebChannel.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5WebChannel.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5WebKit.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5WebKit.pc
index 321e1080f5..29c7820a49 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5WebKit.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5WebKit.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5WebKitWidgets.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5WebKitWidgets.pc
index 89078a2aea..aa7096b5b2 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5WebKitWidgets.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5WebKitWidgets.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5WebSockets.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5WebSockets.pc
index 39b6420cd7..6f855b32ec 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5WebSockets.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5WebSockets.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5Widgets.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5Widgets.pc
index 7d2ce7a05b..4e13a88c29 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5Widgets.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5Widgets.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5WinExtras.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5WinExtras.pc
index 12124c2365..7195de7119 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5WinExtras.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5WinExtras.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5Xml.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5Xml.pc
index a728d65744..4a1b848181 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5Xml.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5Xml.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/lib/pkgconfig/Qt5XmlPatterns.pc b/tools/msys/mingw32/lib/pkgconfig/Qt5XmlPatterns.pc
index fa0eab3eb5..970740b54e 100644
--- a/tools/msys/mingw32/lib/pkgconfig/Qt5XmlPatterns.pc
+++ b/tools/msys/mingw32/lib/pkgconfig/Qt5XmlPatterns.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw32
+prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw32/share/qt5/mkspecs/qconfig.pri b/tools/msys/mingw32/share/qt5/mkspecs/qconfig.pri
index 8b192744cf..57f4be4e9f 100644
--- a/tools/msys/mingw32/share/qt5/mkspecs/qconfig.pri
+++ b/tools/msys/mingw32/share/qt5/mkspecs/qconfig.pri
@@ -4,8 +4,8 @@ host_build {
QT_TARGET_ARCH = i386
} else {
QT_ARCH = i386
- QMAKE_DEFAULT_LIBDIRS = F:/OMDev/tools/msys/mingw32/lib/gcc/i686-w64-mingw32/5.3.0 F:/OMDev/tools/msys/mingw32/lib/gcc F:/OMDev/tools/msys/mingw32/i686-w64-mingw32/lib F:/OMDev/tools/msys/mingw32/lib
- QMAKE_DEFAULT_INCDIRS = F:/OMDev/tools/msys/mingw32/lib/gcc/i686-w64-mingw32/5.3.0/include F:/OMDev/tools/msys/mingw32/include F:/OMDev/tools/msys/mingw32/lib/gcc/i686-w64-mingw32/5.3.0/include-fixed F:/OMDev/tools/msys/mingw32/i686-w64-mingw32/include F:/OMDev/tools/msys/mingw32/include/c++/5.3.0 F:/OMDev/tools/msys/mingw32/include/c++/5.3.0/i686-w64-mingw32 F:/OMDev/tools/msys/mingw32/include/c++/5.3.0/backward
+ QMAKE_DEFAULT_LIBDIRS = C:/OMDev/tools/msys/mingw32/lib/gcc/i686-w64-mingw32/5.3.0 C:/OMDev/tools/msys/mingw32/lib/gcc C:/OMDev/tools/msys/mingw32/i686-w64-mingw32/lib C:/OMDev/tools/msys/mingw32/lib
+ QMAKE_DEFAULT_INCDIRS = C:/OMDev/tools/msys/mingw32/lib/gcc/i686-w64-mingw32/5.3.0/include C:/OMDev/tools/msys/mingw32/include C:/OMDev/tools/msys/mingw32/lib/gcc/i686-w64-mingw32/5.3.0/include-fixed C:/OMDev/tools/msys/mingw32/i686-w64-mingw32/include C:/OMDev/tools/msys/mingw32/include/c++/5.3.0 C:/OMDev/tools/msys/mingw32/include/c++/5.3.0/i686-w64-mingw32 C:/OMDev/tools/msys/mingw32/include/c++/5.3.0/backward
}
QT_CONFIG += minimal-config small-config medium-config large-config full-config debug_and_release build_all release debug c++11 c++14 c++1z shared system-zlib icu system-jpeg png system-png system-freetype system-harfbuzz build_all accessibility opengl ssl openssl dbus dbus-linked audio-backend directwrite native-gestures qpa fontconfig concurrent
#versioning
diff --git a/tools/msys/mingw32/share/qt5/mkspecs/qmodule.pri b/tools/msys/mingw32/share/qt5/mkspecs/qmodule.pri
index a258424d2c..82849a290f 100644
--- a/tools/msys/mingw32/share/qt5/mkspecs/qmodule.pri
+++ b/tools/msys/mingw32/share/qt5/mkspecs/qmodule.pri
@@ -14,6 +14,6 @@ QT_COMPILER_STDCXX = 199711
QMAKE_QT_VERSION_OVERRIDE = 5
QMAKE_CFLAGS_FONTCONFIG =
QMAKE_LIBS_FONTCONFIG = -lfreetype -lfontconfig
-INCLUDEPATH += F:/OMDev/tools/msys/mingw32/include/dbus-1.0 F:/OMDev/tools/msys/mingw32/lib/dbus-1.0/include F:/OMDev/tools/msys/mingw32/include/libxml2 F:/OMDev/tools/msys/mingw32/include/freetype2 F:/OMDev/tools/msys/mingw32/include F:/OMDev/tools/msys/mingw32/include/libpng16 F:/OMDev/tools/msys/mingw32/include/harfbuzz F:/OMDev/tools/msys/mingw32/include/glib-2.0 F:/OMDev/tools/msys/mingw32/lib/glib-2.0/include F:/OMDev/tools/msys/mingw32/include F:/OMDev/tools/msys/mingw32/include/mariadb
+INCLUDEPATH += C:/OMDev/tools/msys/mingw32/include/dbus-1.0 C:/OMDev/tools/msys/mingw32/lib/dbus-1.0/include C:/OMDev/tools/msys/mingw32/include/libxml2 C:/OMDev/tools/msys/mingw32/include/freetype2 C:/OMDev/tools/msys/mingw32/include C:/OMDev/tools/msys/mingw32/include/libpng16 C:/OMDev/tools/msys/mingw32/include/harfbuzz C:/OMDev/tools/msys/mingw32/include/glib-2.0 C:/OMDev/tools/msys/mingw32/lib/glib-2.0/include C:/OMDev/tools/msys/mingw32/include C:/OMDev/tools/msys/mingw32/include/mariadb
sql-plugins += mysql odbc psql sqlite ibase
styles += windows fusion windowsxp windowsvista
diff --git a/tools/msys/mingw64/bin/Qt5Core.dll b/tools/msys/mingw64/bin/Qt5Core.dll
index da329263da5309b2be4bbcd93a12786aa5fe9272..28ca5c7fa0c9ab99daa82ff26a7a80c0e069710f 100644
GIT binary patch
delta 203
zcmZoT(9Q(LEsQNpEzB(}EvzkUE$l5EEu1Y}E!-_UExav!E&MG4ErKmVEy67#Eut-A
zE#fT_Es`x#Ez&JAEwU|gE%Gf2Es8BlEy^t_Evj48-YjQyZhyO6t^MtC_4c>RHQL`U
z*KB{gT&w-<a_#oF%XQk{F4t{;yIimR?Q;G0x62LM-!3<7f4khM{q1t&_P5JT+TSiW
zZGXGmto`kB^Y*vPE!y8Mw`_mA+^YTUa_jcD%Wc}<F1KxeyWFn*?Q;9}x62*2zg_Mq
GYykjy9$lya
delta 203
zcmZoT(9Q(LEsQNpEzB(}EvzkUE$l5EEu1Y}E!-_UExav!E&MG4ErKmVEy67#Eut-A
zE#fT_Es`x#Ez&JAEwU|gE%Gf2Es8BlEy^t_Evj48-YjQyYk#|3t^MtC_4c>RHQL`U
z*KB{gT&w-<a_#oF%XQk{F4t{;yIimR?Q;G0x62LM-!3<7f4khM{q1t&_P5JT+TSiW
zZGXGmto`kB^Y*vPE!y8Mw`_mA+^YTUa_jcD%Wc}<F1KxeyWFn*?Q;9}x62*2zg_Mq
GYykjzcU`Lh
diff --git a/tools/msys/mingw64/bin/qmake.exe b/tools/msys/mingw64/bin/qmake.exe
index f0b3c2e8c3360ecfbe35eba376517dd92733ad2d..83d15cd286d7b7e59a5bd08b03aa68b5bea1b885 100644
GIT binary patch
delta 181
zcmZqp@re<PTNqoIT9{i{T3B1yTG(4SS~y#{TDV(yT6kOdTKHQ8S_E5!T7+9fT0~pK
zTEtr<S|nSfTBKWKT4Y<~TI5?4S`=H9T9jK<T2x!qTGU%KS~Od<TC`hqT6A0Vw&>^d
zGdge2?bnxQVszf#I}uE`ubr&lzIL)f``XEd?Q16+wXdCQ+`e|QN&DK#rtNDdo3*c<
dY~H?hvPJva$(HSFCtJ0zoou~*?PQx^4FHI2M3evk
delta 181
zcmZqp@re<PTNqoIT9{i{T3B1yTG(4SS~y#{TDV(yT6kOdTKHQ8S_E5!T7+9fT0~pK
zTEtr<S|nSfTBKWKT4Y<~TI5?4S`=H9T9jK<T2x!qTGU%KS~Od<TC`hqT6A0Vw&>^d
zGrDch?bnxQVszWyI}uE`ubr&lzIL)f``XEd?Q16+wXdCQ+`e|QN&DK#rtNDdo3*c<
dY~H?hvPJva$(HSFCtJ0zoou~*?PQx^4FHPAM4bQt
diff --git a/tools/msys/mingw64/lib/pkgconfig/Enginio.pc b/tools/msys/mingw64/lib/pkgconfig/Enginio.pc
index 612ad7cd7f..2886ac1b61 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Enginio.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Enginio.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
@@ -8,7 +8,7 @@ Name: Enginio
Description: Enginio module
Version: 1.6.0
Libs: -L${libdir} -lEnginio
-Libs.private: -LF:/OMDev/tools/msys/mingw64/lib F:/OMDev/tools/msys/mingw64/lib/libQt5Network.dll.a F:/OMDev/tools/msys/mingw64/lib/libQt5Core.dll.a
+Libs.private: -LC:/OMDev/tools/msys/mingw64/lib C:/OMDev/tools/msys/mingw64/lib/libQt5Network.dll.a C:/OMDev/tools/msys/mingw64/lib/libQt5Core.dll.a
Cflags: -I${includedir}/Enginio -I${includedir}
Requires: Qt5Core Qt5Network
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt53DCore.pc b/tools/msys/mingw64/lib/pkgconfig/Qt53DCore.pc
index 2ccb3ef77c..4d9b087f78 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt53DCore.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt53DCore.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt53DInput.pc b/tools/msys/mingw64/lib/pkgconfig/Qt53DInput.pc
index 4c1ba75bb8..327145b677 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt53DInput.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt53DInput.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt53DLogic.pc b/tools/msys/mingw64/lib/pkgconfig/Qt53DLogic.pc
index 2a401b2685..4ed8f75328 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt53DLogic.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt53DLogic.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt53DQuick.pc b/tools/msys/mingw64/lib/pkgconfig/Qt53DQuick.pc
index 6e538af095..6021e59a07 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt53DQuick.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt53DQuick.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt53DQuickInput.pc b/tools/msys/mingw64/lib/pkgconfig/Qt53DQuickInput.pc
index eb8183ad5c..aa154ccbfa 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt53DQuickInput.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt53DQuickInput.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt53DQuickRender.pc b/tools/msys/mingw64/lib/pkgconfig/Qt53DQuickRender.pc
index a3cae9cdde..d4a059a3c8 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt53DQuickRender.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt53DQuickRender.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt53DRender.pc b/tools/msys/mingw64/lib/pkgconfig/Qt53DRender.pc
index 572c4f3b97..6c2a9eab1f 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt53DRender.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt53DRender.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5AxBase.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5AxBase.pc
index 05ea35cdea..7d51ac4f9b 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5AxBase.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5AxBase.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5AxContainer.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5AxContainer.pc
index e8c34647c9..25f1010a1c 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5AxContainer.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5AxContainer.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5AxServer.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5AxServer.pc
index 334581498a..9a3a7652da 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5AxServer.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5AxServer.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5Bluetooth.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5Bluetooth.pc
index a0358ca698..4d4e39b64e 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5Bluetooth.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5Bluetooth.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5Concurrent.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5Concurrent.pc
index 62aac22d30..95ed8b6866 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5Concurrent.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5Concurrent.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5Core.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5Core.pc
index 2721c119c6..52e003a312 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5Core.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5Core.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5DBus.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5DBus.pc
index 124ba2b735..4a26eeb009 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5DBus.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5DBus.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5Designer.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5Designer.pc
index 6131e92770..390ecef068 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5Designer.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5Designer.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5Gui.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5Gui.pc
index 4dabf1c53f..d453b980c7 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5Gui.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5Gui.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5Help.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5Help.pc
index 050e7e1969..79769dd897 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5Help.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5Help.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5Location.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5Location.pc
index 41e4437ae5..09785de053 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5Location.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5Location.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5Multimedia.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5Multimedia.pc
index bac4bc55e0..746b45a8b3 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5Multimedia.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5Multimedia.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5MultimediaWidgets.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5MultimediaWidgets.pc
index 06602fe944..4ebf340542 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5MultimediaWidgets.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5MultimediaWidgets.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5Network.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5Network.pc
index d4328c4e1b..1ceafa04c6 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5Network.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5Network.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5Nfc.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5Nfc.pc
index c35157b7ad..adc2b7ce2d 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5Nfc.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5Nfc.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5OpenGL.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5OpenGL.pc
index 509465069e..1d0f2d1b62 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5OpenGL.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5OpenGL.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5OpenGLExtensions.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5OpenGLExtensions.pc
index 163c5a89ce..528e342561 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5OpenGLExtensions.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5OpenGLExtensions.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5Positioning.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5Positioning.pc
index a27d8f5211..b4b6952bf4 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5Positioning.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5Positioning.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5PrintSupport.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5PrintSupport.pc
index f2f6badcee..de330f1b70 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5PrintSupport.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5PrintSupport.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5Qml.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5Qml.pc
index dd14596823..27be1bd380 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5Qml.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5Qml.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5Quick.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5Quick.pc
index c776af7b83..b2e5d8f1e4 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5Quick.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5Quick.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5QuickTest.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5QuickTest.pc
index 43945c8ada..a3b2ee0c42 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5QuickTest.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5QuickTest.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5QuickWidgets.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5QuickWidgets.pc
index 0ff3686a7f..8f19e8c1bd 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5QuickWidgets.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5QuickWidgets.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5Script.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5Script.pc
index 72bbb87ea6..06db4611ee 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5Script.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5Script.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5ScriptTools.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5ScriptTools.pc
index e8b2bd173a..90c469d5aa 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5ScriptTools.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5ScriptTools.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5Sensors.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5Sensors.pc
index fa561c0cae..0db6800a0f 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5Sensors.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5Sensors.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5SerialBus.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5SerialBus.pc
index 1e35856660..433423e04b 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5SerialBus.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5SerialBus.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5SerialPort.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5SerialPort.pc
index c797a33588..176b9ffb9c 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5SerialPort.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5SerialPort.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5Sql.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5Sql.pc
index 3d3a5e919d..eea1e92d15 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5Sql.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5Sql.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5Svg.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5Svg.pc
index 38f457473b..6d50a24f50 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5Svg.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5Svg.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5Test.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5Test.pc
index 24aba1fc41..dfde3dc8f5 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5Test.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5Test.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5UiTools.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5UiTools.pc
index 6b78994d41..970bada2f2 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5UiTools.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5UiTools.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5WebChannel.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5WebChannel.pc
index 8232eb9359..c84f538511 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5WebChannel.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5WebChannel.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5WebKit.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5WebKit.pc
index 7bc4b128cd..4e9028ca8a 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5WebKit.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5WebKit.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5WebKitWidgets.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5WebKitWidgets.pc
index 5a15113fe0..086eafe685 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5WebKitWidgets.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5WebKitWidgets.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5WebSockets.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5WebSockets.pc
index 360d102946..fd7747a6c6 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5WebSockets.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5WebSockets.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5Widgets.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5Widgets.pc
index 4113eb7a63..23d0b028fb 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5Widgets.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5Widgets.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5WinExtras.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5WinExtras.pc
index 9b4be383eb..4ef89f9db8 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5WinExtras.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5WinExtras.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5Xml.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5Xml.pc
index e5416a47d9..17c692fbd7 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5Xml.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5Xml.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/lib/pkgconfig/Qt5XmlPatterns.pc b/tools/msys/mingw64/lib/pkgconfig/Qt5XmlPatterns.pc
index 136ad0c66a..520587144a 100644
--- a/tools/msys/mingw64/lib/pkgconfig/Qt5XmlPatterns.pc
+++ b/tools/msys/mingw64/lib/pkgconfig/Qt5XmlPatterns.pc
@@ -1,4 +1,4 @@
-prefix=F:/OMDev/tools/msys/mingw64
+prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
diff --git a/tools/msys/mingw64/share/qt5/mkspecs/qconfig.pri b/tools/msys/mingw64/share/qt5/mkspecs/qconfig.pri
index 8ff3447c74..61f68120db 100644
--- a/tools/msys/mingw64/share/qt5/mkspecs/qconfig.pri
+++ b/tools/msys/mingw64/share/qt5/mkspecs/qconfig.pri
@@ -4,8 +4,8 @@ host_build {
QT_TARGET_ARCH = x86_64
} else {
QT_ARCH = x86_64
- QMAKE_DEFAULT_LIBDIRS = F:/OMDev/tools/msys/mingw64/lib/gcc/x86_64-w64-mingw32/5.3.0 F:/OMDev/tools/msys/mingw64/x86_64-w64-mingw32/lib F:/OMDev/tools/msys/mingw64/lib
- QMAKE_DEFAULT_INCDIRS = F:/OMDev/tools/msys/mingw64/include/c++/5.3.0 F:/OMDev/tools/msys/mingw64/include/c++/5.3.0/x86_64-w64-mingw32 F:/OMDev/tools/msys/mingw64/include/c++/5.3.0/backward F:/OMDev/tools/msys/mingw64/lib/gcc/x86_64-w64-mingw32/5.3.0/include F:/OMDev/tools/msys/mingw64/include F:/OMDev/tools/msys/mingw64/lib/gcc/x86_64-w64-mingw32/5.3.0/include-fixed F:/OMDev/tools/msys/mingw64/x86_64-w64-mingw32/include
+ QMAKE_DEFAULT_LIBDIRS = C:/OMDev/tools/msys/mingw64/lib/gcc/x86_64-w64-mingw32/5.3.0 C:/OMDev/tools/msys/mingw64/x86_64-w64-mingw32/lib C:/OMDev/tools/msys/mingw64/lib
+ QMAKE_DEFAULT_INCDIRS = C:/OMDev/tools/msys/mingw64/include/c++/5.3.0 C:/OMDev/tools/msys/mingw64/include/c++/5.3.0/x86_64-w64-mingw32 C:/OMDev/tools/msys/mingw64/include/c++/5.3.0/backward C:/OMDev/tools/msys/mingw64/lib/gcc/x86_64-w64-mingw32/5.3.0/include C:/OMDev/tools/msys/mingw64/include C:/OMDev/tools/msys/mingw64/lib/gcc/x86_64-w64-mingw32/5.3.0/include-fixed C:/OMDev/tools/msys/mingw64/x86_64-w64-mingw32/include
}
QT_CONFIG += minimal-config small-config medium-config large-config full-config debug_and_release build_all release debug c++11 c++14 c++1z shared system-zlib icu system-jpeg png system-png system-freetype system-harfbuzz build_all accessibility opengl ssl openssl dbus dbus-linked audio-backend directwrite native-gestures qpa fontconfig concurrent
#versioning
diff --git a/tools/msys/mingw64/share/qt5/mkspecs/qmodule.pri b/tools/msys/mingw64/share/qt5/mkspecs/qmodule.pri
index 4055fbfa15..6ab800d5da 100644
--- a/tools/msys/mingw64/share/qt5/mkspecs/qmodule.pri
+++ b/tools/msys/mingw64/share/qt5/mkspecs/qmodule.pri
@@ -14,6 +14,6 @@ QT_COMPILER_STDCXX = 199711
QMAKE_QT_VERSION_OVERRIDE = 5
QMAKE_CFLAGS_FONTCONFIG =
QMAKE_LIBS_FONTCONFIG = -lfreetype -lfontconfig
-INCLUDEPATH += F:/OMDev/tools/msys/mingw64/include/dbus-1.0 F:/OMDev/tools/msys/mingw64/lib/dbus-1.0/include F:/OMDev/tools/msys/mingw64/include/libxml2 F:/OMDev/tools/msys/mingw64/include/freetype2 F:/OMDev/tools/msys/mingw64/include F:/OMDev/tools/msys/mingw64/include/libpng16 F:/OMDev/tools/msys/mingw64/include/harfbuzz F:/OMDev/tools/msys/mingw64/include/glib-2.0 F:/OMDev/tools/msys/mingw64/lib/glib-2.0/include F:/OMDev/tools/msys/mingw64/include F:/OMDev/tools/msys/mingw64/include/mariadb
+INCLUDEPATH += C:/OMDev/tools/msys/mingw64/include/dbus-1.0 C:/OMDev/tools/msys/mingw64/lib/dbus-1.0/include C:/OMDev/tools/msys/mingw64/include/libxml2 C:/OMDev/tools/msys/mingw64/include/freetype2 C:/OMDev/tools/msys/mingw64/include C:/OMDev/tools/msys/mingw64/include/libpng16 C:/OMDev/tools/msys/mingw64/include/harfbuzz C:/OMDev/tools/msys/mingw64/include/glib-2.0 C:/OMDev/tools/msys/mingw64/lib/glib-2.0/include C:/OMDev/tools/msys/mingw64/include C:/OMDev/tools/msys/mingw64/include/mariadb
sql-plugins += mysql odbc psql sqlite ibase
styles += windows fusion windowsxp windowsvista
diff --git a/tools/msys/usr/bin/e-git.sh b/tools/msys/usr/bin/e-git.sh
index a18a7ea42b..64a0ba874a 100644
--- a/tools/msys/usr/bin/e-git.sh
+++ b/tools/msys/usr/bin/e-git.sh
@@ -1,2 +1,18 @@
#!/bin/sh
-/c/Program\ Files\ \(x86\)/Notepad++/notepad++.exe -multiInst $@
+
+N1=/c/Program\ Files\ \(x86\)/Notepad++/notepad++.exe
+N2=/c/Program\ Files/Notepad++/notepad++.exe
+N=""
+
+if [ -f "$N2" ];
+then
+ N=$N2;
+fi
+
+if [ -f "$N1" ];
+then
+ N=$N1;
+fi
+
+"$N" -multiInst $@
+
diff --git a/tools/msys/usr/bin/e.sh b/tools/msys/usr/bin/e.sh
index be57eb60b6..63c5ab9468 100644
--- a/tools/msys/usr/bin/e.sh
+++ b/tools/msys/usr/bin/e.sh
@@ -1,2 +1,17 @@
#!/bin/sh
-/c/Program\ Files\ \(x86\)/Notepad++/notepad++.exe $@
+
+N1=/c/Program\ Files\ \(x86\)/Notepad++/notepad++.exe
+N2=/c/Program\ Files/Notepad++/notepad++.exe
+N=""
+
+if [ -f "$N2" ];
+then
+ N=$N2;
+fi
+
+if [ -f "$N1" ];
+then
+ N=$N1;
+fi
+
+"$N" $@
--
GitLab