From 71124479ed9f7e88f7b11f3ad4175000e2f21c4e Mon Sep 17 00:00:00 2001 From: "Juan J. Martinez" Date: Mon, 18 Jan 2021 19:16:59 +0000 Subject: Better windows support --- tools/Makefile | 1 - tools/apultra/Makefile | 12 +++++++++--- tools/hex2bin-2.0/Makefile | 7 +++++++ tools/rasm/Makefile | 12 +++++++++--- 4 files changed, 25 insertions(+), 7 deletions(-) (limited to 'tools') diff --git a/tools/Makefile b/tools/Makefile index 1c72392..58b23f1 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -5,7 +5,6 @@ all: $(BIN) ../bin/hex2bin: mkdir -p hex2bin-2.0/bin make -C hex2bin-2.0 - cp hex2bin-2.0/bin/hex2bin ../bin make -C hex2bin-2.0 cleanall ../bin/rasm: diff --git a/tools/apultra/Makefile b/tools/apultra/Makefile index 308c9aa..a416702 100644 --- a/tools/apultra/Makefile +++ b/tools/apultra/Makefile @@ -21,11 +21,17 @@ OBJS += $(OBJDIR)/src/libdivsufsort/lib/trsort.o all: $(APP) +ifdef ($(OS),Windows_NT) + TARGET = apultra.exe +else + TARGET = apultra +endif + $(APP): $(OBJS) $(CC) $^ $(LDFLAGS) -o $(APP) - cp $(APP) ../../bin - @rm -rf $(APP) $(OBJDIR) + cp $(TARGET) ../../bin + @rm -rf $(TARGET) $(OBJDIR) clean: - @rm -rf $(APP) $(OBJDIR) + @rm -rf $(TARGET) $(OBJDIR) diff --git a/tools/hex2bin-2.0/Makefile b/tools/hex2bin-2.0/Makefile index c8ef10b..0939450 100755 --- a/tools/hex2bin-2.0/Makefile +++ b/tools/hex2bin-2.0/Makefile @@ -17,6 +17,12 @@ CPFLAGS = -std=gnu99 -O3 -fsigned-char -Wall -pedantic # Compile all: objectdir $(TGT_FILES) +ifdef ($(OS),Windows_NT) + TARGET = hex2bin.exe +else + TARGET = hex2bin +endif + $(OBJDIR)/%.o: $(SRCDIR)/%.c gcc -c $(CPFLAGS) $< -o $@ @@ -29,6 +35,7 @@ $(TGTDIR)/hex2bin.1: $(SRCDIR)/hex2bin.pod $(TGTDIR)/hex2bin: $(B_OBJFILES) gcc $(CPFLAGS) -o $(TGTDIR)/hex2bin $(B_OBJFILES) + cp bin/$(TARGET) ../../bin $(TGTDIR)/mot2bin: $(M_OBJFILES) gcc $(CPFLAGS) -o $(TGTDIR)/mot2bin $(M_OBJFILES) diff --git a/tools/rasm/Makefile b/tools/rasm/Makefile index 8818fe2..8e7e71b 100644 --- a/tools/rasm/Makefile +++ b/tools/rasm/Makefile @@ -1,12 +1,18 @@ all: rasm +ifdef ($(OS),Windows_NT) + TARGET = rasm.exe +else + TARGET = rasm +endif + rasm: rasm_v0120.c $(CC) $< -s -O2 -lm -lrt -march=native -o $@ - cp rasm ../../bin - rm -f rasm + cp $(TARGET) ../../bin + rm -f $(TARGET) clean: - rm -f rasm + rm -f $(TARGET) .PHONY: all clean -- cgit v1.2.3