Optimized mul20 & mul40 and extracted to new library.

[cc65] / libsrc / Makefile

diff --git a/libsrc/Makefile b/libsrc/Makefile
index 4cee7838be852ac5b128ef7a953b5e4b2ed1c584..4e1a3520d992e880e25b9a03617d2f63342f24eb 100644 (file)
--- a/libsrc/Makefile
+++ b/libsrc/Makefile
@@ -14,18 +14,26 @@ CBMS = c128   \
 GEOS = geos-apple \
        geos-cbm
 
-TARGETS = apple2    \
-          apple2enh \
-          atari     \
-          atarixl   \
-          atmos     \
-          $(CBMS)   \
-          $(GEOS)   \
-          lynx      \
-          nes       \
-          sim6502   \
-          sim65c02  \
-          supervision
+TARGETS = apple2       \
+          apple2enh    \
+          atari        \
+          atarixl      \
+          atari2600    \
+          atari5200    \
+          atmos        \
+          creativision \
+          $(CBMS)      \
+          $(GEOS)      \
+          gamate       \
+          lynx         \
+          nes          \
+          none         \
+          osic1p       \
+          pce          \
+          sim6502      \
+          sim65c02     \
+          supervision  \
+          telestrat
 
 DRVTYPES = emd \
            joy \
@@ -33,7 +41,15 @@ DRVTYPES = emd \
            ser \
            tgi
 
