Skip to content
Snippets Groups Projects
Commit db4f0fe6 authored by adrpo's avatar adrpo
Browse files

- 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
parent 4c995965
No related branches found
No related tags found
No related merge requests found
Showing
with 20 additions and 20 deletions
prefix=F:/OMDev/tools/msys/mingw32
prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
......
prefix=F:/OMDev/tools/msys/mingw32
prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
......
prefix=F:/OMDev/tools/msys/mingw32
prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
......
prefix=F:/OMDev/tools/msys/mingw32
prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
......
prefix=F:/OMDev/tools/msys/mingw32
prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
......
prefix=F:/OMDev/tools/msys/mingw32
prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
......
prefix=F:/OMDev/tools/msys/mingw32
prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
......
prefix=F:/OMDev/tools/msys/mingw32
prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
......
prefix=F:/OMDev/tools/msys/mingw32
prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
......
prefix=F:/OMDev/tools/msys/mingw32
prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
......
prefix=F:/OMDev/tools/msys/mingw32
prefix=C:/OMDev/tools/msys/mingw32
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
......
......@@ -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
......
......@@ -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
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
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
prefix=F:/OMDev/tools/msys/mingw64
prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
......
prefix=F:/OMDev/tools/msys/mingw64
prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
......
prefix=F:/OMDev/tools/msys/mingw64
prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
......
prefix=F:/OMDev/tools/msys/mingw64
prefix=C:/OMDev/tools/msys/mingw64
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment