diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-05-14 06:15:35 -0400 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-05-14 06:27:45 -0400 |
| commit | ce46a60cafa12080d330a6c6f82feeaeacc5ee37 (patch) | |
| tree | aa48d775143fd77ba16110719f886e0ca783bda4 | |
| parent | ff417cb1409fdbd5057badd5c37da09d053868ec (diff) | |
| download | subsurface-ce46a60cafa12080d330a6c6f82feeaeacc5ee37.tar.gz | |
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 <dirk@hohndel.org>
| -rw-r--r-- | Makefile | 10 | ||||
| -rwxr-xr-x | packaging/windows/mingw-make.sh | 2 |
2 files changed, 7 insertions, 5 deletions
@@ -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)) diff --git a/packaging/windows/mingw-make.sh b/packaging/windows/mingw-make.sh index 6201d41a4..6c2375114 100755 --- a/packaging/windows/mingw-make.sh +++ b/packaging/windows/mingw-make.sh @@ -16,4 +16,4 @@ make CC=i686-w64-mingw32-gcc \ PKG_CONFIG_PATH=/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig/ \ CROSS_PATH=/usr/i686-w64-mingw32/sys-root/mingw/ \ XSLTCONFIG=/usr/i686-w64-mingw32/sys-root/mingw/bin/xslt-config \ - XML2CONFIG=/usr/i686-w64-mingw32/sys-root/mingw/bin/xml2-config NAME=subsurface.exe install-cross-windows $@ + XML2CONFIG=/usr/i686-w64-mingw32/sys-root/mingw/bin/xml2-config install-cross-windows $@ |