-.PHONY: all mostlyclean clean install lib $(TARGETS)
+OUTPUTDIRS := lib                                                                             \
+              asminc                                                                          \
+              cfg                                                                             \
+              include                                                                         \
+              $(subst ../,,$(filter-out $(wildcard ../include/*.*),$(wildcard ../include/*))) \
+              $(subst ../,,$(wildcard ../target/*/drv/*))                                     \
+              $(subst ../,,$(wildcard ../target/*/util))
+
+.PHONY: all mostlyclean clean install zip lib $(TARGETS)
 
 .SUFFIXES:
 
@@ -57,7 +73,7 @@ endif
 
 ifndef TARGET
 
-datadir = $(prefix)/share/cc65
+datadir = $(PREFIX)/share/cc65
 
 all lib: $(TARGETS)
 
@@ -65,7 +81,7 @@ mostlyclean:
        $(call RMDIR,../libwrk)
 
 clean:
-       $(call RMDIR,../libwrk ../lib ../targetutil $(addprefix ../,$(DRVTYPES)))
+       $(call RMDIR,../libwrk ../lib ../target)
 
 ifdef CMD_EXE
 
@@ -75,23 +91,28 @@ else # CMD_EXE
 
 INSTALL = install
 
-INSTALLDIRS = ../asminc ../cfg ../include \
-              $(filter-out $(wildcard ../include/*.*),$(wildcard ../include/*)) \
-              ../lib ../targetutil $(addprefix ../,$(DRVTYPES))
-
 define INSTALL_recipe
 
-$(if $(prefix),,$(error variable `prefix' must be set))
-$(INSTALL) -d $(subst ..,$(DESTDIR)$(datadir),$(dir))
-$(INSTALL) -m644 $(dir)/*.* $(subst ..,$(DESTDIR)$(datadir),$(dir))
+$(if $(PREFIX),,$(error variable "PREFIX" must be set))
+$(INSTALL) -d $(DESTDIR)$(datadir)/$(dir)
+$(INSTALL) -m0644 ../$(dir)/*.* $(DESTDIR)$(datadir)/$(dir)
 
 endef # INSTALL_recipe
 
 install:
-       $(foreach dir,$(INSTALLDIRS),$(INSTALL_recipe))
+       $(foreach dir,$(OUTPUTDIRS),$(INSTALL_recipe))
 
 endif # CMD_EXE
 
+define ZIP_recipe
+
+@cd .. && zip cc65 $(dir)/*.*
+
+endef # ZIP_recipe
+
+zip:
+       $(foreach dir,$(OUTPUTDIRS),$(ZIP_recipe))
+
 $(TARGETS):
        @$(MAKE) --no-print-directory $@
 
@@ -160,6 +181,7 @@ SRCDIRS += common   \
            mouse    \
            runtime  \
            serial   \
+           specialmath \
            tgi      \
            zlib
 
@@ -176,6 +198,7 @@ DEPS = $(OBJS:.o=.d)
 EXTRA_SRCPAT = $(SRCDIR)/extra/%.s
 EXTRA_OBJPAT = ../lib/$(TARGET)-%.o
 EXTRA_OBJS := $(patsubst $(EXTRA_SRCPAT),$(EXTRA_OBJPAT),$(wildcard $(SRCDIR)/extra/*.s))
+DEPS += $(EXTRA_OBJS:../lib/%.o=../libwrk/$(TARGET)/%.d)
 
 ZPOBJ = ../libwrk/$(TARGET)/zeropage.o
 ifeq ($(TARGET),$(filter $(TARGET),$(EXTZP)))
@@ -193,38 +216,39 @@ endif
 define DRVTYPE_template
 
 $1_SRCDIR = $$(SRCDIR)/$1
-$1_OBJDIR = ../libwrk/$$(TARGET)/$1
-$1_DRVDIR = ../$1
+$1_STCDIR = ../libwrk/$$(TARGET)
+$1_DYNDIR = ../libwrk/$$(TARGET)/$1
+$1_DRVDIR = ../target/$$(TARGET)/drv/$1
 
-$1_OBJPAT = $$($1_OBJDIR)/$$(OBJPFX)%.o
+$1_SRCPAT = $$($1_SRCDIR)/$$(OBJPFX)%.s
+$1_STCPAT = $$($1_STCDIR)/$$(OBJPFX)%-$1.o
+$1_DYNPAT = $$($1_DYNDIR)/$$(OBJPFX)%.o
 $1_DRVPAT = $$($1_DRVDIR)/$$(DRVPFX)%.$1
-$1_STCPAT = ../libwrk/$$(TARGET)/$$(DRVPFX)%-$1.o
 
-$1_OBJS := $$(patsubst $$($1_SRCDIR)/%.s,$$($1_OBJDIR)/%.o,$$(wildcard $$($1_SRCDIR)/*.s))
+$1_SRCS := $$(wildcard $$($1_SRCDIR)/*.s)
+$1_STCS = $$(patsubst $$($1_SRCPAT),$$($1_STCPAT),$$($1_SRCS))
+$1_DYNS = $$(patsubst $$($1_SRCPAT),$$($1_DYNPAT),$$($1_SRCS))
+$1_DRVS = $$(patsubst $$($1_DYNPAT),$$($1_DRVPAT),$$($1_DYNS))
 
-$1_DRVS = $$(patsubst $$($1_OBJPAT),$$($1_DRVPAT),$$($1_OBJS))
+$$($1_STCPAT): $$($1_SRCPAT)
+       @echo $$(TARGET) - $$< - static
+       @$$(CA65) -t $$(TARGET) -D DYN_DRV=0 $$(CA65FLAGS) --create-dep $$(@:.o=.d) -o $$@ $$<
 
-$1_STCS = $$(patsubst $$($1_DRVPAT),$$($1_STCPAT),$$($1_DRVS))
+OBJS += $$($1_STCS)
+DEPS += $$($1_STCS:.o=.d)
 
-$$($1_OBJS): | $$($1_OBJDIR)
+$$($1_DYNS): | $$($1_DYNDIR)
 
-$$($1_DRVPAT): $$($1_OBJPAT) $$(ZPOBJ) | $$($1_DRVDIR)
+$$($1_DRVPAT): $$($1_DYNPAT) $$(ZPOBJ) | $$($1_DRVDIR)
        @echo $$(TARGET) - $$(<F)
        @$$(LD65) -o $$@ -t module $$^
 
-$$($1_OBJDIR) $$($1_DRVDIR):
+$$($1_DYNDIR) $$($1_DRVDIR):
        @$$(call MKDIR,$$@)
 
 $(TARGET): $$($1_DRVS)
 
-$$($1_STCPAT): $$($1_DRVPAT)
-       @echo $$(TARGET) - $$(<F)
-       @$$(CO65) -o $$(@:.o=.s) --code-label _$$(subst -,_,$$(subst .,_,$$(<F))) $$<
-       @$$(CA65) -t $$(TARGET) -o $$@ $$(@:.o=.s)
-
-OBJS += $$($1_STCS)
-
-DEPS += $$($1_OBJS:.o=.d)
+DEPS += $$($1_DYNS:.o=.d)
 
 endef # DRVTYPE_template
 
@@ -233,21 +257,20 @@ $(foreach drvtype,$(DRVTYPES),$(eval $(call DRVTYPE_template,$(drvtype))))
 AR65 := $(if $(wildcard ../bin/ar65*),../bin/ar65,ar65)
 CA65 := $(if $(wildcard ../bin/ca65*),../bin/ca65,ca65)
 CC65 := $(if $(wildcard ../bin/cc65*),../bin/cc65,cc65)
-CO65 := $(if $(wildcard ../bin/co65*),../bin/co65,co65)
 LD65 := $(if $(wildcard ../bin/ld65*),../bin/ld65,ld65)
 
 export CC65_HOME := $(abspath ..)
 
 define ASSEMBLE_recipe
 
-$(if $(TRAVIS),,@echo $(TARGET) - $<)
+$(if $(QUIET),,@echo $(TARGET) - $<)
 @$(CA65) -t $(TARGET) $(CA65FLAGS) --create-dep $(@:.o=.d) -o $@ $<
 
 endef # ASSEMBLE_recipe
 
 define COMPILE_recipe
 
-$(if $(TRAVIS),,@echo $(TARGET) - $<)
+$(if $(QUIET),,@echo $(TARGET) - $<)
 @$(CC65) -t $(TARGET) $(CC65FLAGS) --create-dep $(@:.o=.d) --dep-target $@ -o $(@:.o=.s) $<
 @$(CA65) -t $(TARGET) -o $@ $(@:.o=.s)
 
@@ -259,14 +282,14 @@ endef # COMPILE_recipe
 ../libwrk/$(TARGET)/%.o: %.c | ../libwrk/$(TARGET)
        $(COMPILE_recipe)
 
-$(EXTRA_OBJPAT): $(EXTRA_SRCPAT) | ../lib
+$(EXTRA_OBJPAT): $(EXTRA_SRCPAT) | ../libwrk/$(TARGET) ../lib
        @echo $(TARGET) - $(<F)
-       @$(CA65) -t $(TARGET) $(CA65FLAGS) -o $@ $<
+       @$(CA65) -t $(TARGET) $(CA65FLAGS) --create-dep $(@:../lib/%.o=../libwrk/$(TARGET)/%.d) -o $@ $<
 
 ../lib/$(TARGET).lib: $(OBJS) | ../lib
        $(AR65) a $@ $?
 
-../libwrk/$(TARGET) ../lib ../targetutil:
+../libwrk/$(TARGET) ../lib ../target/$(TARGET)/util:
        @$(call MKDIR,$@)
 
 $(TARGET): $(EXTRA_OBJS) ../lib/$(TARGET).lib