summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-08-22 23:12:50 +0300
committerAndrei Karas <akaras@inbox.ru>2013-08-24 21:08:15 +0300
commitae63e2860fe413649090bcaa4fb5cd322c6f852a (patch)
treecf75d76d133622d9eb693de0c1470b5d7730049b
parent5e4fcb8a6036746ec1b500297fa55989a80094b4 (diff)
downloadmv-ae63e2860fe413649090bcaa4fb5cd322c6f852a.tar.gz
mv-ae63e2860fe413649090bcaa4fb5cd322c6f852a.tar.bz2
mv-ae63e2860fe413649090bcaa4fb5cd322c6f852a.tar.xz
mv-ae63e2860fe413649090bcaa4fb5cd322c6f852a.zip
fix USE_OPENGL define
-rwxr-xr-xconfigure.ac2
-rw-r--r--src/Makefile.am4
2 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 756160ce8..6b4230491 100755
--- a/configure.ac
+++ b/configure.ac
@@ -203,8 +203,8 @@ else
else
LDFLAGS="$LDFLAGS -framework OpenGL"
fi
- AC_DEFINE(USE_OPENGL, 1, [Defines if ManaPlus should have OpenGL support])
fi
+AM_CONDITIONAL(USE_OPENGL, test x$with_opengl = xyes)
# Option to enable internal guichan
AC_ARG_WITH(internalguichan,[ --without-internalguichan don't use internal guichan ] )
diff --git a/src/Makefile.am b/src/Makefile.am
index be3bea2ee..c9487040d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,6 +10,10 @@ if ENABLE_PORTABLE
manaplus_CXXFLAGS += -DENABLE_PORTABLE
endif
+if USE_OPENGL
+manaplus_CXXFLAGS += -DUSE_OPENGL
+endif
+
if ENABLE_MEM_DEBUG
manaplus_CXXFLAGS += -DENABLE_MEM_DEBUG -DDEBUG_DUMP_LEAKS