git.y1.nz

commit b92bd4569472e40a9b9496d783edb2d7377b6059
parent 7d504679dd7695cad76a3832e2bf08390e724493
Author: bbbbbr <reg+github@roughhousing.com>
Date:   Sat, 26 Jun 2021 18:06:52 -0700

Merge pull request #210 from bbbbbr/makefile_support

Makefiles: fix cross build install stage
Diffstat:
M
Makefile
12
+++++++-----
M
gbdk-support/png2mtspr/Makefile
3
++-

2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
@@ -37,7 +37,9 @@ DOXYGEN_VER_HAS = $(shell doxygen -v)
 # Base setup
 # Extension to add to executables
 EXEEXTENSION = 
-# EXEEXTENSION=.exe
+ifeq ($(TOOLSPREFIX),i686-w64-mingw32-)
+	EXEEXTENSION=.exe
+endif
 # Host operating system identifier.
 HOSTOS = $(shell uname -s)
 # Target operating system identifier.  Used in the output zip name.
@@ -133,23 +135,23 @@ endif
 
 gbdk-support-install: gbdk-support-build $(BUILDDIR)/bin
 	@echo Installing lcc
-	@cp $(GBDKSUPPORTDIR)/lcc/lcc $(BUILDDIR)/bin/lcc$(EXEEXTENSION)
+	@cp $(GBDKSUPPORTDIR)/lcc/lcc$(EXEEXTENSION) $(BUILDDIR)/bin/lcc$(EXEEXTENSION)
 	@$(TARGETSTRIP) $(BUILDDIR)/bin/lcc*
 	@cp $(GBDKSUPPORTDIR)/ChangeLog $(BUILDDIR)
 	@cp $(GBDKSUPPORTDIR)/README $(BUILDDIR)
 	@cp $(GBDKDOCSDIR)/gbdk_manual.pdf $(BUILDDIR)
 	@echo
 	@echo Installing ihxcheck
-	@cp $(GBDKSUPPORTDIR)/ihxcheck/ihxcheck $(BUILDDIR)/bin/ihxcheck$(EXEEXTENSION)
+	@cp $(GBDKSUPPORTDIR)/ihxcheck/ihxcheck$(EXEEXTENSION) $(BUILDDIR)/bin/ihxcheck$(EXEEXTENSION)
 	@$(TARGETSTRIP) $(BUILDDIR)/bin/ihxcheck*
 	@echo Installing bankpack
-	@cp $(GBDKSUPPORTDIR)/bankpack/bankpack $(BUILDDIR)/bin/bankpack$(EXEEXTENSION)
+	@cp $(GBDKSUPPORTDIR)/bankpack/bankpack$(EXEEXTENSION) $(BUILDDIR)/bin/bankpack$(EXEEXTENSION)
 	@$(TARGETSTRIP) $(BUILDDIR)/bin/bankpack*
 	@echo Installing png2mtspr
 	@cp $(GBDKSUPPORTDIR)/png2mtspr/png2mtspr$(EXEEXTENSION) $(BUILDDIR)/bin/png2mtspr$(EXEEXTENSION)
 	@$(TARGETSTRIP) $(BUILDDIR)/bin/png2mtspr*
 	@echo Installing gbcompress
-	@cp $(GBDKSUPPORTDIR)/gbcompress/gbcompress $(BUILDDIR)/bin/gbcompress$(EXEEXTENSION)
+	@cp $(GBDKSUPPORTDIR)/gbcompress/gbcompress$(EXEEXTENSION) $(BUILDDIR)/bin/gbcompress$(EXEEXTENSION)
 	@$(TARGETSTRIP) $(BUILDDIR)/bin/gbcompress*
 	@echo
 
diff --git a/gbdk-support/png2mtspr/Makefile b/gbdk-support/png2mtspr/Makefile
@@ -11,6 +11,7 @@ LFLAGS = -g
 # Static flag for windows cross and native builds
 ifeq ($(TOOLSPREFIX),i686-w64-mingw32-)
 #   prefix will automatically be .exe for cross build
+	EXT = .exe
 	LFLAGS += -static 
 endif
 
@@ -30,7 +31,7 @@ OBJS := $(SRCS:%.cpp=%.o)
  
 $(TARGET): $(OBJS)
 	$(CXX) $(LFLAGS) -o $(TARGET) $(OBJS)
-#	strip $@$(EXT)
+	strip $@$(EXT)
  
 # The main.o target can be written more simply
  

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