makefile updates

2018-08-12 13:24:24 +03:00
parent 0652ba3057
commit 0ff42bceb5
12 changed files with 33 additions and 44 deletions
--- a/glide3x/cvg/glide3/src/Makefile.DJ
+++ b/glide3x/cvg/glide3/src/Makefile.DJ
@@ -9,8 +9,6 @@
 #  Available options:
 #
 #    Environment variables:
-#	FX_GLIDE_HW	build for the given ASIC (cvg).
-#			default = cvg
 #	OPTFLAGS	pass given optimization flags to compiler
 #			default = -O2 -ffast-math (+ -mtune=pentium if USE_X86=1)
 #	DEBUG=1		enable debugging checks and messages
@@ -35,7 +33,6 @@
 #	realclean:	remove all generated files
 #

-
 .PHONY: all glide3x clean realclean
 .INTERMEDIATE: fxgasm.exe

@@ -48,7 +45,6 @@ GLIDE_DXE = glide3x.dxe
 GLIDE_IMP = libglide3i.a
 TEXUS_EXE = texus2.exe

-FX_GLIDE_HW ?= cvg
 FX_GLIDE_SW = ../../../swlibs
 GLIDE_LIBDIR = ../../lib
 TEXUS_EXEDIR = $(FX_GLIDE_SW)/bin
@@ -58,11 +54,13 @@ TEXUS_EXEDIR = $(FX_GLIDE_SW)/bin
 ###############################################################################

 CC = gcc
-HOST_CC = gcc
 AS = nasm
 AR = ar
 DXE3GEN = dxe3gen

+#for cross-builds
+HOST_CC = gcc
+
 UNLINK = rm -f $(1)

 ###############################################################################
@@ -136,6 +134,8 @@ endif

 # optflags
 CFLAGS += $(OPTFLAGS)
+
+# for cross-builds
 HOST_CFLAGS=$(filter-out -mcpu=% -mtune=% -march=%,$(CFLAGS))

 ###############################################################################
@@ -251,7 +251,7 @@ $(GLIDE_LIBDIR)/$(GLIDE_LIB): $(GLIDE_OBJECTS)
 	$(AR) $(ARFLAGS) $@ $^

 $(GLIDE_LIBDIR)/$(GLIDE_DXE) $(GLIDE_LIBDIR)/$(GLIDE_IMP): $(GLIDE_OBJECTS)
-	-$(DXE3GEN) -o $(GLIDE_LIBDIR)/$(GLIDE_DXE) -Y $(GLIDE_LIBDIR)/$(GLIDE_IMP) -D "Glide3(cvg) DJGPP" -E _gr -E _gu -E _tx -U $^
+	-$(DXE3GEN) -o $(GLIDE_LIBDIR)/$(GLIDE_DXE) -Y $(GLIDE_LIBDIR)/$(GLIDE_IMP) -D "Glide3 (cvg) for DJGPP" -E _gr -E _gu -E _tx -U $^

 $(TEXUS_EXEDIR)/$(TEXUS_EXE): $(FX_GLIDE_SW)/texus2/cmd/cmd.c $(GLIDE_LIBDIR)/$(GLIDE_LIB)
 ifeq ($(TEXUS2),1)
--- a/glide3x/cvg/glide3/src/Makefile.wat
+++ b/glide3x/cvg/glide3/src/Makefile.wat
@@ -10,8 +10,6 @@
 #  Available options:
 #
 #    Environment variables:
-#	FX_GLIDE_HW	build for the given ASIC (cvg).
-#			default = cvg
 #	OPTFLAGS	pass given optimization flags to compiler
 #			default = -ox -5s (Pentium, stack)
 #	DEBUG=1		enable debugging checks and messages
@@ -36,7 +34,6 @@
 #	realclean:	remove all generated files
 #

-
 .PHONY: all glide3x clean realclean
 .INTERMEDIATE: fxgasm.exe wlib.lbc
 .SUFFIXES: .c .obj
