summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2019-04-22 23:43:17 +0200
committerAmaury Pouly <amaury.pouly@gmail.com>2019-04-22 23:45:33 +0200
commit4ed57276542124a22c26ebb1d307996fc3a7556c (patch)
treeceb089eaac9e000fec0b2356bfe701935c236d02
parent063ff294a266f68ab93f462c264613c2223a40cd (diff)
downloadrockbox-4ed57276542124a22c26ebb1d307996fc3a7556c.tar.gz
rockbox-4ed57276542124a22c26ebb1d307996fc3a7556c.zip
nwztools: fix Makefile
Seems like newer versions of mingw will sponteanously add a .exe suffix to the output path if it doesn't have one, for example mingw-gcc -o scsitool bla will actually create scsitool.exe and of course this breaks my release script. Fix this by explicitely adding the .exe to avoid any problem Change-Id: Ic8019b968b532b2ca612ba0c03977a96c22cee01
-rw-r--r--utils/nwztools/scsitools/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/utils/nwztools/scsitools/Makefile b/utils/nwztools/scsitools/Makefile
index 53b901427f..0267581f69 100644
--- a/utils/nwztools/scsitools/Makefile
+++ b/utils/nwztools/scsitools/Makefile
@@ -1,17 +1,18 @@
1SCSI_DIR=../../scsi 1SCSI_DIR=../../scsi
2DEFINES= 2DEFINES=
3PREFIX?= 3PREFIX?=
4EXE_EXT?=
4CC=$(PREFIX)gcc 5CC=$(PREFIX)gcc
5LD=$(PREFIX)gcc 6LD=$(PREFIX)gcc
6NWZ_DB_DIR=../../../firmware/target/hosted/sonynwz 7NWZ_DB_DIR=../../../firmware/target/hosted/sonynwz
7INCLUDES=-I$(NWZ_DB_DIR) -I$(SCSI_DIR) 8INCLUDES=-I$(NWZ_DB_DIR) -I$(SCSI_DIR)
8CFLAGS=-std=c99 -Wall $(DEFINES) $(INCLUDES) 9CFLAGS=-std=c99 -Wall $(DEFINES) $(INCLUDES)
9LDFLAGS=-L$(SCSI_DIR) -lrbscsi 10LDFLAGS=-L$(SCSI_DIR) -lrbscsi
10BINS=scsitool 11BINS=scsitool$(EXE_EXT)
11 12
12all: $(BINS) 13all: $(BINS)
13 14
14scsitool: scsitool.c misc.c para_noise.c $(NWZ_DB_DIR)/nwz-db.c 15scsitool$(EXE_EXT): scsitool.c misc.c para_noise.c $(NWZ_DB_DIR)/nwz-db.c
15 $(MAKE) -C $(SCSI_DIR) 16 $(MAKE) -C $(SCSI_DIR)
16 $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) 17 $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
17 18