Mercurial > hg > syntilista

changeset 256:2bb7ae9816bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improve the MinGW cross compilation Makefile so that a 64bit version could be built.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 05 Dec 2019 03:16:56 +0200
parents 55581d90c55d
children f65e0de45c2b
files Makefile.cross-mingw-win32
diffstat 1 files changed, 14 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.cross-mingw-win32	Wed Oct 10 13:21:51 2018 +0300
+++ b/Makefile.cross-mingw-win32	Thu Dec 05 03:16:56 2019 +0200
@@ -3,16 +3,25 @@
 ###
 USE_QTHTTP ?= yes
 
+ifeq ($(MINGW),64)
+BINTOOL_PREFIX ?= x86_64-w64-mingw32-
+MINGW_SYS_PATH ?= /usr/x86_64-w64-mingw32
+MINGW_LOCAL_PATH ?= /usr/local/x86_64-w64-mingw32
+OBJPATH ?= ./obj/win64/
+else
+BINTOOL_PREFIX ?= i686-w64-mingw32-
+MINGW_SYS_PATH ?= /usr/i686-w64-mingw32
+MINGW_LOCAL_PATH ?= /usr/local/i686-w64-mingw32
+OBJPATH ?= ./obj/win32/
+endif
+
+PREFIX =
+EXEEXT = .exe
 
 # Miscellaneous
 QT5_MODULES = Core Gui Widgets Sql PrintSupport
 QT5_PREFIX ?= /misc/packages/qt5-src
 QT5_BASE ?= $(QT5_PREFIX)/qtbase
-BINTOOL_PREFIX ?= i686-w64-mingw32-
-PREFIX =
-BINPATH = win32/
-OBJPATH = obj/win32/
-EXEEXT = .exe
 
 # Compiler flags and linker flags
 DEFINES = -DUNICODE -DQT_NEEDS_QMAIN