@@ -48,7 +45,6 @@
 GLIDE_LIB = glide3x.lib
 TEXUS_EXE = texus2.exe

-FX_GLIDE_HW ?= cvg
 FX_GLIDE_SW = ../../../swlibs
 GLIDE_LIBDIR = ../../lib
 TEXUS_EXEDIR = $(FX_GLIDE_SW)/bin
--- a/glide3x/cvg/glide3/src/Makefile.win32
+++ b/glide3x/cvg/glide3/src/Makefile.win32
@@ -10,8 +10,6 @@
 #  Available options:
 #
 #    Environment variables:
-#	FX_GLIDE_HW	build for the given ASIC (cvg).
-#			default = cvg
 #	OPTFLAGS	pass given optimization flags to compiler
 #			default = -G6 -O2 (or -Od if DEBUG=1)
 #	DEBUG=1		enable debugging checks and messages
@@ -36,7 +34,6 @@
 #	realclean:	remove all generated files
 #

-
 .PHONY: all glide3x clean realclean
 .INTERMEDIATE: fxgasm.exe
 .SUFFIXES: .c .obj .rc .res
@@ -50,7 +47,6 @@ GLIDE_DLL = glide3x.dll
 GLIDE_IMP = glide3x.lib
 TEXUS_EXE = texus2.exe

-FX_GLIDE_HW ?= cvg
 FX_GLIDE_SW = ..\..\..\swlibs
 GLIDE_LIBDIR = ..\..\lib
 TEXUS_EXEDIR = $(FX_GLIDE_SW)\bin
--- a/glide3x/h3/glide3/src/Makefile.DJ
+++ b/glide3x/h3/glide3/src/Makefile.DJ
@@ -9,8 +9,6 @@
 #  Available options:
 #
 #    Environment variables:
-#	FX_GLIDE_HW	build for the given ASIC (h3).
-#			default = h3
 #	H4=1		High speed Avenger.
 #			default = no
 #	OPTFLAGS	pass given optimization flags to compiler
@@ -33,7 +31,6 @@
 #	realclean:	remove all generated files
 #

-
 .PHONY: all glide3x clean realclean
 .INTERMEDIATE: fxgasm.exe

@@ -46,7 +43,6 @@ GLIDE_DXE = glide3x.dxe
 GLIDE_IMP = libglide3i.a
 TEXUS_EXE = texus2.exe

-FX_GLIDE_HW ?= h3
 FX_GLIDE_SW = ../../../swlibs
 GLIDE_LIBDIR = ../../lib
 TEXUS_EXEDIR = $(FX_GLIDE_SW)/bin
@@ -56,11 +52,13 @@ TEXUS_EXEDIR = $(FX_GLIDE_SW)/bin
 ###############################################################################

 CC = gcc
-HOST_CC = gcc
 AS = nasm
 AR = ar
 DXE3GEN = dxe3gen

+#for cross-builds
+HOST_CC = gcc
+
 UNLINK = rm -f $(1)

 ###############################################################################
@@ -125,6 +123,8 @@ endif

 # optflags
 CFLAGS += $(OPTFLAGS)
+
+# for cross-builds
 HOST_CFLAGS=$(filter-out -mcpu=% -mtune=% -march=%,$(CFLAGS))

 ###############################################################################
@@ -232,7 +232,7 @@ $(GLIDE_LIBDIR)/$(GLIDE_LIB): $(GLIDE_OBJECTS)
 	$(AR) $(ARFLAGS) $@ $^

 $(GLIDE_LIBDIR)/$(GLIDE_DXE) $(GLIDE_LIBDIR)/$(GLIDE_IMP): $(GLIDE_OBJECTS)
