Skip to content

Commit 757ca7a

Browse files
authored
Get rid of hacky x11 libxpm app window icon code
Added hacky x11-centric code a couple of years ago to add app window icon, but it's just too hacky, adds complexity and so it's gone. Removed libxpm parts of Makefile
1 parent 0e9f6b6 commit 757ca7a

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

Makefile

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,9 @@ BINDIR = /usr/local/bin
66
TARGET = spiritvnc-fltk
77
SRC = `ls src/*.cxx`
88
PKGCONF = `which pkg-config`
9-
LIBXPM =
109
LIBVNC =
1110
OSNAME = $(shell uname -s)
1211

13-
# don't include X11 stuff for mac
14-
ifeq ($(OSNAME), Darwin)
15-
LIBXPM =
16-
else
17-
LIBXPM = -lXpm
18-
endif
1912

2013
# fix OI / Solaris stuff
2114
ifeq ($(OSNAME), SunOS)
@@ -34,7 +27,7 @@ spiritvnc-fltk:
3427
exit 1 ; \
3528
fi
3629

37-
$(CC) $(SRC) -o $(TARGET) $(CFLAGS) $(LIBXPM) $(LIBVNC)
30+
$(CC) $(SRC) -o $(TARGET) $(CFLAGS) $(LIBVNC)
3831

3932
debug:
4033
@echo "Building debug on '$(OSNAME)'"
@@ -47,7 +40,7 @@ debug:
4740
exit 1 ; \
4841
fi
4942

50-
$(CC) $(SRC) -o $(TARGET) $(CFLAGS) $(LIBXPM) $(LIBVNC) $(DEBUGFLGS)
43+
$(CC) $(SRC) -o $(TARGET) $(CFLAGS) $(LIBVNC) $(DEBUGFLGS)
5144

5245
.PHONY: clean
5346
clean::

0 commit comments

Comments
 (0)