diff options
| -rw-r--r-- | Makefile | 25 | ||||
| -rw-r--r-- | squeeze.c | 2 |
2 files changed, 14 insertions, 13 deletions
@@ -1,15 +1,9 @@ # This makefile attempts to build a squeeze executable which can be used # on Linux to compress RISC OS binaries. -all: squeeze +GCCSDK_INSTALL_CROSSBIN ?= /opt/netsurf/arm-unknown-riscos/cross/bin -PREFIX := /opt/netsurf/arm-unknown-riscos/cross - -install: squeeze - mkdir -p $(DESTDIR)$(PREFIX)/bin - install -m 755 squeeze $(DESTDIR)$(PREFIX)/bin/squeeze - -SDK_PATH = /opt/netsurf/arm-unknown-riscos/cross/bin/ +PREFIX ?= $(GCCSDK_INSTALL_CROSSBIN)/.. PERL ?= perl export PERL @@ -17,9 +11,17 @@ export PERL MAKEHEADER = $(PERL) makeheader.pl CC := gcc +ASASM := $(GCCSDK_INSTALL_CROSSBIN)/asasm +OBJCOPY := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*objcopy) CFLAGS := $(CFLAGS) -O2 +all: squeeze + +install: squeeze + mkdir -p $(DESTDIR)$(PREFIX)/bin + install -m 755 squeeze $(DESTDIR)$(PREFIX)/bin/squeeze + clean: $(RM) squeeze squeeze.o unsqueeze.o unsqrm.o $(RM) unsqueeze1.h unsqrm1.h unsqueeze.bin unsqrm.bin @@ -27,7 +29,6 @@ clean: distclean: clean $(RM) *~ - squeeze: squeeze.o $(CC) $(CFLAGS) -o $@ $^ @@ -41,10 +42,10 @@ unsqueeze1.h: unsqueeze.bin $(MAKEHEADER) UnSqueeze_UnSqueezeBase '' UnSqueeze_UnSqueezeLimit $< $@ unsqueeze.bin: unsqueeze.o - $(SDK_PATH)arm-unknown-riscos-objcopy -O binary -j 'M2$$$$Code' $< $@ + $(OBJCOPY) -O binary -j 'M2$$$$Code' $< $@ unsqrm.bin: unsqrm.o - $(SDK_PATH)arm-unknown-riscos-objcopy -O binary -j unsqueeze $< $@ + $(OBJCOPY) -O binary -j unsqueeze $< $@ %.o:%.s - $(SDK_PATH)asasm -o $@ -elf -32 $< + $(ASASM) -o $@ -elf -32 $< @@ -885,7 +885,7 @@ static int squeeze(char *in, char *out) } } if (verbose > 1) fprintf(stderr, "-- loaded %" PRIdPTR " bytes in %d csec\n", size, ticks()); - t = clock(); + t = (clock() * 100) / CLOCKS_PER_SEC; if (isdata) top = compresscode(code, size, (-DATABYTES) + 4); else top = compress(code, size, info.exec - info.load); |