diff options
Diffstat (limited to '0001-Add-profile-for-cross-compilation-with-mingw-w64.patch')
| -rw-r--r-- | 0001-Add-profile-for-cross-compilation-with-mingw-w64.patch | 197 |
1 files changed, 99 insertions, 98 deletions
diff --git a/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch b/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch index 7de494e8ab7b..aaad1e4810b9 100644 --- a/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch +++ b/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch @@ -1,21 +1,21 @@ -From 9e46af21edffe2c27d2239ae2133c5a442cd7b43 Mon Sep 17 00:00:00 2001 +From 519d5f635192522a5dd273a19446071fd4c6970a Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 3 Feb 2017 18:30:51 +0100 Subject: [PATCH 01/31] Add profile for cross compilation with mingw-w64 --- - mkspecs/mingw-w64-g++/qmake.conf | 125 +++++++++++++++++++++++++++ + mkspecs/mingw-w64-g++/qmake.conf | 126 +++++++++++++++++++++++++++ mkspecs/mingw-w64-g++/qplatformdefs.h | 155 ++++++++++++++++++++++++++++++++++ - 2 files changed, 280 insertions(+) + 2 files changed, 281 insertions(+) create mode 100644 mkspecs/mingw-w64-g++/qmake.conf create mode 100644 mkspecs/mingw-w64-g++/qplatformdefs.h diff --git a/mkspecs/mingw-w64-g++/qmake.conf b/mkspecs/mingw-w64-g++/qmake.conf new file mode 100644 -index 0000000000..3908c1a7e2 +index 0000000000..c929483fcd --- /dev/null +++ b/mkspecs/mingw-w64-g++/qmake.conf -@@ -0,0 +1,125 @@ +@@ -0,0 +1,126 @@ +# +# qmake configuration for i686-w64-mingw32-g++ and x86_64-w64-mingw32-g++ +# @@ -28,117 +28,118 @@ index 0000000000..3908c1a7e2 +load(device_config) +include(../common/angle.conf) + -+MAKEFILE_GENERATOR = MINGW -+QMAKE_PLATFORM = win32 win32-g++ mingw -+CONFIG += debug_and_release debug_and_release_target precompile_header -+DEFINES += UNICODE -+QMAKE_COMPILER_DEFINES += __GNUC__ WIN32 ++MAKEFILE_GENERATOR = MINGW ++QMAKE_PLATFORM = win32 win32-g++ mingw ++CONFIG += debug_and_release debug_and_release_target precompile_header $${CROSS_COMPILE_CUSTOM_CONFIG} ++DEFINES += UNICODE ++QMAKE_COMPILER_DEFINES += __GNUC__ WIN32 + -+QMAKE_EXT_OBJ = .o -+QMAKE_EXT_RES = _res.o ++QMAKE_EXT_OBJ = .o ++QMAKE_EXT_RES = _res.o + -+QMAKE_COMPILER = gcc ++QMAKE_COMPILER = gcc + -+QMAKE_CC = $${CROSS_COMPILE}gcc -+QMAKE_LEX = flex -+QMAKE_LEXFLAGS = -+QMAKE_YACC = bison -y -+QMAKE_YACCFLAGS = -d -+QMAKE_CFLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fno-keep-inline-dllexport $${CROSS_COMPILE_CFLAGS} -+QMAKE_CFLAGS_DEPS = -M -+QMAKE_CFLAGS_WARN_ON = -Wall -Wextra -+QMAKE_CFLAGS_WARN_OFF = -w -+QMAKE_CFLAGS_RELEASE = -O2 ++QMAKE_CC = $${CROSS_COMPILE}gcc ++QMAKE_LEX = flex ++QMAKE_LEXFLAGS = ++QMAKE_YACC = bison -y ++QMAKE_YACCFLAGS = -d ++QMAKE_CFLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fno-keep-inline-dllexport $${CROSS_COMPILE_CFLAGS} ++QMAKE_CFLAGS_DEPS = -M ++QMAKE_CFLAGS_WARN_ON = -Wall -Wextra ++QMAKE_CFLAGS_WARN_OFF = -w ++QMAKE_CFLAGS_RELEASE = -O2 +QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO = -O2 -g -+QMAKE_CFLAGS_DEBUG = -g -+QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses ++QMAKE_CFLAGS_DEBUG = -g ++QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses +QMAKE_CFLAGS_SPLIT_SECTIONS = -ffunction-sections -+QMAKE_CFLAGS_SSE2 = -msse2 -mstackrealign -+QMAKE_CFLAGS_SSE3 = -msse3 -+QMAKE_CFLAGS_SSSE3 = -mssse3 -+QMAKE_CFLAGS_SSE4_1 = -msse4.1 -+QMAKE_CFLAGS_SSE4_2 = -msse4.2 -+QMAKE_CFLAGS_AVX = -mavx -+QMAKE_CFLAGS_AVX2 = -mavx2 -+QMAKE_CFLAGS_NEON = -mfpu=neon ++QMAKE_CFLAGS_SSE2 = -msse2 -mstackrealign ++QMAKE_CFLAGS_SSE3 = -msse3 ++QMAKE_CFLAGS_SSSE3 = -mssse3 ++QMAKE_CFLAGS_SSE4_1 = -msse4.1 ++QMAKE_CFLAGS_SSE4_2 = -msse4.2 ++QMAKE_CFLAGS_AVX = -mavx ++QMAKE_CFLAGS_AVX2 = -mavx2 ++QMAKE_CFLAGS_NEON = -mfpu=neon + -+QMAKE_CXX = $${CROSS_COMPILE}g++ -+QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -+QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS -+QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -+QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF -+QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE ++QMAKE_CXX = $${CROSS_COMPILE}g++ ++QMAKE_CXXFLAGS = $$QMAKE_CFLAGS ++QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS ++QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON ++QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF ++QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE +QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO = $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO -+QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG -+QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC -+QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD -+QMAKE_CXXFLAGS_RTTI_ON = -frtti -+QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti ++QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG ++QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC ++QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD ++QMAKE_CXXFLAGS_RTTI_ON = -frtti ++QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti +QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads +QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions -+QMAKE_CXXFLAGS_CXX11 = -std=c++11 -+QMAKE_CXXFLAGS_CXX14 = -std=c++1y -+QMAKE_CXXFLAGS_CXX1Z = -std=c++1z -+QMAKE_CXXFLAGS_GNUCXX11 = -std=gnu++11 -+QMAKE_CXXFLAGS_GNUCXX14 = -std=gnu++1y -+QMAKE_CXXFLAGS_GNUCXX1Z = -std=gnu++1z ++QMAKE_CXXFLAGS_CXX11 = -std=c++11 ++QMAKE_CXXFLAGS_CXX14 = -std=c++1y ++QMAKE_CXXFLAGS_CXX1Z = -std=c++1z ++QMAKE_CXXFLAGS_GNUCXX11 = -std=gnu++11 ++QMAKE_CXXFLAGS_GNUCXX14 = -std=gnu++1y ++QMAKE_CXXFLAGS_GNUCXX1Z = -std=gnu++1z +QMAKE_CXXFLAGS_SPLIT_SECTIONS = $$QMAKE_CFLAGS_SPLIT_SECTIONS + -+QMAKE_INCDIR = ++QMAKE_INCDIR = + -+QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src -+QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< -+QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src -+QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< ++QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src ++QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< ++QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src ++QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< + -+QMAKE_LINK = $${CROSS_COMPILE}g++ -+QMAKE_LINK_C = $${CROSS_COMPILE}gcc -+QMAKE_LFLAGS = -g -+QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads ++QMAKE_LINK = $${CROSS_COMPILE}g++ ++QMAKE_LINK_C = $${CROSS_COMPILE}gcc ++QMAKE_LFLAGS = -g ++QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads +QMAKE_LFLAGS_EXCEPTIONS_OFF = -+QMAKE_LFLAGS_RELEASE = -+QMAKE_LFLAGS_DEBUG = -+QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console -+QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows -+QMAKE_LFLAGS_DLL = -shared -+QMAKE_LFLAGS_CXX11 = -+QMAKE_LFLAGS_CXX14 = -+QMAKE_LFLAGS_CXX1Z = -+QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections -+QMAKE_LINK_OBJECT_MAX = 10 -+QMAKE_LINK_OBJECT_SCRIPT = object_script -+QMAKE_PREFIX_SHLIB = -+QMAKE_EXTENSION_SHLIB = dll -+QMAKE_PREFIX_STATICLIB = lib -+QMAKE_EXTENSION_STATICLIB = a -+QMAKE_EXTENSION_IMPORTLIB = dll.a ++QMAKE_LFLAGS_RELEASE = ++QMAKE_LFLAGS_DEBUG = ++QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console ++QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows ++QMAKE_LFLAGS_DLL = -shared ++QMAKE_LFLAGS_CXX11 = ++QMAKE_LFLAGS_CXX14 = ++QMAKE_LFLAGS_CXX1Z = ++QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections ++QMAKE_LINK_OBJECT_MAX = 10 ++QMAKE_LINK_OBJECT_SCRIPT = object_script ++QMAKE_PREFIX_SHLIB = ++QMAKE_EXTENSION_SHLIB = dll ++QMAKE_PREFIX_STATICLIB = lib ++QMAKE_EXTENSION_STATICLIB = a ++QMAKE_EXTENSION_IMPORTLIB = dll.a + -+QMAKE_IDL = $${CROSS_COMPILE}widl -+QMAKE_LIB = $${CROSS_COMPILE}ar -rc -+QMAKE_RC = $${CROSS_COMPILE}windres -+QMAKE_DLLTOOL = $${CROSS_COMPILE}dlltool -+QMAKE_LRELEASE = $${CROSS_COMPILE}lrelease-qt5 ++QMAKE_IDL = $${CROSS_COMPILE}widl ++QMAKE_LIB = $${CROSS_COMPILE}ar -rc ++QMAKE_RC = $${CROSS_COMPILE}windres ++QMAKE_DLLTOOL = $${CROSS_COMPILE}dlltool ++QMAKE_LRELEASE = $${CROSS_COMPILE}lrelease-qt5 + -+QMAKE_STRIP = $${CROSS_COMPILE}strip -+QMAKE_STRIPFLAGS_LIB += --strip-unneeded -+QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy -+QMAKE_NM = $${CROSS_COMPILE}nm -P ++QMAKE_STRIP = $${CROSS_COMPILE}strip ++QMAKE_STRIPFLAGS_LIB += --strip-unneeded ++QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy ++QMAKE_NM = $${CROSS_COMPILE}nm -P + -+PKG_CONFIG = $${CROSS_COMPILE}pkg-config -+QMAKE_PKG_CONFIG = $${CROSS_COMPILE}pkg-config ++PKG_CONFIG = $${CROSS_COMPILE}pkg-config ++QMAKE_PKG_CONFIG = $${CROSS_COMPILE}pkg-config + -+QMAKE_LIBS = -+QMAKE_LIBS_CORE = -lz -lpcre2-16 -lversion -lole32 -luuid -lwinmm -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 -+QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ljpeg -lpng \ -+ $$system($${QMAKE_PKG_CONFIG} --static --libs harfbuzz) \ -+ $$system($${QMAKE_PKG_CONFIG} --static --libs freetype2) -+QMAKE_LIBS_NETWORK = -lws2_32 -lcrypt32 -ldnsapi -+QMAKE_LIBS_DBUS = $$system($${QMAKE_PKG_CONFIG} --static --libs dbus-1) -+QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 -+QMAKE_LIBS_OPENGL_ES2 = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32 ++QMAKE_LIBS = ++QMAKE_LIBS_CORE = -lz -lpcre2-16 -lversion -lole32 -luuid -lwinmm -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 ++QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ljpeg -lpng \ ++ $$system($${QMAKE_PKG_CONFIG} --static --libs harfbuzz) \ ++ $$system($${QMAKE_PKG_CONFIG} --static --libs freetype2) ++QMAKE_LIBS_NETWORK = -lws2_32 -lcrypt32 -ldnsapi ++QMAKE_LIBS_NETWORK_STATIC = $${CROSS_COMPILE_PREFIX}/lib/openssl-1.0/libssl.a $${CROSS_COMPILE_PREFIX}/lib/openssl-1.0/libcrypto.a -lgdi32 ++QMAKE_LIBS_DBUS = $$system($${QMAKE_PKG_CONFIG} --static --libs dbus-1) ++QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 ++QMAKE_LIBS_OPENGL_ES2 = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32 +QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32 -+QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32 -+QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqt5main ++QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32 ++QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqt5main + +load(qt_config) diff --git a/mkspecs/mingw-w64-g++/qplatformdefs.h b/mkspecs/mingw-w64-g++/qplatformdefs.h @@ -303,5 +304,5 @@ index 0000000000..c5a70b1445 + +#endif // QPLATFORMDEFS_H -- -2.13.0 +2.13.2 |