diff options
Diffstat (limited to 'Makefile.mingw64')
| -rw-r--r-- | Makefile.mingw64 | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/Makefile.mingw64 b/Makefile.mingw64 index 521de95..fed71f4 100644 --- a/Makefile.mingw64 +++ b/Makefile.mingw64 @@ -6,7 +6,7 @@ LOCAL_BUILD_PATH = $(TOP)/build.$(ARCH) LOCAL_INST_PATH = $(TOP)/install.$(ARCH) VERSION_SHORT = 5.14 -VERSION_RELEASE = 0 +VERSION_RELEASE = 2 VERSION = $(VERSION_SHORT).$(VERSION_RELEASE) SSL_VERSION = 1.0.2r @@ -21,6 +21,8 @@ GCC = $(shell which g++) GCC_PATH = $(shell dirname $(GCC)) 7ZIP = $(TOP)/wintools/7za.exe +RESERVE_INSTDIR = 0 + PACKAGE_NAME = qt-$(VERSION)-$(ARCH) test: @@ -33,7 +35,8 @@ ssl: ssl.$(ARCH) qt: qt.$(ARCH) download: - $(MAKE) -C ./SOURCE + $(MAKE) -C ./SOURCE qtzip + $(MAKE) -C ./SOURCE ssltgz ssl.$(ARCH): rm -Rf $(LOCAL_BUILD_PATH)/openssl-$(SSL_VERSION) @@ -42,7 +45,7 @@ ssl.$(ARCH): tar -xzf $(TOP)/SOURCE/$(SSL_ARCHIVE) cd $(LOCAL_BUILD_PATH)/openssl-$(SSL_VERSION) && \ export CFLAGS="-m64 -fpic" && \ - ./Configure --prefix=$(QT_INST_PATH) shared mingw64 && \ + ./Configure --prefix=$(QT_INST_PATH) -m64 -static-libgcc -static-libstdc++ shared mingw64 && \ make clean && \ make && \ make install @@ -53,7 +56,7 @@ qt.$(ARCH): rm -Rf $(LOCAL_BUILD_PATH)/qt-everywhere-src-$(VERSION) ; \ fi cd $(LOCAL_BUILD_PATH); \ - $(7ZIP) x $(TOP)/SOURCE/qt-everywhere-src-$(VERSION).tar.xz -so | $(7ZIP) x -aoa -si -ttar -o"." + $(7ZIP) x $(TOP)/SOURCE/qt-everywhere-src-$(VERSION).zip cd $(LOCAL_BUILD_PATH)/qt-everywhere-src-$(VERSION) ;\ patch -p1 < $(TOP)/SOURCE/qt-5.12.3-cross-static-gcc-libs.patch rm -Rf $(QT_SRC_PATH) @@ -68,9 +71,13 @@ qt.$(ARCH): -shared \ -release \ -strip \ + -silent \ + -no-rpath \ + -no-pch \ -ssl \ -nomake examples \ -nomake tests \ + -skip activeqt \ -skip qtwebengine \ -skip qtwebglplugin \ -skip qtwebchannel \ @@ -85,6 +92,7 @@ qt.$(ARCH): -qt-libpng \ -qt-pcre \ -qt-freetype \ + -qt-doubleconversion \ -opengl desktop \ -openssl \ -I$(QT_INST_PATH)/include \ @@ -98,7 +106,9 @@ qt.$(ARCH): cp -f $(GCC_PATH)/../x86_64-w64-mingw32/bin/libwinpthread-1.dll $(QT_INST_PATH)/bin/ cd $(QT_INST_PATH)/ && \ tar -czf $(TOP)/$(PACKAGE_NAME).tgz . +ifeq ($(RESERVE_INSTDIR),0) rm -Rf $(QT_INST_PATH) +endif rm -Rf $(QT_SRC_PATH) clean: |