-	-$(DXE3GEN) -o $(GLIDE_LIBDIR)/$(GLIDE_DXE) -Y $(GLIDE_LIBDIR)/$(GLIDE_IMP) -D "Glide3(h3) DJGPP" -E _gr -E _gu -E _tx -U $^
+	-$(DXE3GEN) -o $(GLIDE_LIBDIR)/$(GLIDE_DXE) -Y $(GLIDE_LIBDIR)/$(GLIDE_IMP) -D "Glide3 (h3) for DJGPP" -E _gr -E _gu -E _tx -U $^

 $(TEXUS_EXEDIR)/$(TEXUS_EXE): $(FX_GLIDE_SW)/texus2/cmd/cmd.c $(GLIDE_LIBDIR)/$(GLIDE_LIB)
 ifeq ($(TEXUS2),1)
--- a/glide3x/h3/glide3/src/Makefile.wat
+++ b/glide3x/h3/glide3/src/Makefile.wat
@@ -10,8 +10,6 @@
 #  Available options:
 #
 #    Environment variables:
-#	FX_GLIDE_HW	build for the given ASIC (h3).
-#			default = h3
 #	H4=1		High speed Avenger.
 #			default = no
 #	OPTFLAGS	pass given optimization flags to compiler
@@ -34,7 +32,6 @@
 #	realclean:	remove all generated files
 #

-
 .PHONY: all glide3x clean realclean
 .INTERMEDIATE: fxgasm.exe wlib.lbc
 .SUFFIXES: .c .obj
@@ -46,7 +43,6 @@
 GLIDE_LIB = glide3x.lib
 TEXUS_EXE = texus2.exe

-FX_GLIDE_HW ?= h3
 FX_GLIDE_SW = ../../../swlibs
 GLIDE_LIBDIR = ../../lib
 TEXUS_EXEDIR = $(FX_GLIDE_SW)/bin
--- a/glide3x/h3/glide3/src/Makefile.win32
+++ b/glide3x/h3/glide3/src/Makefile.win32
@@ -10,8 +10,6 @@
 #  Available options:
 #
 #    Environment variables:
-#	FX_GLIDE_HW	build for the given ASIC (h3).
-#			default = h3
 #	H4=1		High speed Avenger.
 #			default = no
 #	OPTFLAGS	pass given optimization flags to compiler
@@ -34,7 +32,6 @@
 #	realclean:	remove all generated files
 #

-
 .PHONY: all glide3x clean realclean
 .INTERMEDIATE: fxgasm.exe
 .SUFFIXES: .c .obj .rc .res
@@ -48,7 +45,6 @@ GLIDE_DLL = glide3x.dll
 GLIDE_IMP = glide3x.lib
 TEXUS_EXE = texus2.exe

-FX_GLIDE_HW ?= h3
 FX_GLIDE_SW = ..\..\..\swlibs
 GLIDE_LIBDIR = ..\..\lib
 TEXUS_EXEDIR = $(FX_GLIDE_SW)\bin
--- a/glide3x/h5/glide3/src/Makefile.DJ
+++ b/glide3x/h5/glide3/src/Makefile.DJ
@@ -9,8 +9,6 @@
 #  Available options:
 #
 #    Environment variables:
-#	FX_GLIDE_HW	build for the given ASIC (h5).
-#			default = h5
 #	H4=1		High speed Avenger/Napalm.
 #			default = no
 #	OPTFLAGS	pass given optimization flags to compiler
@@ -52,7 +50,6 @@ GLIDE_DXE = glide3x.dxe
 GLIDE_IMP = libglide3i.a
 TEXUS_EXE = texus2.exe

-FX_GLIDE_HW ?= h5
 FX_GLIDE_SW = ../../../swlibs
 GLIDE_LIBDIR = ../../lib
 TEXUS_EXEDIR = $(FX_GLIDE_SW)/bin
@@ -62,11 +59,13 @@ TEXUS_EXEDIR = $(FX_GLIDE_SW)/bin
 ###############################################################################

 CC = gcc
-HOST_CC = gcc
 AS = nasm
 AR = ar
 DXE3GEN = dxe3gen

+#for cross-builds
+HOST_CC = gcc
+
 UNLINK = rm -f $(1)

 ###############################################################################
