git.y1.nz

commit e64fa36573ba45fd6eabcac38bfb11e6e2890970
parent fb618a18d15cae0a7eff656b18227cb826a06a64
Author: bbbbbr <bbbbbr@users.noreply.github.com>
Date:   Sat, 12 Feb 2022 00:56:54 -0800

Merge pull request #319 from bbbbbr/build_mingw_32_and_64_crossbuild

Build: Main Maikefile: flag for cross building Win x32 or x64
Diffstat:
M
Makefile
20
++++++++++++++------

1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
@@ -16,7 +16,12 @@ PLATFORMS=gb ap duck gg sms
 # Prefix to add to the standard tools.  Usefull for a standard gcc
 # cross-compile.
 TOOLSPREFIX =
-# TOOLSPREFIX = i686-w64-mingw32-
+ifeq ($(OS_TARGET),Win_x32)
+	TOOLSPREFIX = i686-w64-mingw32-
+endif
+ifeq ($(OS_TARGET),Win_x64)
+	TOOLSPREFIX = x86_64-w64-mingw32-
+endif
 
 TARGETCC = $(TOOLSPREFIX)gcc
 TARGETRANLIB = $(TOOLSPREFIX)ranlib
@@ -43,6 +48,9 @@ EXEEXTENSION =
 ifeq ($(TOOLSPREFIX),i686-w64-mingw32-)
 	EXEEXTENSION=.exe
 endif
+ifeq ($(TOOLSPREFIX),x86_64-w64-mingw32-)
+	EXEEXTENSION=.exe
+endif
 # Host operating system identifier.
 HOSTOS = $(shell uname -s)
 # Target operating system identifier.  Used in the output zip name.
@@ -139,23 +147,23 @@ endif
 gbdk-support-install: gbdk-support-build $(BUILDDIR)/bin
 	@echo Installing lcc
 	@cp $(GBDKSUPPORTDIR)/lcc/lcc$(EXEEXTENSION) $(BUILDDIR)/bin/lcc$(EXEEXTENSION)
-	@$(TARGETSTRIP) $(BUILDDIR)/bin/lcc*
+	@$(TARGETSTRIP) $(BUILDDIR)/bin/lcc$(EXEEXTENSION)
 	@cp $(GBDKDOCSDIR)/ChangeLog $(BUILDDIR)
 	@cp $(GBDKDOCSDIR)/README $(BUILDDIR)
 	@cp $(GBDKDOCSDIR)/gbdk_manual.pdf $(BUILDDIR)
 	@echo
 	@echo Installing ihxcheck
 	@cp $(GBDKSUPPORTDIR)/ihxcheck/ihxcheck$(EXEEXTENSION) $(BUILDDIR)/bin/ihxcheck$(EXEEXTENSION)
-	@$(TARGETSTRIP) $(BUILDDIR)/bin/ihxcheck*
+	@$(TARGETSTRIP) $(BUILDDIR)/bin/ihxcheck$(EXEEXTENSION)
 	@echo Installing bankpack
 	@cp $(GBDKSUPPORTDIR)/bankpack/bankpack$(EXEEXTENSION) $(BUILDDIR)/bin/bankpack$(EXEEXTENSION)
-	@$(TARGETSTRIP) $(BUILDDIR)/bin/bankpack*
+	@$(TARGETSTRIP) $(BUILDDIR)/bin/bankpack$(EXEEXTENSION)
 	@echo Installing png2asset
 	@cp $(GBDKSUPPORTDIR)/png2asset/png2asset$(EXEEXTENSION) $(BUILDDIR)/bin/png2asset$(EXEEXTENSION)
-	@$(TARGETSTRIP) $(BUILDDIR)/bin/png2asset*
+	@$(TARGETSTRIP) $(BUILDDIR)/bin/png2asset$(EXEEXTENSION)
 	@echo Installing gbcompress
 	@cp $(GBDKSUPPORTDIR)/gbcompress/gbcompress$(EXEEXTENSION) $(BUILDDIR)/bin/gbcompress$(EXEEXTENSION)
-	@$(TARGETSTRIP) $(BUILDDIR)/bin/gbcompress*
+	@$(TARGETSTRIP) $(BUILDDIR)/bin/gbcompress$(EXEEXTENSION)
 	@echo
 
 gbdk-support-clean:

This webpage is intended to be an accessible preview of this repository. To get a fuller picture, clone it and use the git CLI.