Fixes for osx.

Modify Makefile to include needed libraries and use paths for macports
(which is currently required).

Add some files for osx to gitignore.

diff --git a/.gitignore b/.gitignore
index 036d349f84fe788521afed51cb86e54b38429bc9..430f9aafcb9f197c12363a074f7c02b53e8aa115 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,9 @@ lib/libswmhack_pic.a
 lib/swm_hack.so
 spectrwm
 tags
+*~
+osx/spectrwm.c
+osx/tree.h
+osx/swm_hack.c
+osx/swm_hack.so
+osx/libswmhack.so.0.0

diff --git a/osx/Makefile b/osx/Makefile
index 17f3054657a883a6ceeb7dc8aba76b1c0e0ea0d8..e3924eb34f4e4992055b2032faf514713a0a4aa2 100644 (file)
--- a/osx/Makefile
+++ b/osx/Makefile
@@ -1,6 +1,8 @@
-CFLAGS+= -O2 -Wall -g -D_GNU_SOURCE -D__OSX__ -I. -I..
+INCFLAGS+= -I/opt/local/include/freetype2 -I/opt/local/include
+CFLAGS+= -O2 -Wall -g -D_GNU_SOURCE -D__OSX__ -I. -I.. ${INCFLAGS}
 CFLAGS+= -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\"
-LDADD+=  -L/usr/X11/lib/ -lX11 -lXrandr -lXtst -lXcursor
+LDADD+=  -L/opt/local/lib -lX11 -lXcursor -lXft
+LDADD+=  -lxcb-keysyms -lxcb-util -lxcb-randr -lX11-xcb -lxcb-xtest -lxcb -lxcb-icccm
 
 PREFIX?= /usr/local
 BINDIR?= $(PREFIX)/bin
@@ -14,6 +16,7 @@ LVERS= $(shell . ../lib/shlib_version; echo $$major.$$minor)
 all: spectrwm libswmhack.so.$(LVERS)
 
 spectrwm.c:
+       ln -sf ../linux/tree.h
        ln -sf ../spectrwm.c
 
 swm_hack.c:
@@ -44,6 +47,6 @@ install: all
        ln -sf $(DESTDIR)$(BINDIR)/spectrwm $(DESTDIR)$(BINDIR)/scrotwm
 
 clean:
-       rm -f spectrwm *.o *.so libswmhack.so.* spectrwm.c swm_hack.c
+       rm -f spectrwm *.o *.so libswmhack.so.* spectrwm.c swm_hack.c tree.h
 
 .PHONY: all install clean