From ce46a60cafa12080d330a6c6f82feeaeacc5ee37 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 14 May 2013 06:15:35 -0400 Subject: Fix Windows cross build commit 59294029f3d1 ("Capitalize package name and add capitalized tar-ball prefix") had an unintended side effect: the cross build for Windows on Linux no longer worked (as it set NAME=subsurface.exe). Fixed this by introducing a TARGET variable that is derived from $(NAME). Signed-off-by: Dirk Hohndel --- Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9233934c9..e0689548d 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ NAME = subsurface CAPITALIZED_NAME = Subsurface +TARGET = $(NAME) VERSION=3.1 @@ -72,6 +73,7 @@ ifeq ($(CC), i686-w64-mingw32-gcc) RESFILE = packaging/windows/$(NAME).res LDFLAGS += -Wl,-subsystem,windows LIBWINSOCK = -lwsock32 + TARGET = $(NAME).exe else ifeq ($(UNAME), darwin) LIBDIVECOMPUTERINCLUDES = $(shell $(PKGCONFIG) --cflags libdivecomputer) LIBDIVECOMPUTERARCHIVE = $(shell $(PKGCONFIG) --libs libdivecomputer) @@ -187,11 +189,11 @@ OBJS = main.o dive.o time.o profile.o info.o equipment.o divelist.o deco.o plann DEPS = $(wildcard .dep/*.dep) -all: $(NAME) +all: $(TARGET) -$(NAME): gen_version_file $(OBJS) $(MSGOBJS) $(INFOPLIST) - @$(PRETTYECHO) ' LINK' $(NAME) - $(COMPILE_PREFIX)$(CC) $(LDFLAGS) -o $(NAME) $(OBJS) $(LIBS) +$(TARGET): gen_version_file $(OBJS) $(MSGOBJS) $(INFOPLIST) + @$(PRETTYECHO) ' LINK' $(TARGET) + $(COMPILE_PREFIX)$(CC) $(LDFLAGS) -o $(TARGET) $(OBJS) $(LIBS) gen_version_file: ifneq ($(STORED_VERSION_STRING),$(VERSION_STRING)) -- cgit v1.2.3-70-g09d2