@@ -144,6 +143,8 @@ endif

 # optflags
 CFLAGS += $(OPTFLAGS)
+
+# for cross-builds
 HOST_CFLAGS=$(filter-out -mcpu=% -mtune=% -march=%,$(CFLAGS))

 ###############################################################################
@@ -261,7 +262,7 @@ $(GLIDE_LIBDIR)/$(GLIDE_LIB): $(GLIDE_OBJECTS)
 	$(AR) $(ARFLAGS) $@ $^

 $(GLIDE_LIBDIR)/$(GLIDE_DXE) $(GLIDE_LIBDIR)/$(GLIDE_IMP): $(GLIDE_OBJECTS)
-	-$(DXE3GEN) -o $(GLIDE_LIBDIR)/$(GLIDE_DXE) -Y $(GLIDE_LIBDIR)/$(GLIDE_IMP) -D "Glide3(h5) DJGPP" -E _gr -E _gu -E _tx -U $^
+	-$(DXE3GEN) -o $(GLIDE_LIBDIR)/$(GLIDE_DXE) -Y $(GLIDE_LIBDIR)/$(GLIDE_IMP) -D "Glide3 (h5) for DJGPP" -E _gr -E _gu -E _tx -U $^

 $(TEXUS_EXEDIR)/$(TEXUS_EXE): $(FX_GLIDE_SW)/texus2/cmd/cmd.c $(GLIDE_LIBDIR)/$(GLIDE_LIB)
 ifeq ($(TEXUS2),1)
--- a/glide3x/h5/glide3/src/Makefile.wat
+++ b/glide3x/h5/glide3/src/Makefile.wat
@@ -10,8 +10,6 @@
 #  Available options:
 #
 #    Environment variables:
-#	FX_GLIDE_HW	build for the given ASIC (h5).
-#			default = h5
 #	H4=1		High speed Avenger/Napalm.
 #			default = no
 #	OPTFLAGS	pass given optimization flags to compiler
@@ -51,7 +49,6 @@
 GLIDE_LIB = glide3x.lib
 TEXUS_EXE = texus2.exe

-FX_GLIDE_HW ?= h5
 FX_GLIDE_SW = ../../../swlibs
 GLIDE_LIBDIR = ../../lib
 TEXUS_EXEDIR = $(FX_GLIDE_SW)/bin
--- a/glide3x/h5/glide3/src/Makefile.win32
+++ b/glide3x/h5/glide3/src/Makefile.win32
@@ -10,8 +10,6 @@
 #  Available options:
 #
 #    Environment variables:
-#	FX_GLIDE_HW	build for the given ASIC (h5).
-#			default = h5
 #	H4=1		High speed Avenger/Napalm.
 #			default = no
 #	OPTFLAGS	pass given optimization flags to compiler
@@ -53,7 +51,6 @@ GLIDE_DLL = glide3x.dll
 GLIDE_IMP = glide3x.lib
 TEXUS_EXE = texus2.exe

-FX_GLIDE_HW ?= h5
 FX_GLIDE_SW = ..\..\..\swlibs
 GLIDE_LIBDIR = ..\..\lib
 TEXUS_EXEDIR = $(FX_GLIDE_SW)\bin
--- a/glide3x/sst1/glide3/src/Makefile.DJ
+++ b/glide3x/sst1/glide3/src/Makefile.DJ
@@ -9,7 +9,7 @@
 #  Available options:
 #
 #    Environment variables:
-#	FX_GLIDE_HW	build for the given ASIC (sst1, sst96).
+#	FX_GLIDE_HW	build for the given ASIC (either sst1, or sst96).
 #			default = sst1
 #	OPTFLAGS	pass given optimization flags to compiler
 #			default = -O1 -ffast-math (+ -mtune=pentium if USE_X86=1)
@@ -49,11 +49,13 @@ TEXUS_EXEDIR = $(FX_GLIDE_SW)/bin
 ###############################################################################

 CC = gcc
