diff options
| author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-07 14:47:37 +0000 |
|---|---|---|
| committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-07 14:47:37 +0000 |
| commit | 5e5527fe24cb8ee50cafa6f3c5c15f23fd262323 (patch) | |
| tree | 0596b8818c87aa0ec8584e0435862cc34536bfd5 /crawl-ref/source/makefile.x11 | |
| parent | f051683f544f26da598a14007a8a1739226a2e5a (diff) | |
| download | crawl-ref-5e5527fe24cb8ee50cafa6f3c5c15f23fd262323.tar.gz crawl-ref-5e5527fe24cb8ee50cafa6f3c5c15f23fd262323.zip | |
Adding OSX support to X11 tiles makefile. Currently enabled via OSX=y. It assumes that libpng was installed via fink in /sw.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5537 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/makefile.x11')
| -rw-r--r-- | crawl-ref/source/makefile.x11 | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/crawl-ref/source/makefile.x11 b/crawl-ref/source/makefile.x11 index 4e453f13be..7b2c1714c3 100644 --- a/crawl-ref/source/makefile.x11 +++ b/crawl-ref/source/makefile.x11 @@ -18,6 +18,14 @@ COPY = cp OS_TYPE = UNIX EXTRA_INCLUDES = -DUSE_X11 -DUSE_TILE +ifeq ($(strip $(OSX)),y) +PNG_INCLUDE := -I/sw/include +PNG_LIB := -L/sw/lib +else +PNG_INCLUDE := +PNG_LIB := +endif + # If you have lex and yacc, set DOYACC to y (lowercase y). DOYACC := y @@ -77,9 +85,9 @@ EXTRA_INCLUDES += -I$(SQLSRC) EXTRA_DEPENDS += $(FSQLLIBA) endif -LIB = -L$(LUASRC) -l$(LUALIB) $(LIBDBM) -L/usr/X11R6/lib -lX11 -lpng +LIB = -L$(LUASRC) -l$(LUALIB) $(LIBDBM) -L/usr/X11R6/lib -lX11 -lpng $(PNG_LIB) -INCLUDES := $(INCLUDES) -Iutil -I. -I$(LUASRC) $(EXTRA_INCLUDES) +INCLUDES := $(INCLUDES) -Iutil -I. -I$(LUASRC) $(EXTRA_INCLUDES) $(PNG_INCLUDE) CFWARN := -Wall -Wwrite-strings -Wshadow -pedantic @@ -208,7 +216,7 @@ ORIGTILEFILES = $(TILEFILES:%=$(RLTILES)%) $(ORIGTILEHEADERS): makerltiles makerltiles: - cd $(RLTILES) && make -f makefile.unix all && cd .. + cd $(RLTILES) && make -f makefile.unix all CFLAGS="$(PNG_INCLUDE)" LDFLAGS="$(PNG_LIB)" && cd .. $(TILEHEADERS): $(ORIGTILEHEADERS) cp $(RLTILES)$@ . |