Skip to content

Commit

Permalink
Merge branch 'master' of github.com:pzembrod/cc64
Browse files Browse the repository at this point in the history
# Conflicts:
#	Makefile
  • Loading branch information
pzembrod committed Feb 14, 2021
2 parents c5aff2d + a92bf34 commit a1fdd0b
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@ c16dir_files = $(patsubst %, c16files/% , $(c16dir_content))
x16dir_content = cc64 $(rt_files) $(sample_files) c-charset
x16dir_files = $(patsubst %, x16files/% , $(x16dir_content))

# PETSCII sources and VolksForth bases for manual recompile
recompile_dir = recompile-cc64
recompile_srcs = $(patsubst %, $(recompile_dir)/%, \
$(cc64srcs) $(peddisrcs) $(commonsrcs))
recompile_forths = $(patsubst forth/%, $(recompile_dir)/%, \
$(wildcard forth/v4th*))

# Forth binaries
forth_binaries = devenv-uF83
forth_t64_files = $(patsubst %, autostart-c64/%.T64, $(forth_binaries))
Expand Down Expand Up @@ -77,6 +84,10 @@ cc64-x16files.zip: $(x16dir_files) COPYING
rm -f $@
zip -r $@ $^

$(recompile_dir).zip: $(recompile_srcs) $(recompile_forths) COPYING
rm -f $@
zip -r $@ $^

cc64-c64files.d64: $(c64dir_files) tmp/copying
rm -f $@
c1541 -format cc64-c64,cc d64 $@
Expand Down Expand Up @@ -263,6 +274,9 @@ c16files/vf-build-base: forth/v4th-c16+
x16files/vf-build-base: forth/v4th-x16
cp $< $@

$(recompile_dir)/%: forth/%
cp $< $@


# Runtime module rules

Expand Down

0 comments on commit a1fdd0b

Please sign in to comment.