Mercurial > hg > dmlib
changeset 1156:622a469932b1
Change direct assignments to ?=, so that those Makefile variables can be
overridden.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Thu, 05 Mar 2015 06:12:06 +0200 |
| parents | d46966ad3b08 |
| children | e13269e17422 |
| files | Makefile Makefile.cross-mingw |
| diffstat | 2 files changed, 25 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Thu Mar 05 05:25:45 2015 +0200 +++ b/Makefile Thu Mar 05 06:12:06 2015 +0200 @@ -4,25 +4,24 @@ DMLIB ?= ./ BINPATH ?= ./ OBJPATH ?= ./obj/unix/ -EXEEXT ?= PREFIX ?= /usr/local INSTALL ?= install RANLIB ?= ranlib -SDL_CFLAGS=`pkg-config --cflags sdl` -SDL_LDFLAGS=`pkg-config --libs sdl` +SDL_CFLAGS ?= `pkg-config --cflags sdl` +SDL_LDFLAGS ?= `pkg-config --libs sdl` -SDL_TTF_CFLAGS=`pkg-config --cflags SDL_ttf` -SDL_TTF_LDFLAGS=`pkg-config --libs SDL_ttf` +SDL_TTF_CFLAGS ?= `pkg-config --cflags SDL_ttf` +SDL_TTF_LDFLAGS ?= `pkg-config --libs SDL_ttf` -TREMOR_CFLAGS=`pkg-config --cflags ogg` -TREMOR_LDFLAGS=/usr/lib/libvorbisidec.a `pkg-config --variable=libdir ogg`/libogg.a +TREMOR_CFLAGS ?= `pkg-config --cflags ogg` +TREMOR_LDFLAGS ?= /usr/lib/libvorbisidec.a `pkg-config --variable=libdir ogg`/libogg.a -LIBPNG_CFLAGS=`pkg-config --cflags libpng` -LIBPNG_LDFLAGS=`pkg-config --libs libpng` +LIBPNG_CFLAGS ?= `pkg-config --cflags libpng` +LIBPNG_LDFLAGS ?= `pkg-config --libs libpng` -ZLIB_CFLAGS=`pkg-config --cflags zlib` -ZLIB_LDFLAGS=`pkg-config --libs zlib` +ZLIB_CFLAGS ?= `pkg-config --cflags zlib` +ZLIB_LDFLAGS ?= `pkg-config --libs zlib` include $(DMLIB)Makefile.gen
--- a/Makefile.cross-mingw Thu Mar 05 05:25:45 2015 +0200 +++ b/Makefile.cross-mingw Thu Mar 05 06:12:06 2015 +0200 @@ -9,26 +9,26 @@ BINPATH ?= ./exe/ OBJPATH ?= ./obj/win32/ EXEEXT ?= .exe -CC=$(MINGW_PREFIX)gcc -AR=$(MINGW_PREFIX)ar -RANLIB=$(MINGW_PREFIX)ranlib -RM=rm +CC ?= $(MINGW_PREFIX)gcc +AR ?= $(MINGW_PREFIX)ar +RANLIB ?= $(MINGW_PREFIX)ranlib +RM ?= rm -SDL_CFLAGS=`$(MINGW_PATH)/bin/sdl-config --cflags` -SDL_LDFLAGS=`$(MINGW_PATH)/bin/sdl-config --libs` +SDL_CFLAGS ?= `$(MINGW_PATH)/bin/sdl-config --cflags` +SDL_LDFLAGS ?= `$(MINGW_PATH)/bin/sdl-config --libs` -SDL_TTF_CFLAGS= -SDL_TTF_LDFLAGS=-lSDL_ttf +SDL_TTF_CFLAGS ?= +SDL_TTF_LDFLAGS ?= -lSDL_ttf -TREMOR_CFLAGS=-I$(MINGW_PATH)/include/tremor -TREMOR_LDFLAGS=$(MINGW_PATH)/lib/libvorbisidec.a $(MINGW_PATH)/lib/libogg.a +TREMOR_CFLAGS ?= -I$(MINGW_PATH)/include/tremor +TREMOR_LDFLAGS ?= $(MINGW_PATH)/lib/libvorbisidec.a $(MINGW_PATH)/lib/libogg.a -LIBPNG_CFLAGS=-I$(MINGW_PATH)/include -LIBPNG_LDFLAGS=$(MINGW_PATH)/lib/libpng.a +LIBPNG_CFLAGS ?= -I$(MINGW_PATH)/include +LIBPNG_LDFLAGS ?= $(MINGW_PATH)/lib/libpng.a -ZLIB_CFLAGS= -ZLIB_LDFLAGS=$(MINGW_PATH)/lib/libz.a +ZLIB_CFLAGS ?= +ZLIB_LDFLAGS ?= $(MINGW_PATH)/lib/libz.a -TOOL_LDFLAGS=-lmingw32 -lSDLmain -lSDL -mconsole +TOOL_LDFLAGS ?= -lmingw32 -lSDLmain -lSDL -mconsole include $(DMLIB)Makefile.gen