Mercurial > hg > dmlib

changeset 2350:dbdce9a20d14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add Makefile variable MINGW which determines which Windows target (x86-32 or 64bit) will be built.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 05 Dec 2019 00:19:50 +0200
parents 463e5d9771ee
children f36e76e18989
files Makefile.cross-mingw
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.cross-mingw	Tue Oct 29 14:46:01 2019 +0200
+++ b/Makefile.cross-mingw	Thu Dec 05 00:19:50 2019 +0200
@@ -2,14 +2,20 @@
 # For Win32/Win64 version cross-compilation via MinGW
 # compiler suite under Linux/Unix
 #
-DM_CFLAGS += -DDM_HAVE_MEMSET=1
 
+ifeq ($(MINGW),64)
+MINGW_PREFIX ?= x86_64-w64-mingw32-
+MINGW_PATH ?= /usr/x86_64-w64-mingw32
+OBJPATH ?= ./obj/win64/
+else
 MINGW_PREFIX ?= i686-w64-mingw32-
 MINGW_PATH ?= /usr/i686-w64-mingw32
+OBJPATH ?= ./obj/win32/
+endif
 
+DM_CFLAGS += -DDM_HAVE_MEMSET=1
 DMLIB ?= ./
 BINPATH ?= ./exe/
-OBJPATH ?= ./obj/win32/
 EXEEXT ?= .exe
 CC = $(MINGW_PREFIX)gcc
 AR = $(MINGW_PREFIX)ar