# HG changeset patch # User Matti Hamalainen # Date 1575497990 -7200 # Node ID dbdce9a20d14bf7ef976a7a70f5628641946e9f2 # Parent 463e5d9771eeb5efa7e88c8c9258d12d2efd6802 Add Makefile variable MINGW which determines which Windows target (x86-32 or 64bit) will be built. diff -r 463e5d9771ee -r dbdce9a20d14 Makefile.cross-mingw --- 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