diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-29 16:11:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-29 16:11:59 -0700 |
| commit | 951f601aad396523fc9efbb4f021264e3f03524c (patch) | |
| tree | 71afe13a347cd6d80d46ad1c877ce4615ca82ecf /Makefile | |
| parent | ceed8b6bc91872dec83b9c02223d72ac137c7335 (diff) | |
| parent | 28d4075746c6120b56231dc58564a2353cc88a6a (diff) | |
| download | subsurface-951f601aad396523fc9efbb4f021264e3f03524c.tar.gz | |
Merge branch 'mingw-port-cleanup' of git://github.com/dirkhh/subsurface
* 'mingw-port-cleanup' of git://github.com/dirkhh/subsurface:
Fix Windows install destination
Get rid of the terminal window that is displayed under Windows
Add first cut of the mingw cross build spec file + nsi file
Get icons working correctly under Windows
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -34,6 +34,8 @@ ifeq ($(CC), i686-w64-mingw32-gcc) LIBDIVECOMPUTERDIR = /usr/i686-w64-mingw32/sys-root/mingw/include/libdivecomputer LIBDIVECOMPUTERINCLUDES = `$(PKGCONFIG) --cflags libdivecomputer` LIBDIVECOMPUTERARCHIVE = `$(PKGCONFIG) --libs libdivecomputer` + RESFILE = packaging/windows/subsurface.res + LDFLAGS += -Wl,-subsystem,windows else libdc-local := $(wildcard /usr/local/lib/libdivecomputer.a) @@ -76,7 +78,7 @@ LIBS = $(LIBXML2) $(LIBGTK) $(LIBDIVECOMPUTER) -lpthread OBJS = main.o dive.o profile.o info.o equipment.o divelist.o \ parse-xml.o save-xml.o libdivecomputer.o print.o uemis.o \ - gtk-gui.o + gtk-gui.o $(RESFILE) $(NAME): $(OBJS) $(CC) $(LDFLAGS) -o $(NAME) $(OBJS) $(LIBS) |