diff options
Diffstat (limited to 'crawl-ref/source/rltiles/makefile.unix')
| -rw-r--r-- | crawl-ref/source/rltiles/makefile.unix | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/crawl-ref/source/rltiles/makefile.unix b/crawl-ref/source/rltiles/makefile.unix index 721c467410..715b06ed14 100644 --- a/crawl-ref/source/rltiles/makefile.unix +++ b/crawl-ref/source/rltiles/makefile.unix @@ -2,13 +2,8 @@ SDL_CFLAGS := $(shell sdl-config --cflags) SDL_LDFLAGS := $(shell sdl-config --libs) -ifeq ($(strip $(OSX)),y) -PNG_INCLUDE := -I/sw/include -PNG_LIB := -L/sw/lib -else -PNG_INCLUDE := -PNG_LIB := -endif +PNG_INCLUDE := $(shell pkg-config libpng --cflags) +PNG_LIB := $(shell pkg-config libpng --libs) CFLAGS := $(SDL_CFLAGS) $(PNG_INCLUDE) LDFLAGS := $(SDL_LDFLAGS) $(PNGLIB) -lSDL_image -lpng @@ -25,21 +20,30 @@ HEADERS := $(INPUTS:%=tiledef-%.h) SOURCE := $(INPUTS:%=tiledef-%.cc) IMAGES := $(INPUTS:%=%.png) +ifneq ($(findstring $(MAKEFLAGS),s),s) +ifndef V + QUIET_CXX = @echo ' ' CXX $@; + QUIET_GEN = @echo ' ' GEN $*; + QUIET_LINK = @echo ' ' LINK $@; + export V +endif +endif + BASE_OBJECTS := tile_colour.o tile.o tile_page.o tile_list_processor.o main.o OBJECTS := $(BASE_OBJECTS:%=$(TOOLDIR)/%) all: $(TILEGEN) $(HEADERS) $(SOURCE) $(IMAGES) tiledef-%.h tiledef-%.cc %.png: dc-%.txt $(TILEGEN) - $(TILEGEN) $< + $(QUIET_GEN)$(TILEGEN) $< clean: $(DELETE) $(HEADERS) $(OBJECTS) $(TILEGEN) $(SOURCE) $(IMAGES) distclean: clean -.cc.o: - ${CXX} ${CFLAGS} -c $< -o $@ +%.o: %.cc + $(QUIET_CXX)$(CXX) $(CFLAGS) -c $< -o $@ $(TILEGEN): $(OBJECTS) - ${CXX} ${LDFLAGS} $(OBJECTS) -o $@ + $(QUIET_LINK)$(CXX) $(LDFLAGS) $(OBJECTS) -o $@ |