diff options
| author | Steven Noonan <steven@uplinklabs.net> | 2009-10-16 10:35:31 -0700 |
|---|---|---|
| committer | Steven Noonan <steven@uplinklabs.net> | 2009-10-16 11:34:08 -0700 |
| commit | 67daccbb0e957159e2d411e95f652440cf612807 (patch) | |
| tree | 544ec87ca6833f4888d6181b742c3544da11e9a9 | |
| parent | 1241f456b2eda5565e9a5d45faf0ae692539defe (diff) | |
| download | crawl-ref-67daccbb0e957159e2d411e95f652440cf612807.tar.gz crawl-ref-67daccbb0e957159e2d411e95f652440cf612807.zip | |
rltiles: fix MinGW build
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
| -rw-r--r-- | crawl-ref/source/rltiles/makefile.unix | 6 | ||||
| -rw-r--r-- | crawl-ref/source/rltiles/tool/main.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/rltiles/tool/tile_convert.cc | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/crawl-ref/source/rltiles/makefile.unix b/crawl-ref/source/rltiles/makefile.unix index 7db3c36823..cc5f63bbe8 100644 --- a/crawl-ref/source/rltiles/makefile.unix +++ b/crawl-ref/source/rltiles/makefile.unix @@ -20,17 +20,17 @@ else SDLCONFIG := $(shell which sdl-config 2> /dev/null) ifeq ($(SDLCONFIG),) -SDLCONFIG := $(shell pwd)/contrib/install/bin/sdl-config +SDLCONFIG := $(shell pwd)/../contrib/install/bin/sdl-config endif SDL_CFLAGS := $(shell $(SDLCONFIG) --cflags 2> /dev/null) SDL_LDFLAGS := $(shell $(SDLCONFIG) --libs 2> /dev/null) PNG_INCLUDE := $(shell pkg-config libpng --cflags 2> /dev/null) -PNG_LIB := $(shell pkg-config libpng --libs 2> /dev/null) +PNG_LIB := $(shell pkg-config libpng --libs 2> /dev/null || echo "-lpng -lz") CFLAGS := -I../contrib/install/include $(SDL_CFLAGS) $(PNG_INCLUDE) -LDFLAGS := -L../contrib/install/lib $(SDL_LDFLAGS) -lSDL_image $(PNG_LIB) -lz +LDFLAGS := -L../contrib/install/lib $(SDL_LDFLAGS) -lSDL_image $(PNG_LIB) endif diff --git a/crawl-ref/source/rltiles/tool/main.cc b/crawl-ref/source/rltiles/tool/main.cc index c94e2d17a2..cf3966d30d 100644 --- a/crawl-ref/source/rltiles/tool/main.cc +++ b/crawl-ref/source/rltiles/tool/main.cc @@ -1,6 +1,8 @@ #include <stdio.h> #include "tile_list_processor.h" +#include <SDL_main.h> + int main(int argc, char **argv) { if (argc != 2) diff --git a/crawl-ref/source/rltiles/tool/tile_convert.cc b/crawl-ref/source/rltiles/tool/tile_convert.cc index aa337fc5cb..0134b67654 100644 --- a/crawl-ref/source/rltiles/tool/tile_convert.cc +++ b/crawl-ref/source/rltiles/tool/tile_convert.cc @@ -5,6 +5,7 @@ // to transparent PNGs. #include "tile.h" +#include <SDL_main.h> int main(int argc, char **argv) { |