X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=osx%2FMakefile;h=370b44385146a1e77abd6ed42eb6972f2f6e12a9;hb=af0542e5036b997c69ac2758286ebcb43d7ac74a;hp=db7d3d9a0f0d7538a256549375bec20a37ec1e68;hpb=d8a7afac8a15aaf0796162ac2d949552e3ca035c;p=spectrwm.git

diff --git a/osx/Makefile b/osx/Makefile
index db7d3d9..370b443 100644
--- a/osx/Makefile
+++ b/osx/Makefile
@@ -1,27 +1,31 @@
-# To use homebrew instead of macports, uncomment the following three lines.
+PREFIX?= /usr/local
+BINDIR?= $(PREFIX)/bin
+LIBDIR?= $(PREFIX)/lib
+MANDIR?= $(PREFIX)/share/man
+
+# To use xquartz, uncomment the following three lines.
+INCFLAGS+= -I/opt/X11/include -I/opt/X11/include/freetype2/
+LDADD+=  -L/opt/X11/lib -lX11 -lXcursor -lXft
+
+# To use homebrew, uncomment the following three lines.
 #INCFLAGS+= -I/opt/X11/include
 #LDADD+=  -lX11 -lXcursor -lXft -L/opt/X11/lib
-#INCFLAGS+= -I/usr/local/Cellar/freetype/2.4.10/include/freetype2
+#INCFLAGS+= -I/usr/local/Cellar/freetype/2.5.0.1/include/freetype2
 
-# To use homebrew instead of macports, comment out the following two lines.
-INCFLAGS+= -I/opt/local/include/freetype2 -I/opt/local/include
-LDADD+=  -L/opt/local/lib -lX11 -lXcursor -lXft
+# To use homebrew , comment out the following two lines.
+#INCFLAGS+= -I/opt/local/include/freetype2 -I/opt/local/include
+#LDADD+=  -L/opt/local/lib -lX11 -lXcursor -lXft
 
 LDADD+=  -lxcb-keysyms -lxcb-util -lxcb-randr -lX11-xcb -lxcb-xtest -lxcb -lxcb-icccm
 
+LVERS= $(shell . ../lib/shlib_version; echo $$major.$$minor)
+
 CFLAGS+= -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g
 CFLAGS+= -O2 -D_GNU_SOURCE -D__OSX__ -I. -I.. ${INCFLAGS}
 CFLAGS+= -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\"
 
-PREFIX?= /usr/local
-BINDIR?= $(PREFIX)/bin
-LIBDIR?= $(PREFIX)/lib
-MANDIR?= $(PREFIX)/share/man
-
 CC?= cc
 
-LVERS= $(shell . ../lib/shlib_version; echo $$major.$$minor)
-
 all: spectrwm libswmhack.so.$(LVERS)
 
 spectrwm.c: