summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-08-29 15:32:45 +0300
committerAndrei Karas <akaras@inbox.ru>2013-08-29 15:32:45 +0300
commitd8e7f47c19fbfd598ba5da6c31369e6ff1aefc8e (patch)
tree04a921a8f7fac65bf331c8a434394bce96fb0bcd
parent7dff88ae9de70454e792bf90679948eb174b1aee (diff)
downloadmv-d8e7f47c19fbfd598ba5da6c31369e6ff1aefc8e.tar.gz
mv-d8e7f47c19fbfd598ba5da6c31369e6ff1aefc8e.tar.bz2
mv-d8e7f47c19fbfd598ba5da6c31369e6ff1aefc8e.tar.xz
mv-d8e7f47c19fbfd598ba5da6c31369e6ff1aefc8e.zip
fix includes dirs if build was run not from top directory.
-rwxr-xr-xconfigure.ac4
-rw-r--r--src/Makefile.am6
2 files changed, 3 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 6b4230491..e8f86e48e 100755
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,6 @@ if test "x$with_sdl2" == "xyes"; then
# AC_CHECK_HEADERS(SDL_rotozoom.h, ,)
# using embedded sdl2gfx
- CPPFLAGS="$CPPFLAGS -I./sdl2gfx"
AC_CHECK_LIB(SDL2_net, SDLNet_Init, ,
AC_MSG_ERROR([ *** Unable to find SDL2_net library]))
@@ -224,9 +223,6 @@ if test "x$with_internalguichan" == "xno"; then
else
with_internalguichan=yes
-
- CPPFLAGS="$CPPFLAGS -I./guichan/include"
-
AC_DEFINE(USE_INTERNALGUICHAN, 1, [Defines if ManaPlus should use internal guichan classes])
fi
AM_CONDITIONAL(USE_INTERNALGUICHAN, test x$with_internalguichan = xyes)
diff --git a/src/Makefile.am b/src/Makefile.am
index a886be801..8606995be 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,13 +30,13 @@ manaplus_CXXFLAGS += -DUSE_MUMBLE
endif
if USE_SDL2
-manaplus_CXXFLAGS += -DUSE_SDL2
+manaplus_CXXFLAGS += -I$(srcdir)/sdl2gfx -DUSE_SDL2
manaplus_SOURCES += sdl2gfx/SDL_framerate.c \
sdl2gfx/SDL_framerate.h
endif
if USE_INTERNALGUICHAN
-manaplus_CXXFLAGS += -DUSE_INTERNALGUICHAN
+manaplus_CXXFLAGS += -I$(srcdir)/guichan/include -DUSE_INTERNALGUICHAN
manaplus_SOURCES += guichan/include/guichan/actionevent.hpp \
guichan/include/guichan/actionlistener.hpp \
guichan/include/guichan/basiccontainer.hpp \
@@ -902,4 +902,4 @@ EXTRA_DIST = CMakeLists.txt \
SDLMain.m
# set the include path found by configure
-INCLUDES = $(all_includes)
+AM_CPPFLAGS = $(all_includes)