SDL2 Makefile had a recursive definition of CC and PREFIX (issue #302)…

…. Also revised the GL Makefile to resemble the SDL2 one a little more closely. Still some work to be done there...
Bill-Gray · Oct 11, 2023 · ac96c55 · ac96c55
1 parent 7c26ec9
commit ac96c55
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/gl/Makefile b/gl/Makefile
@@ -17,12 +17,18 @@ common		= $(PDCURSES_SRCDIR)/common
 
 include $(common)/libobjs.mif
 
+ifdef _w32
+	PREFIX=i686-w64-mingw32-
+	E = .exe
+endif
+
 ifdef _w64
 	PREFIX=x86_64-w64-mingw32-
 	E = .exe
 endif
-ifdef _w32
-	PREFIX=i686-w64-mingw32-
+
+ifdef _a64
+	PREFIX = aarch64-w64-mingw32-
 	E = .exe
 endif
 
@@ -107,7 +113,7 @@ ifeq ($(DLL),Y)
 		CLEAN = *$(DLL_SUFFIX)
 	endif
 else
-	LIBEXE = $(AR)
+	LIBEXE = $(PREFIX)$(AR)
 	LIBFLAGS = rcv
 	LIBCURSES = lib$(LIBNAME).a
 	LDFLAGS = $(LIBCURSES) $(SLIBS)

diff --git a/sdl2/Makefile b/sdl2/Makefile
@@ -17,16 +17,16 @@ common		= $(PDCURSES_SRCDIR)/common
 
 include $(common)/libobjs.mif
 
-PREFIX = $(shell $(CC) -dumpmachine)
-
 ifdef _w32
 	PREFIX = i686-w64-mingw32
 	E = .exe
 endif
+
 ifdef _w64
 	PREFIX = x86_64-w64-mingw32
 	E = .exe
 endif
+
 ifdef _a64
 	PREFIX = aarch64-w64-mingw32
 	E = .exe