-HOST_CC = gcc
 AS = nasm
 AR = ar
 DXE3GEN = dxe3gen

+#for cross-builds
+HOST_CC = gcc
+
 UNLINK = rm -f $(1)

 ###############################################################################
@@ -78,6 +80,8 @@ CDEFS += -DSST96_FIFO
 CDEFS += -DINIT_ACCESS_DIRECT
 CDEFS += -DGLIDE_USE_ALT_REGMAP
 GLIDE_LIBDIR = ../../lib/sst96
+else
+$(error Invalid FX_GLIDE_HW setting)
 endif
 endif

@@ -121,6 +125,8 @@ endif

 # optflags
 CFLAGS += $(OPTFLAGS)
+
+# for cross-builds
 HOST_CFLAGS=$(filter-out -mcpu=% -mtune=% -march=%,$(CFLAGS))

 ###############################################################################
@@ -237,7 +243,7 @@ $(GLIDE_LIBDIR)/$(GLIDE_LIB): $(GLIDE_OBJECTS)
 	$(AR) $(ARFLAGS) $@ $^

 $(GLIDE_LIBDIR)/$(GLIDE_DXE) $(GLIDE_LIBDIR)/$(GLIDE_IMP): $(GLIDE_OBJECTS)
-	-$(DXE3GEN) -o $(GLIDE_LIBDIR)/$(GLIDE_DXE) -Y $(GLIDE_LIBDIR)/$(GLIDE_IMP) -D "Glide3($(FX_GLIDE_HW)) DJGPP" -E _gr -E _gu -E _tx -U $^
+	-$(DXE3GEN) -o $(GLIDE_LIBDIR)/$(GLIDE_DXE) -Y $(GLIDE_LIBDIR)/$(GLIDE_IMP) -D "Glide3 ($(FX_GLIDE_HW)) for DJGPP" -E _gr -E _gu -E _tx -U $^

 $(TEXUS_EXEDIR)/$(TEXUS_EXE): $(FX_GLIDE_SW)/texus2/cmd/cmd.c $(GLIDE_LIBDIR)/$(GLIDE_LIB)
 ifeq ($(TEXUS2),1)
--- a/glide3x/sst1/glide3/src/Makefile.wat
+++ b/glide3x/sst1/glide3/src/Makefile.wat
@@ -10,7 +10,7 @@
 #  Available options:
 #
 #    Environment variables:
-#	FX_GLIDE_HW	build for the given ASIC (sst1, sst96).
+#	FX_GLIDE_HW	build for the given ASIC (either sst1, or sst96).
 #			default = sst1
 #	OPTFLAGS	pass given optimization flags to compiler
 #			default = -ox -5s (Pentium, stack)
@@ -79,6 +79,8 @@ CDEFS += -DSST96_FIFO
 #CDEFS += -DINIT96VGASWAP
 CDEFS += -DINIT_ACCESS_DIRECT
 CDEFS += -DGLIDE_USE_ALT_REGMAP
+else
+$(error Invalid FX_GLIDE_HW setting)
 endif
 endif

--- a/glide3x/sst1/glide3/src/Makefile.win32
+++ b/glide3x/sst1/glide3/src/Makefile.win32
@@ -10,7 +10,7 @@
 #  Available options:
 #
 #    Environment variables:
-#	FX_GLIDE_HW	build for the given ASIC (sst1, sst96).
+#	FX_GLIDE_HW	build for the given ASIC (either sst1, or sst96).
 #			default = sst1
 #	OPTFLAGS	pass given optimization flags to compiler
 #			default = -G6 -O2 (or -Od if DEBUG=1)
@@ -83,6 +83,8 @@ CDEFS += -DSST96_FIFO
 #CDEFS += -DINIT_ACCESS_DIRECT
 CDEFS += -DGLIDE_USE_ALT_REGMAP
 GLIDE_LIBDIR = ..\..\lib\sst96
+else
+$(error Invalid FX_GLIDE_HW setting)
 endif
 endif