diff options
| author | P. J. McDermott <pjm@nac.net> | 2013-11-02 17:01:23 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2013-11-02 17:01:23 (EDT) |
| commit | 25b1171953ef78b60d4ec82b1788cf0facfaa7df (patch) | |
| tree | fb201aac05b33e9e9df505fcf37d3921f00062ee | |
| parent | 09c56d09c53fd27d08f90c5c059896b450bab5d5 (diff) | |
| download | overworld-rpg-25b1171953ef78b60d4ec82b1788cf0facfaa7df.zip overworld-rpg-25b1171953ef78b60d4ec82b1788cf0facfaa7df.tar.gz overworld-rpg-25b1171953ef78b60d4ec82b1788cf0facfaa7df.tar.bz2 | |
Use sdlex_CPPFLAGS.
This is instead of AM_CPPFLAGS and sdlex_CFLAGS.
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | data/maps/local.mk | 2 | ||||
| -rw-r--r-- | data/tilesets/local.mk | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index e263ead..0bdb8da 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,11 @@ bin_PROGRAMS = sdlex -AM_CPPFLAGS = - include $(top_srcdir)/src/local.mk include $(top_srcdir)/data/local.mk sdlex_SOURCES = $(src_SOURCES) -sdlex_CFLAGS = $(GCC_CFLAGS) \ +sdlex_CPPFLAGS = $(GCC_CFLAGS) \ $(SDL_CFLAGS) \ $(SDL_IMAGE_CFLAGS) \ $(ZLIB_CFLAGS) \ diff --git a/data/maps/local.mk b/data/maps/local.mk index b86328a..19070a4 100644 --- a/data/maps/local.mk +++ b/data/maps/local.mk @@ -1,6 +1,6 @@ mapsdir = $(pkgdatadir)/maps -AM_CPPFLAGS += -DMAPSDIR=\"$(mapsdir)\" +sdlex_CPPFLAGS += -DMAPSDIR=\"$(mapsdir)\" dist_maps_DATA = \ data/maps/forest1-8bit.tmx \ diff --git a/data/tilesets/local.mk b/data/tilesets/local.mk index e2c4b13..4bda5d2 100644 --- a/data/tilesets/local.mk +++ b/data/tilesets/local.mk @@ -4,7 +4,7 @@ tilesets_sources = \ tilesetsdir = $(pkgdatadir)/tilesets -AM_CPPFLAGS += -DTILESETSDIR=\"$(tilesetsdir)\" +sdlex_CPPFLAGS += -DTILESETSDIR=\"$(tilesetsdir)\" tilesets_DATA = \ data/tilesets/collision.png \ |