diff options
Diffstat (limited to 'icemulti')
| -rw-r--r-- | icemulti/.gitignore | 1 | ||||
| -rw-r--r-- | icemulti/Makefile | 12 | ||||
| -rw-r--r-- | icemulti/icemulti.cc | 8 |
3 files changed, 11 insertions, 10 deletions
diff --git a/icemulti/.gitignore b/icemulti/.gitignore index 9254c71..43ef5a2 100644 --- a/icemulti/.gitignore +++ b/icemulti/.gitignore @@ -1,4 +1,5 @@ icemulti icemulti.exe +icemulti.wasm icemulti.o icemulti.d diff --git a/icemulti/Makefile b/icemulti/Makefile index 7e2fe1c..1719f39 100644 --- a/icemulti/Makefile +++ b/icemulti/Makefile @@ -4,21 +4,21 @@ ifeq ($(STATIC),1) LDFLAGS += -static endif -all: icemulti$(EXE) +all: $(PROGRAM_PREFIX)icemulti$(EXE) -icemulti$(EXE): icemulti.o +$(PROGRAM_PREFIX)icemulti$(EXE): icemulti.o $(CXX) -o $@ $(LDFLAGS) $^ $(LDLIBS) install: all mkdir -p $(DESTDIR)$(PREFIX)/bin - cp icemulti$(EXE) $(DESTDIR)$(PREFIX)/bin/icemulti$(EXE) + cp $(PROGRAM_PREFIX)icemulti$(EXE) $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icemulti$(EXE) uninstall: - rm -f $(DESTDIR)$(PREFIX)/bin/icemulti$(EXE) + rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_PREFIX)icemulti$(EXE) clean: - rm -f icemulti$(EXE) - rm -f icemulti.exe + rm -f $(PROGRAM_PREFIX)icemulti$(EXE) + rm -f $(PROGRAM_PREFIX)icemulti.exe rm -f *.o *.d -include *.d diff --git a/icemulti/icemulti.cc b/icemulti/icemulti.cc index 4bc0919..52a7800 100644 --- a/icemulti/icemulti.cc +++ b/icemulti/icemulti.cc @@ -157,10 +157,10 @@ static void write_header(std::ostream &ofs, uint32_t &file_offset, write_byte(ofs, file_offset, 0x00); } -void usage() +void usage(const char *cmd) { log("\n"); - log("Usage: icemulti [options] input-files\n"); + log("Usage: %s [options] input-files\n", cmd); log("\n"); log(" -c\n"); log(" coldboot mode, power on reset image is selected by CBSEL0/CBSEL1\n"); @@ -252,12 +252,12 @@ int main(int argc, char **argv) print_offsets = true; break; default: - usage(); + usage(argv[0]); } if (optind == argc) { fprintf(stderr, "%s: missing argument\n", program_short_name); - usage(); + usage(argv[0]); } while (optind != argc) { |