diff options
author | Steven Noonan <steven@uplinklabs.net> | 2009-10-17 06:39:18 -0700 |
---|---|---|
committer | Steven Noonan <steven@uplinklabs.net> | 2009-10-17 06:39:18 -0700 |
commit | ea55eb44115700d36c32aea64aa3f08f80af7250 (patch) | |
tree | 7252533bd5d9a3788342ed37b1f95fd8111cfd3d /crawl-ref/source/contrib | |
parent | 58889ea3d4d442940d5e76e5e039451f8f4a642c (diff) | |
download | crawl-ref-ea55eb44115700d36c32aea64aa3f08f80af7250.tar.gz crawl-ref-ea55eb44115700d36c32aea64aa3f08f80af7250.zip |
contrib/Makefile: pay attention to CONFIGURE_FLAGS variable
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Diffstat (limited to 'crawl-ref/source/contrib')
-rw-r--r-- | crawl-ref/source/contrib/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/contrib/Makefile b/crawl-ref/source/contrib/Makefile index 42cbc4b81c..f836f8e2e0 100644 --- a/crawl-ref/source/contrib/Makefile +++ b/crawl-ref/source/contrib/Makefile @@ -34,7 +34,7 @@ endif # FreeType 2 # freetype/objs/.libs/libfreetype.a: $(PREFIX)/lib/libz.a - cd freetype && ./configure --prefix=$(PREFIX) --with-zlib=$(PREFIX) --enable-static --disable-shared + cd freetype && ./configure --prefix=$(PREFIX) --with-zlib=$(PREFIX) --enable-static --disable-shared $(CONFIGURE_FLAGS) @+$(MAKE) -C freetype $(PREFIX)/lib/libfreetype.a: freetype/objs/.libs/libfreetype.a @@ -83,7 +83,7 @@ pcre: $(PREFIX)/lib/libpcre.a # libpng # libpng/.libs/libpng.a: $(PREFIX)/lib/libz.a - cd libpng && ./configure --prefix=$(PREFIX) --enable-static --disable-shared LDFLAGS="-L$(PREFIX)/lib" + cd libpng && ./configure --prefix=$(PREFIX) --enable-static --disable-shared $(CONFIGURE_FLAGS) CPPFLAGS="-I$(PREFIX)/include" LDFLAGS="-L$(PREFIX)/lib" @+$(MAKE) -C libpng $(PREFIX)/lib/libpng.a: libpng/.libs/libpng.a @@ -116,7 +116,7 @@ sdl: $(PREFIX)/lib/libSDL.a # SDL_image # sdl-image/.libs/libSDL_image.a: $(PREFIX)/lib/libpng.a - cd sdl-image && ./configure --prefix=$(PREFIX) --with-sdl-prefix=$(PREFIX) --enable-static --disable-shared --enable-bmp --enable-png LDFLAGS="-L$(PREFIX)/lib -lpng -lz" CPPFLAGS="-I$(PREFIX)/include" + cd sdl-image && ./configure --prefix=$(PREFIX) --with-sdl-prefix=$(PREFIX) --enable-static --disable-shared --enable-bmp --enable-png $(CONFIGURE_FLAGS) LDFLAGS="-L$(PREFIX)/lib -lpng -lz" CPPFLAGS="-I$(PREFIX)/include" @+$(MAKE) -C sdl-image $(PREFIX)/lib/libSDL_image.a: sdl-image/.libs/libSDL_image.a |