Skip to content

Commit 6043023

Browse files
authored
Should compile for OpenIndiana now, other adjustments
1 parent 1196134 commit 6043023

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

Makefile

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
CC = c++
22
CFLAGS = -O2 -Wall -Wunused -lpthread `fltk-config --use-images --cxxflags --ldflags` \
3-
--std=c++11 \
4-
`pkg-config --cflags --libs libvncclient libvncserver`
3+
--std=c++11 -finline-functions -march=x86-64
54
DEBUGFLGS= -g -O0
65
BINDIR = /usr/local/bin
76
TARGET = spiritvnc-fltk
87
SRC = `ls src/*.cxx`
98
PKGCONF = `which pkg-config`
109
LIBXPM =
10+
LIBVNC =
1111
OSNAME = $(shell uname -s)
1212

1313
# don't include X11 stuff for mac
@@ -17,6 +17,13 @@ else
1717
LIBXPM = -lXpm
1818
endif
1919

20+
# fix OI / Solaris stuff
21+
ifeq ($(OSNAME), SunOS)
22+
LIBVNC = `libvncserver-config --cflags --libs` -m64
23+
else
24+
LIBVNC = `pkg-config --cflags --libs libvncclient libvncserver`
25+
endif
26+
2027
spiritvnc-fltk:
2128
@echo "Building on '$(OSNAME)'"
2229
@echo ""
@@ -27,7 +34,7 @@ spiritvnc-fltk:
2734
exit 1 ; \
2835
fi
2936

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

3239
debug:
3340
@echo "Building debug on '$(OSNAME)'"
@@ -40,7 +47,7 @@ debug:
4047
exit 1 ; \
4148
fi
4249

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

4552
.PHONY: clean
4653
clean::

0 commit comments

Comments
 (0)