diff --git a/include/pthread/pthread.h b/include/pthread/pthread.h index 436ea8b6b1f24618ee60fe2c3d4fd653c99602aa..4c96c34d0998083763a55e76eb0ea2314c575d0d 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 Binary files a/tools/msys/mingw32/bin/Qt5Core.dll and b/tools/msys/mingw32/bin/Qt5Core.dll differ diff --git a/tools/msys/mingw32/bin/qmake.exe b/tools/msys/mingw32/bin/qmake.exe index f5e0212fe0795e6e9f66e8734ca987d203c1b37f..12aa06eac173c3fa1695f9c612e2b50c0e07e30c 100644 Binary files a/tools/msys/mingw32/bin/qmake.exe and b/tools/msys/mingw32/bin/qmake.exe differ diff --git a/tools/msys/mingw32/lib/pkgconfig/Enginio.pc b/tools/msys/mingw32/lib/pkgconfig/Enginio.pc index 022623b28bc9cb852858aed06bde0df6de3ddf4f..4fd79b685083883bb8ba0336f4bbb7154a02ca80 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 8e670e08c15b1de334a94ac2c7ca6262702a8b00..5d2c0b39e3041afa484a3692bab655b71cd03594 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 628c9da7255cf3462e46afa52881b6d54002c79a..9008e15c6b7449ecb570611977ba521c74b46a4f 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 2adcab244647b2b32bfbe9be522ad30f41d79e29..243f08e7310ddc7ae929934cf47591d258230d22 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 12a316beebd0eb0216f98105e2871e07c44dbd45..773f942ee3e4f2174be44e251c87e6bf011a1ba9 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 4888505941cc68a9a03a8a59262859be9f89db25..346ef85cdaf037ad6dcfce928f61d5cabc78984d 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 acd643a7ca5f30ce11625d7db3699037156b609c..f6abcd2643fa773b33376b2f6dd3202cc2ae7a93 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 563d9371e8f737b898c72b3876c2e1f2a62817f0..1ca966b84c3ed9fbef521627f65136ab46bdfc9c 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 05d01eae051b2df695457b6fa65f961705e696ba..e8715a1b377d3461d405029c87cabfb2bf5da80e 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 86538e80c6a605604a67484a100ae6f6ae7ea771..4690c8c9f375b3ebe1f9cc6f6647371e1f4a02f7 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 0f82fe85e1b526720f5348c4abfbd11204d1f9e7..58e62df5311f5de995d93e3c5258fc246d53d9f2 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 ff4a4a7596a6db46b2e057c02ef97fc3babcef76..52911bcfb708ee908eeb7f2f7de9da47cbd58b65 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 babea77e431dd547122f7784da26e6e87ecc3e82..097f7b9e255596f11fd262d8f6692aab900851e5 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 50faada1fc27ac54f2b8e007150c9b8f5f9bf778..561cb7880a48dbaea7b62e0acfdf1708925004af 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 7836c9e29af627d9c8cbc1f1062af854e5ae4bcb..e295ac13b5903d93faf8efb76f46a051b2d2483b 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 24ae9db97cd0ae210a912e7c85b5422efea95144..db3c38f2c31a2eaefa463170af8fd325ef2dedec 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 46420481e0a0fc8a853317b2ed711dd20fab7358..d22cbb00e282b71fa7675d267075f6cdc31b7691 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 b182f49592b2fa4f537364a59103b36a9cadb53b..f0325bf6210f9dd913a7ffa15a9e4879dff763af 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 1a2e30899dd35d42a94b0c7d6a0faaba574d83f2..cb462ba04c50c7c755ed16a7e13b8957ddce5250 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 1d319693c0df07f9c58c5b7f61e107e067823342..c9da00c72a2bb1448d9c4c1c1436d31e1fd30589 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 0e49b77d41f4c6d4db16985bbe06af1b7a341b41..b268ff9b2d08077133ba09add40e78da18e077b7 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 cdd9283800393b5a41fc0190941d3688a1b056c8..eb3276a13ffe7c538090afa62d83cefd3d7751d3 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 4735d4d499b7a5069df0e97776e392ad4a7fae65..976d241697993aa266b9bd3ede2ff7fd5b7bb37f 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 7e964ad462cea0431ea32cd36aa1d30239fa6ccc..2b926f12fa0760b32b910d626a56b9fe54368b3c 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 8531a9b3ccdd63723543825b33e37452ba0541bf..18a937ae7b11f070aab9770db39b3530cf86fcff 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 17ca80afc93123aa7c4f7268ddac1c1bf2642c01..1dedc705e779af6c9768cb53352e3aa2b4ba487a 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 df6de576127743bfab12487ea153ccd007c830ca..60b97e79fbba498452c4537d7353cd8bbfafe9d6 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 5cee0dcee9de367cb06d104d12bd3b3a9bf1f5bb..dbb6ec3c3e18fecec63c1c71c5e08b19b6d3b114 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 b295959fe6ce4d8e86d5175bd8fb9b18935e2c90..fc0a47b10a3caabeb44512018f38a69cc153b095 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 763ba875e5d8ab1d36c0ecc2f868a32c71f6e981..5b1f3e331d67577a68c207712046f25be358ab0b 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 5d42718df834789f1aafeb0f58b16a065c558f08..d59f7ead9b6e586668dba1dbd36894c53e87e065 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 1d74dfd750006f1b00a0d52b09cc159cbc769f42..792d8244a5c1b375b311af77f0c303bb7485311d 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 1875ce906912563a5cf79edd48b58f48efaf21ea..94322b343fbb0ddd468e03cf43a5427fb4722605 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 5f924dcedb8144f260ad6fd54749d381b8976fba..a6789ab40616c93e8824560cd444b7712f5fd43b 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 a51fb4e71ac36a4f741a5e16549093277a1880f1..2d2414641974a478c78b698db11c5dc72a48ab5f 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 b1fd7da1ead36ed7b22a60ca6ea8f955ce3fd62c..f4c889d0343efa83350edd633135712c3f91c961 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 5f1b78b23f482db2953c2f59b096bee22a113c13..7bb889cda92cd8804ada3db12a7296881cfc250d 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 7916912c9f885785b3e50d11dd9f6b37188a414a..38d4dcf1e51cc32b3c2cf11520b4ae5309167078 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 8acef07fb33ddebb4d2132fefef5e725709a0900..a1ee3c4c9ed02c8baf701ea060cbb58b31b7c441 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 0fbaaab85a30bf2ccbc7189598fef87b22995d6d..cfd64f4a6866373f2ed387338d81f4faba556596 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 80c2efbfe00aa22714c79be93d849c0338526515..2c36155db27452a0bed0e4c651717e85471cf561 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 321e1080f587e563ef7388301977aad1b5397a1e..29c7820a498d9731f5ba461061aede332a238bc1 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 89078a2aeab8be507edc241ef70fff2e6cf284d8..aa7096b5b2e9b86ad4a399af943ef69ff7f42a11 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 39b6420cd77edffdde1fe17abf6ae8e2444a0c0c..6f855b32ec63c95d60924dc15305f2910e80c943 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 7d2ce7a05b84ba1e111862813e9ded4904f39531..4e13a88c29a79783c3167d3970ab4c5552b6f1aa 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 12124c236566cc4f6cda0d7a92d46db0127d6e51..7195de71195e44923e9438de3a74c0c229482aa9 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 a728d6574469edced542586c2b36a452191d23f5..4a1b848181e2fbb13646ce65a82e958609eef3ee 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 fa0eab3eb57b5a453e5ffe8ec908ca04aa48eb34..970740b54e81f849148f996a3d89a6c11f82c817 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 8b192744cf27d5f55c5356c2f39e35a6606fa91b..57f4be4e9faff570e312e1125a09a8c2ce70a005 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 a258424d2c4d26cf4ed3e1c1237434a9748bf69c..82849a290fb14783a70ed1e093226e09659079b1 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 Binary files a/tools/msys/mingw64/bin/Qt5Core.dll and b/tools/msys/mingw64/bin/Qt5Core.dll differ diff --git a/tools/msys/mingw64/bin/qmake.exe b/tools/msys/mingw64/bin/qmake.exe index f0b3c2e8c3360ecfbe35eba376517dd92733ad2d..83d15cd286d7b7e59a5bd08b03aa68b5bea1b885 100644 Binary files a/tools/msys/mingw64/bin/qmake.exe and b/tools/msys/mingw64/bin/qmake.exe differ diff --git a/tools/msys/mingw64/lib/pkgconfig/Enginio.pc b/tools/msys/mingw64/lib/pkgconfig/Enginio.pc index 612ad7cd7f292cc36a3466e72090b325e0b30d40..2886ac1b6162468029539f728bfa62f09cf2a249 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 2ccb3ef77c2a0a288aeb811ffd0dfeea453c7a9d..4d9b087f7882b776bcc6047b326b6aa913fc5b3f 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 4c1ba75bb8ee7d62d01690963966ed99e6b1d748..327145b67790137b311592e0eba5d199331583c6 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 2a401b2685d3b76be3a16804d66c542e1c30af4b..4ed8f75328b893607ed80c09659decd07d38b0f3 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 6e538af095b7ce9efc272e2e0a7f717169a546f5..6021e59a072c3fab12b7da5d20c39c19a748ca01 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 eb8183ad5c35a0b534598b5805965619552261b7..aa154ccbfa2b4746301318b43880bf4b4b24d7c6 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 a3cae9cdde48a93aa0a3765705762fe9027f8830..d4a059a3c8c47edb454388c23e072717c83bb37d 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 572c4f3b9733b40aa1b4e80b3afcd9b681913254..6c2a9eab1fd39049ab7f561953681586976eaed2 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 05ea35cdea05fe0a9332bc573e87e68b370e0c58..7d51ac4f9b0fe0054dc664c973ba5bbe8c2fde1b 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 e8c34647c9dbcd140009b53d41d9ca3fcf6f985b..25f1010a1c74f1147af96f1cec533d3d7e440970 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 334581498af3db0b2f43c55e34bcd735f59ac5b8..9a3a7652da8c20a6b057a9ef7e09903a5813158b 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 a0358ca698d549f558d759ca7e7f13068a4d69d3..4d4e39b64e22f0053d0707efc1103cc2a8c2d500 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 62aac22d30db2d7edaf1331c346d83cb91324382..95ed8b68669a95825687d0bfb1364d2d12a7c6e9 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 2721c119c6d4b0d68f65f6107ba89bb9f0385ac7..52e003a3122b0e3f64fda4dacbe90088aadf0b8d 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 124ba2b735f6990226dabe6e4bcd7615f8f60bfe..4a26eeb009b1357fdbe82fc6b1112e6001728d7e 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 6131e92770d8a37a740cbddd56d767bdd3f76607..390ecef068724cbf40d94c82b02980836bed15f5 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 4dabf1c53f46deda984b623a035d7b3946999282..d453b980c7a93358d005d143ab4dff628fc9bb24 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 050e7e1969883df4db138a15b9bde2ad4de151a1..79769dd897684176fd5e786f3bf7dc550f8b9e7a 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 41e4437ae51eef5a8626ace22934c488197bb96b..09785de0531d09e0541961350bdb99e0c7ec3b66 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 bac4bc55e0e84bc7080bdc7d33c043dfcc845083..746b45a8b32a43a2ecec7321e1631f88056f4003 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 06602fe944d1a267b26d9360b5f07d6d3edc5bb9..4ebf340542c8dcce7704d7e35341222fd2e23ab0 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 d4328c4e1bcb190a0e6930869ec419390590c0f0..1ceafa04c62747f0dc4bb741ba8a9eb0d495fe28 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 c35157b7adf7be9a07e2a2e472ba13564f43db5e..adc2b7ce2d32b80afb9077d19ee78d95a756e9c4 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 509465069e39625eb2430a02f93e6dde4160c2d6..1d0f2d1b62cdde023545d77ef6ef0d34062b897c 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 163c5a89ce6472e4d7c29abadd5b0f706a970437..528e34256159ba8025bdbe69ae0f50f277181b37 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 a27d8f5211c0548e79bbc63e08d2db9d10cce16c..b4b6952bf46a5da57b67acf13c9436071b45ab07 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 f2f6badcee41191230f1f07ea2a499167a0cae4d..de330f1b70805c35b47360c91e8659ac41381785 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 dd14596823b9e5437af3405a1314edfec624947e..27be1bd3809352b0a072f5e13d3597e96a5e57cb 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 c776af7b83d547e967401ada9e543a4768c47491..b2e5d8f1e49ce69101bb8dcfefac89a73b26337b 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 43945c8ada698884b3ae0cc6763a90f2f2119da9..a3b2ee0c42eeac581d6edd3097d15639af02f45d 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 0ff3686a7fd4286b762cf27cbec61bf639f0d6bb..8f19e8c1bd6bbe4197fe9743fd572e031098377c 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 72bbb87ea6dffeb49c2ed3ba798fbc85d49d3725..06db4611eeca72c476d41838bdd46669d0d8861b 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 e8b2bd173a86ca23c9516d0ef8ed01a7db6c316c..90c469d5aa176bb74f43f8f244be0a68fb392d34 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 fa561c0caecec3f806f48556e7fcaff9223308d4..0db6800a0ff5ee7b6b107c54a19ec0f401c21f2a 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 1e3585666056c7f53f1b7611ac06fb71f6e5fff3..433423e04b231491ff458767cae5f4fd29c21439 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 c797a33588e0b54c9e2ce907c7d7f0949a1a23fa..176b9ffb9c53b6089307de9caf43d190a845c884 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 3d3a5e919dfcfc0df1491f03b06f64d9f9409ab7..eea1e92d1593079857867ee03ed5289e8185ad48 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 38f457473bb0e982b49ffc9871fadcd57188040d..6d50a24f5034d8846df27ddf0e84f972c7ba3e1e 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 24aba1fc41c074968980cdfac8793c52fd4f9801..dfde3dc8f52727c6d60929ef7d6e5b13c298ffe4 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 6b78994d41702f2222e6d0721ea8e481765251d4..970bada2f2b42312279ad6c1543b96c73d4d1489 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 8232eb935995a622b9c8ba879380d126fe52305f..c84f53851160c08bf9509650640518ff38523584 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 7bc4b128cd58ce59d1cd5eacedbc37c6e7cb07c7..4e9028ca8ad19ed814d96893da340ba150614c24 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 5a15113fe0bcec1642eb9e6f43b03d8cb6eef425..086eafe685899204405d85ce38dc8e43d5f6967c 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 360d1029469ff29c4930d81e6a968a2c2f14a36f..fd7747a6c6cfa68009c215a61d3593f1adaa8772 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 4113eb7a63521a5ba1cbb567cac0c9bf23544087..23d0b028fbf785c55ded6cb8618a063d826dc654 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 9b4be383ebea1a5823a7cefea45a38f581fe081a..4ef89f9db8b8c6b5019e5e931dd65143f8cd42a8 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 e5416a47d98bcf6e4af1cba9951ffd09737288ff..17c692fbd70171b7864cfe3436397c4c58345562 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 136ad0c66a7e025eab7c7e1bb49bac202ce9d14c..520587144ae0f39f8d7fc7feb7d671e49d478e99 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 8ff3447c74449bc22a50fcd891996b0a04d26423..61f68120dbbcc44e1f64297d5f5205a8dd4441cb 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 4055fbfa15f48d5609aa9b0218f33ff421b0ed11..6ab800d5da402ba9b2a19a13e1cd7eaaa6ed8007 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 a18a7ea42bbdb31f2587c13eb6a3222c14178039..64a0ba874aa9eafc5764f9b6720a7207e3f9649f 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 be57eb60b629802a0a666a113e3c2cf6f496a02a..63c5ab9468896560cb70d9805fc06517707257af 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" $@