summaryrefslogtreecommitdiffstats
path: root/Makefile.xmingw64
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile.xmingw64')
-rw-r--r--Makefile.xmingw6412
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.xmingw64 b/Makefile.xmingw64
index 1a48e07..f092168 100644
--- a/Makefile.xmingw64
+++ b/Makefile.xmingw64
@@ -7,17 +7,17 @@ JOBS = 1
LOCAL_BUILD_PATH = $(TOP)/build.$(ARCH)
LOCAL_INST_PATH = $(TOP)/install.$(ARCH)
-VERSION_SHORT=5.14
-VERSION_RELEASE=2
+VERSION_SHORT=5.15
+VERSION_RELEASE=0
VERSION=$(VERSION_SHORT).$(VERSION_RELEASE)
-SSL_VERSION=1.0.2r
+SSL_VERSION=1.1.1g
SSL_ARCHIVE=openssl-$(SSL_VERSION).tar.gz
PACKAGE_NAME = qt-$(VERSION)
-GCC_PATH ?= /opt/dev-tools/gcc-suite/1.6.0/x86-linux64/gcc
-CROSS_COMPILE ?= /opt/dev-tools/gcc-suite/1.6.0/x86-linux64/mingw64/bin/x86_64-w64-mingw32-
+GCC_PATH ?= /opt/dev-tools/gcc-suite/1.7.0/x86-linux64/gcc
+CROSS_COMPILE ?= /opt/dev-tools/gcc-suite/1.7.0/x86-linux64/mingw64/bin/x86_64-w64-mingw32-
CC ?= $(GCC_PATH)/bin/gcc
CXX ?= $(GCC_PATH)/bin/g++
@@ -102,7 +102,7 @@ qt.x86-mingw64.shared:
-ssl \
-openssl \
-I$(LOCAL_INST_PATH)/openssl/include \
- -I/opt/dev-tools/gcc-suite/1.6.0/x86-linux64/mingw64/x86_64-w64-mingw32/include \
+ -I/opt/dev-tools/gcc-suite/1.7.0/x86-linux64/mingw64/x86_64-w64-mingw32/include \
-L$(LOCAL_INST_PATH)/openssl/lib \
-nomake examples \
-nomake tests \