Skip to content

Commit

Permalink
Issue #1104: Rename some of the binaries.
Browse files Browse the repository at this point in the history
Not sure how to adjust the vcproj files - the binary name appears
to be implied somehow
  • Loading branch information
suborb committed Feb 10, 2019
1 parent 5396a9a commit f8a0ba0
Show file tree
Hide file tree
Showing 14 changed files with 269 additions and 80 deletions.
15 changes: 8 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ libsrc/_DEVELOPMENT/target/z80/z80_crt.asm
libsrc/_DEVELOPMENT/target/zx/zx_crt.asm
src/appmake/appmake
src/config.h
src/copt/copt
src/cpp/zcpp
src/copt/z88dk-copt
src/cpp/z88dk-zcpp
src/lstmanip/z88dk-lstmanip
src/scanner/zpragma
src/scanner/z88dk-zpragma
src/sccz80/sccz80
src/ticks/ticks
src/ticks/z88dk-dis
src/ucpp/ucpp
src/ucpp/z88dk-ucpp
src/z80asm/t/libtestlib.a
src/z80asm/z80asm
src/z80asm/z80asm2
Expand All @@ -49,11 +49,12 @@ src/z80nm/z80nm
src/z88dk-lib/z88dk-lib
src/zcc/zcc
src/zobjcopy/zobjcopy
src/zpragma/zpragma
src/zpragma/z88dk-zpragma
src/zx7/dzx7
src/zx7/zx7
support/graphics/z80svg
support/pv1000/font2pv1000
support/basck/z88dk-basck
support/graphics/z88dk-z80svg
support/pv1000/z88dk-font2pv1000
t/**
win32/*/Debug/
win32/*/Release/
Expand Down
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Z88DK_PATH = $(shell pwd)
export CC INSTALL CFLAGS EXEC_PREFIX CROSS

all: setup appmake copt zcpp ucpp sccz80 z80asm zcc zpragma zx7 z80nm zobjcopy \
lstmanip ticks z80svg font2pv1000 testsuite z88dk-lib zsdcc
lstmanip ticks z80svg font2pv1000 basck testsuite z88dk-lib zsdcc

setup:
$(shell if [ "${git_count}" != "" ]; then \
Expand Down Expand Up @@ -125,6 +125,10 @@ z80svg:
$(MAKE) -C support/graphics
$(MAKE) -C support/graphics PREFIX=`pwd` install

basck:
$(MAKE) -C support/basck
$(MAKE) -C support/basck PREFIX=`pwd` install

font2pv1000:
$(MAKE) -C support/pv1000
$(MAKE) -C support/pv1000 PREFIX=`pwd` install
Expand Down
2 changes: 1 addition & 1 deletion src/appmake/appmake.c
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ FILE *fopen_bin(const char *fname,const char *crtfile)
// 2: compressed rom model, complete binary is "*_CODE.bin" + zx7("*_DATA.bin")

get_temporary_filename(tname);
snprintf(cmdline, FILENAME_MAX*2 + 127, "%szx7 -f %s %s", EXEC_PREFIX,name, tname);
snprintf(cmdline, FILENAME_MAX*2 + 127, "z88dk-zx7 -f %s %s", name, tname);

if (system(cmdline) != 0)
exit_log(1, "ERROR: Unable to compress %s\n", name);
Expand Down
10 changes: 5 additions & 5 deletions src/copt/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@ REGEX_OBJS = regex/regcomp.o regex/regerror.o regex/regexec.o regex/regfree.o

OBJS += $(REGEX_OBJS)

all: copt$(EXESUFFIX)
all: z88dk-copt$(EXESUFFIX)

copt$(EXESUFFIX): $(OBJS)
$(CC) -o copt$(EXESUFFIX) $(LDFLAGS) $(OBJS)
z88dk-copt$(EXESUFFIX): $(OBJS)
$(CC) -o z88dk-copt$(EXESUFFIX) $(LDFLAGS) $(OBJS)

%.o: %.c
$(CC) -c -o $@ $(CFLAGS) $(LOCAL_CFLAGS) $(INCLUDES) $^

install:
$(INSTALL) copt$(EXESUFFIX) $(PREFIX)/bin/$(EXEC_PREFIX)copt$(EXESUFFIX)
$(INSTALL) z88dk-copt$(EXESUFFIX) $(PREFIX)/bin/z88dk-copt$(EXESUFFIX)

clean:
$(RM) copt$(EXESUFFIX) copt.o core$(EXESUFFIX) regex/*.o
$(RM) z88dk-copt$(EXESUFFIX) copt.o core$(EXESUFFIX) regex/*.o
$(RM) -rf Debug Release


Expand Down
68 changes: 55 additions & 13 deletions src/cpp/Makefile
Original file line number Diff line number Diff line change
@@ -1,21 +1,63 @@
#-----------------------------------------------------------------------------
# zcpp - C89 preprocessor for sccz80 (unused)
#-----------------------------------------------------------------------------
PROJ := z88dk-zcpp

INSTALL ?= install
OBJS=cpp1.o cpp2.o cpp3.o cpp4.o cpp5.o cpp6.o
ifeq ($(OS),Windows_NT)
EXE := .exe
else
EXE := $(EXESUFFIX)
endif

CC ?= gcc
CFLAGS += -Wall -std=gnu11 -MMD \
-I../../ext/optparse \
-I../../ext/regex \

INSTALL ?= install

SRCS := $(wildcard *.c)

OBJS_ALL := $(SRCS:.c=.o)
OBJS := $(OBJS_ALL:$(PROJ).o=)

ifeq (Darwin,$(shell uname))
CFLAGS += -std=c89
DEPENDS := $(SRCS:.c=.d) $(T_SRCS:.c=.d)

#------------------------------------------------------------------------------
.PHONY: all clean test install

#------------------------------------------------------------------------------
define MAKE_EXE
all: $(1)$(EXE)

$(1)$(EXE): $(2)
$(CC) $(CFLAGS) -o $(1)$(EXE) $(2) $(LDFLAGS)

clean::
$(RM) $(1)$(EXE) $(2)

test:: $(1)$(EXE)
ifeq ($(3),1)
./$(1)$(EXE)
endif

zcpp$(EXESUFFIX):$(OBJS)
$(CC) $(LDFLAGS) -o zcpp$(EXESUFFIX) $(OBJS)
valgrind:: $(1)$(EXE)
$(VALGRIND) $(1)$(EXE)
endef

#------------------------------------------------------------------------------
$(eval $(call MAKE_EXE,$(PROJ),$(OBJS_ALL),0))

#------------------------------------------------------------------------------
test:: $(PROJ)$(EXE)
perl -S prove t/*.t

%.o: %.c cpp.h cppdef.h
$(CC) $(CFLAGS) -c $<
#------------------------------------------------------------------------------
clean::
$(RM) $(OBJS) $(DEPENDS) *.bak t/*.bak

install:
$(INSTALL) zcpp$(EXESUFFIX) $(PREFIX)/bin/$(EXEC_PREFIX)zcpp$(EXESUFFIX)
#------------------------------------------------------------------------------
install: $(PROJ)$(EXE)
$(INSTALL) $(PROJ)$(EXE) $(PREFIX)/bin/$(PROJ)$(EXE)

clean:
$(RM) *.o core *~ zcpp$(EXESUFFIX)
$(RM) -rf Debug Release
-include $(DEPENDS)
2 changes: 1 addition & 1 deletion src/ticks/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ z88dk-dis$(EXESUFFIX): $(DISOBJS)

install:
$(INSTALL) ticks$(EXESUFFIX) $(PREFIX)/bin/$(EXEC_PREFIX)ticks$(EXESUFFIX)
$(INSTALL) z88dk-dis$(EXESUFFIX) $(PREFIX)/bin/$(EXEC_PREFIX)z88dk-dis$(EXESUFFIX)
$(INSTALL) z88dk-dis$(EXESUFFIX) $(PREFIX)/bin/z88dk-dis$(EXESUFFIX)

clean:
$(RM) ticks$(EXESUFFIX) $(OBJS) core
Expand Down
67 changes: 53 additions & 14 deletions src/ucpp/Makefile
Original file line number Diff line number Diff line change
@@ -1,25 +1,64 @@
#-----------------------------------------------------------------------------
# ucpp - C99 preprocessor for sccz80
#-----------------------------------------------------------------------------
PROJ := z88dk-ucpp

INSTALL ?= install
CFILES = mem.c nhash.c cpp.c lexer.c assert.c macro.c eval.c
OBJS = $(CFILES:.c=.o)
DEPENDS := $(OBJS:.o=.d)
ifeq ($(OS),Windows_NT)
EXE := .exe
else
EXE := $(EXESUFFIX)
endif

CC ?= gcc
CFLAGS += -Wall -std=gnu11 -MMD \
-I../../ext/optparse \
-I../../ext/regex \
-DSTAND_ALONE -DUCPP_CONFIG

INSTALL ?= install

CFLAGS += -MMD -DSTAND_ALONE -DUCPP_CONFIG -O2 -Wall
SRCS := mem.c nhash.c cpp.c lexer.c assert.c macro.c eval.c

ucpp$(EXESUFFIX):$(OBJS)
$(CC) $(LDFLAGS) -o ucpp$(EXESUFFIX) $(OBJS)
OBJS_ALL := $(SRCS:.c=.o)
OBJS := $(OBJS_ALL:$(PROJ).o=)

DEPENDS := $(SRCS:.c=.d) $(T_SRCS:.c=.d)

%.o: %.c
$(CC) $(CFLAGS) -c $<
#------------------------------------------------------------------------------
.PHONY: all clean test install

install:
$(INSTALL) ucpp$(EXESUFFIX) $(PREFIX)/bin/$(EXEC_PREFIX)ucpp$(EXESUFFIX)
#------------------------------------------------------------------------------
define MAKE_EXE
all: $(1)$(EXE)

clean:
$(RM) *.o core *~ ucpp$(EXESUFFIX) *.d
$(RM) -rf Debug Release
$(1)$(EXE): $(2)
$(CC) $(CFLAGS) -o $(1)$(EXE) $(2) $(LDFLAGS)

clean::
$(RM) $(1)$(EXE) $(2)

test:: $(1)$(EXE)
ifeq ($(3),1)
./$(1)$(EXE)
endif

valgrind:: $(1)$(EXE)
$(VALGRIND) $(1)$(EXE)
endef

#------------------------------------------------------------------------------
$(eval $(call MAKE_EXE,$(PROJ),$(OBJS_ALL),0))

#------------------------------------------------------------------------------
test:: $(PROJ)$(EXE)
perl -S prove t/*.t

#------------------------------------------------------------------------------
clean::
$(RM) $(OBJS) $(DEPENDS) *.bak t/*.bak

#------------------------------------------------------------------------------
install: $(PROJ)$(EXE)
$(INSTALL) $(PROJ)$(EXE) $(PREFIX)/bin/$(PROJ)$(EXE)

-include $(DEPENDS)
16 changes: 8 additions & 8 deletions src/zcc/zcc.c
Original file line number Diff line number Diff line change
Expand Up @@ -267,13 +267,13 @@ static char *c_aslink_exe = "aslink";

static char *c_clang_exe = "zclang";
static char *c_llvm_exe = "zllvm-cbe";
static char *c_sdcc_exe = EXEC_PREFIX "zsdcc";
static char *c_sdcc_exe = "zsdcc";
static char *c_sccz80_exe = EXEC_PREFIX "sccz80";
static char *c_cpp_exe = EXEC_PREFIX "ucpp";
static char *c_sdcc_preproc_exe = EXEC_PREFIX "zsdcpp";
static char *c_zpragma_exe = EXEC_PREFIX "zpragma";
static char *c_copt_exe = EXEC_PREFIX "copt";
static char *c_appmake_exe = EXEC_PREFIX "appmake";
static char *c_cpp_exe = "z88dk-ucpp";
static char *c_sdcc_preproc_exe = "zsdcpp";
static char *c_zpragma_exe = "z88dk-zpragma";
static char *c_copt_exe = "z88dk-copt";
static char *c_appmake_exe = "appmake";
#ifndef WIN32
static char *c_copycmd = "cat";
#else
Expand Down Expand Up @@ -971,9 +971,9 @@ int main(int argc, char **argv)
char cmdline[FILENAME_MAX + 128];

#ifdef _WIN32
snprintf(cmdline, FILENAME_MAX + 127, "zpragma < \"%s\" > nul", pragincname);
snprintf(cmdline, FILENAME_MAX + 127, "%s < \"%s\" > nul",c_zpragma_exe, pragincname);
#else
snprintf(cmdline, FILENAME_MAX + 127, "zpragma < \"%s\" > /dev/null", pragincname);
snprintf(cmdline, FILENAME_MAX + 127, "%s < \"%s\" > /dev/null",c_zpragma_exe, pragincname);
#endif
if (verbose) printf("%s\n", cmdline);
system(cmdline);
Expand Down
65 changes: 53 additions & 12 deletions src/zpragma/Makefile
Original file line number Diff line number Diff line change
@@ -1,22 +1,63 @@
#-----------------------------------------------------------------------------
# zpragma - Parse files and create zcc_opt.def
#-----------------------------------------------------------------------------
PROJ := z88dk-zpragma

INSTALL ?= install
ifeq ($(OS),Windows_NT)
EXE := .exe
else
EXE := $(EXESUFFIX)
endif

OBJS = zpragma.o
CC ?= gcc
CFLAGS += -Wall -std=gnu11 -MMD \
-I../../ext/optparse \
-I../../ext/regex

INSTALL ?= install

all: zpragma$(EXESUFFIX)
SRCS := $(wildcard *.c)

zpragma$(EXESUFFIX): $(OBJS)
$(CC) -o zpragma$(EXESUFFIX) $(LDFLAGS) $(OBJS)
OBJS_ALL := $(SRCS:.c=.o)
OBJS := $(OBJS_ALL:$(PROJ).o=)

install:
$(INSTALL) zpragma$(EXESUFFIX) $(PREFIX)/bin/$(EXEC_PREFIX)zpragma$(EXESUFFIX)
DEPENDS := $(SRCS:.c=.d) $(T_SRCS:.c=.d)

clean:
$(RM) zpragma$(EXESUFFIX) zpragma.o core$(EXESUFFIX)
$(RM) -rf Debug Release
#------------------------------------------------------------------------------
.PHONY: all clean test install

#------------------------------------------------------------------------------
define MAKE_EXE
all: $(1)$(EXE)

#Dependencies
$(1)$(EXE): $(2)
$(CC) $(CFLAGS) -o $(1)$(EXE) $(2) $(LDFLAGS)

clean::
$(RM) $(1)$(EXE) $(2)

zpragma.o: zpragma.c
test:: $(1)$(EXE)
ifeq ($(3),1)
./$(1)$(EXE)
endif

valgrind:: $(1)$(EXE)
$(VALGRIND) $(1)$(EXE)
endef

#------------------------------------------------------------------------------
$(eval $(call MAKE_EXE,$(PROJ),$(OBJS_ALL),0))

#------------------------------------------------------------------------------
test:: $(PROJ)$(EXE)
perl -S prove t/*.t

#------------------------------------------------------------------------------
clean::
$(RM) $(OBJS) $(DEPENDS) *.bak t/*.bak

#------------------------------------------------------------------------------
install: $(PROJ)$(EXE)
$(INSTALL) $(PROJ)$(EXE) $(PREFIX)/bin/$(PROJ)$(EXE)

-include $(DEPENDS)
20 changes: 10 additions & 10 deletions src/zx7/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ INSTALL ?= install
OBJS = compress.c optimize.c zx7.c


all: zx7$(EXESUFFIX) dzx7$(EXESUFFIX)
all: z88dk-zx7$(EXESUFFIX) z88dk-dzx7$(EXESUFFIX)

zx7$(EXESUFFIX): $(OBJS)
$(CC) -o zx7$(EXESUFFIX) $(LDFLAGS) $(OBJS)
z88dk-zx7$(EXESUFFIX): $(OBJS)
$(CC) -o z88dk-zx7$(EXESUFFIX) $(LDFLAGS) $(OBJS)

dzx7$(EXESUFFIX): dzx7.c
$(CC) -o dzx7$(EXESUFFIX) $(LDFLAGS) dzx7.c
z88dk-dzx7$(EXESUFFIX): dzx7.c
$(CC) -o z88dk-dzx7$(EXESUFFIX) $(LDFLAGS) dzx7.c

install:
$(INSTALL) zx7$(EXESUFFIX) $(PREFIX)/bin/$(EXEC_PREFIX)zx7$(EXESUFFIX)
$(INSTALL) dzx7$(EXESUFFIX) $(PREFIX)/bin/$(EXEC_PREFIX)dzx7$(EXESUFFIX)
install: z88dk-zx7$(EXESUFFIX) z88dk-dzx7$(EXESUFFIX)
$(INSTALL) z88dk-zx7$(EXESUFFIX) $(PREFIX)/bin/z88dk-zx7$(EXESUFFIX)
$(INSTALL) z88dk-dzx7$(EXESUFFIX) $(PREFIX)/bin/z88dk-dzx7$(EXESUFFIX)

clean:
$(RM) zx7$(EXESUFFIX) zx7.o core$(EXESUFFIX)
$(RM) dzx7$(EXESUFFIX) dzx7.o
$(RM) z88dk-zx7$(EXESUFFIX) zx7.o core$(EXESUFFIX)
$(RM) z88dk-dzx7$(EXESUFFIX) dzx7.o
$(RM) -rf Debug Release


Expand Down

0 comments on commit f8a0ba0

Please sign in to comment.