diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2011-12-14 20:14:32 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2011-12-14 22:10:06 +0100 |
| commit | 74e48517d3c44a7684c38d71b64d1f1397f59d48 (patch) | |
| tree | 6413bbd08162291ba5e04447cf5f5000ed939793 /crawl-ref/source/rltiles/Makefile | |
| parent | e7bee85ce1ee7aa248652ca0edae84e4fe2243c4 (diff) | |
| download | crawl-ref-74e48517d3c44a7684c38d71b64d1f1397f59d48.tar.gz crawl-ref-74e48517d3c44a7684c38d71b64d1f1397f59d48.zip | |
Allow running the rltile tool with no #define USE_TILE.
In this case, it will produce enums but no images, avoiding a dependency on
SDL. Since production of images is very deeply intertwined with rest of
processing, this change is a nasty hack all around, having it process 0x0
dummy images all over. Doesn't seem to explode, though.
Diffstat (limited to 'crawl-ref/source/rltiles/Makefile')
| -rw-r--r-- | crawl-ref/source/rltiles/Makefile | 49 |
1 files changed, 29 insertions, 20 deletions
diff --git a/crawl-ref/source/rltiles/Makefile b/crawl-ref/source/rltiles/Makefile index 1e7ea74c6d..b11cce511b 100644 --- a/crawl-ref/source/rltiles/Makefile +++ b/crawl-ref/source/rltiles/Makefile @@ -10,27 +10,33 @@ endif # Also, cross-compilation with no system libraries for host rather than target # is not supported. If host=target, contribs are enough. -ifndef CONTRIB_SDL -SDL_CFLAGS := $(shell sdl-config --cflags 2> /dev/null || echo "-I../contrib/install/$(ARCH)/include/SDL") -SDL_LDFLAGS := $(shell sdl-config --libs 2> /dev/null && echo "-lSDL_image" || echo "../contrib/install/$(ARCH)/lib/libSDL.a ../contrib/install/$(ARCH)/lib/libSDLmain.a ../contrib/install/$(ARCH)/lib/libSDL_image.a") -else -SDL_CFLAGS := -I../contrib/install/$(ARCH)/include/SDL -SDL_LDFLAGS := ../contrib/install/$(ARCH)/lib/libSDL.a ../contrib/install/$(ARCH)/lib/libSDLmain.a ../contrib/install/$(ARCH)/lib/libSDL_image.a +CFLAGS := -O2 -g + +ifdef TILES + ifndef CONTRIB_SDL + SDL_CFLAGS := $(shell sdl-config --cflags 2> /dev/null || echo "-I../contrib/install/$(ARCH)/include/SDL") + SDL_LDFLAGS := $(shell sdl-config --libs 2> /dev/null && echo "-lSDL_image" || echo "../contrib/install/$(ARCH)/lib/libSDL.a ../contrib/install/$(ARCH)/lib/libSDLmain.a ../contrib/install/$(ARCH)/lib/libSDL_image.a") + else + SDL_CFLAGS := -I../contrib/install/$(ARCH)/include/SDL + SDL_LDFLAGS := ../contrib/install/$(ARCH)/lib/libSDL.a ../contrib/install/$(ARCH)/lib/libSDLmain.a ../contrib/install/$(ARCH)/lib/libSDL_image.a + endif + + ifndef NO_PKGCONFIG + PNG_INCLUDE := $(shell pkg-config libpng --cflags 2> /dev/null || echo "-I../contrib/install/$(ARCH)/include") + PNG_LIB := $(shell pkg-config libpng --libs 2> /dev/null || echo "../contrib/install/$(ARCH)/lib/libpng.a ../contrib/install/$(ARCH)/lib/libz.a") + else + PNG_INCLUDE := -I../contrib/install/$(ARCH)/include + PNG_LIB := ../contrib/install/$(ARCH)/lib/libpng.a ../contrib/install/$(ARCH)/lib/libz.a + endif + + CFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE) + LDFLAGS += $(SDL_LDFLAGS) $(PNG_LIB) + + CFLAGS += -DUSE_TILE endif -ifndef NO_PKGCONFIG -PNG_INCLUDE := $(shell pkg-config libpng --cflags 2> /dev/null || echo "-I../contrib/install/$(ARCH)/include") -PNG_LIB := $(shell pkg-config libpng --libs 2> /dev/null || echo "../contrib/install/$(ARCH)/lib/libpng.a ../contrib/install/$(ARCH)/lib/libz.a") -else -PNG_INCLUDE := -I../contrib/install/$(ARCH)/include -PNG_LIB := ../contrib/install/$(ARCH)/lib/libpng.a ../contrib/install/$(ARCH)/lib/libz.a -endif - -CFLAGS := -O2 $(SDL_CFLAGS) $(PNG_INCLUDE) -LDFLAGS += $(SDL_LDFLAGS) $(PNG_LIB) - ifdef DEBUG -CFLAGS += -DDEBUG -ggdb +CFLAGS += -O0 -DDEBUG -ggdb endif ifneq (,$(findstring MINGW,$(uname_S))) @@ -85,9 +91,12 @@ endif OBJECTS := $(BASE_OBJECTS:%=$(TOOLDIR)/%) -all: $(TILEGEN) $(HEADERS) $(SOURCE) $(IMAGES) $(JAVASCRIPT) +all: $(TILEGEN) $(HEADERS) $(SOURCE) $(JAVASCRIPT) +ifdef TILES +all: $(IMAGES) +endif -%.png tiledef-%.h tiledef-%.cc tileinfo-%.js: dc-%.txt | $(TILEGEN) +%.png tiledef-%.h tiledef-%.cc tileinfo-%.js: dc-%.txt $(TILEGEN) $(QUIET_GEN)$(TILEGEN) $< # CFLAGS difference check |