diff options
| author | Steven Noonan <steven@uplinklabs.net> | 2009-10-11 03:14:27 -0700 |
|---|---|---|
| committer | Steven Noonan <steven@uplinklabs.net> | 2009-10-11 03:14:27 -0700 |
| commit | 0b0dc470a45ae9ec24cba3e991f5f0023a3335fd (patch) | |
| tree | 5eb5c39bd6c3ba5fdeac6c35dc0a3ae5614866f2 /crawl-ref/source/makefile | |
| parent | 81bf1fb4e599df83978df40bd711f0d7c782ebe3 (diff) | |
| download | crawl-ref-0b0dc470a45ae9ec24cba3e991f5f0023a3335fd.tar.gz crawl-ref-0b0dc470a45ae9ec24cba3e991f5f0023a3335fd.zip | |
makefile: split EXTRA_FLAGS into two variables, with macros in DEFINES
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Diffstat (limited to 'crawl-ref/source/makefile')
| -rw-r--r-- | crawl-ref/source/makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile index 14549fbe7d..b4fa07c4fa 100644 --- a/crawl-ref/source/makefile +++ b/crawl-ref/source/makefile @@ -174,7 +174,7 @@ ifneq ($(TILES),n) RLTILES = rltiles -EXTRA_FLAGS += -DUSE_TILE +DEFINES += -DUSE_TILE INCLUDES += -I$(RLTILES) ifeq ($(OSNAME),MacOS) @@ -188,7 +188,7 @@ LIB += -framework OpenGL -framework AppKit # __MACOSX__ is defined. It's not one of Apple's stock markers, # so we define it ourselves here. # -EXTRA_FLAGS += -D__MACOSX__ +DEFINES += -D__MACOSX__ EXTRA_OBJECTS += SDLMain.o @@ -283,7 +283,7 @@ endif # pkg-config LIB += $(PNG_LDFLAGS) $(FREETYPE_LDFLAGS) $(SDL_LDFLAGS) -lSDL_image LIB += -lGL -lGLU -EXTRA_FLAGS += $(PNG_CFLAGS) $(FREETYPE_CFLAGS) $(SDL_CFLAGS) +DEFINES += $(PNG_CFLAGS) $(FREETYPE_CFLAGS) $(SDL_CFLAGS) INCLUDES += $(PNG_INCLUDE) $(FREETYPE_INCLUDE) $(SDL_INCLUDE) endif # MacOS @@ -292,7 +292,7 @@ endif # TILES CFWARN := -Wall -Wno-parentheses -Wwrite-strings -Wshadow -pedantic -CFOTHERS = -fno-strict-aliasing -fsigned-char $(EXTRA_FLAGS) -DCLUA_BINDINGS -pipe $(SDL_CFLAGS) +CFOTHERS = -fno-strict-aliasing -fsigned-char $(EXTRA_FLAGS) $(DEFINES) -DCLUA_BINDINGS -pipe $(SDL_CFLAGS) # # Figure out the build settings for this type of build @@ -333,13 +333,13 @@ OPTIMIZE=y endif ifeq ($(FULLDEBUG),y) -EXTRA_FLAGS += -DFULLDEBUG +DEFINES += -DFULLDEBUG endif ifeq ($(DEBUG),y) EXTRA_FLAGS += -ggdb endif ifeq ($(WIZARD),y) -EXTRA_FLAGS += -DWIZARD +DEFINES += -DWIZARD endif ifeq ($(OPTIMIZE),y) CFOPTIMIZE := -O2 @@ -496,7 +496,7 @@ else depend: $(DEPENDENCY_MKF) %.dep: $(OBJECTS:.o=.cc) - $(QUIET_DEPEND)fastdep $(EXTRA_FLAGS) $(INCLUDES) *.h $(OBJECTS:.o=.cc) > $@ + $(QUIET_DEPEND)fastdep $(DEFINES) $(INCLUDES) *.h $(OBJECTS:.o=.cc) > $@ endif -include $(DEPENDENCY_MKF) |