diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2011-10-29 09:14:15 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2011-10-29 09:14:15 -0700 |
| commit | 7f0c866f486eab549e25853bedd2e96b1b211773 (patch) | |
| tree | 4c04e9415eaec48ad24e8f0a7ba866ceeab8758e /Makefile | |
| parent | 2101f37c1b81840beda99a7b4e87e938f9e52a7a (diff) | |
| download | subsurface-7f0c866f486eab549e25853bedd2e96b1b211773.tar.gz | |
Get icons working correctly under Windows
With this we are able to include both a separate .ico file that the
program can load at runtime and a .res file (that is created from the .rc
file, both in the packaging/windows directory) that is linked into the
executable and makes the Windows Explorer show the correct icon for
subsurface.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -34,6 +34,7 @@ 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 else libdc-local := $(wildcard /usr/local/lib/libdivecomputer.a) @@ -76,7 +77,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) |