diff --git a/configure.ac b/configure.ac index 30a7f3d..d3617dc 100644 --- a/configure.ac +++ b/configure.ac @@ -301,6 +301,12 @@ if test "x$enable_static" = "xyes" ; then PKG_CHECK_MODULES([FREETYPE], [freetype2]) fi +PKG_CHECK_MODULES([GLee], [glee >= 5.4.0], [system_glee=true], [system_glee=false]) +AM_CONDITIONAL([SYSTEM_GLEE], [test x$system_glee = xtrue]) +if test x$system_glee = xfalse ; then + AC_MSG_NOTICE([Using integrated GLee]) + AC_SUBST([GLee_CFLAGS], ['-I$(top_srcdir)/lib/ivis_opengl']) +fi # Checks for libraries: diff --git a/lib/ivis_opengl/Makefile.am b/lib/ivis_opengl/Makefile.am index 471c1fb..b52dc3f 100644 --- a/lib/ivis_opengl/Makefile.am +++ b/lib/ivis_opengl/Makefile.am @@ -8,7 +8,6 @@ noinst_HEADERS = \ screen.h libivis_opengl_a_SOURCES = \ - GLee.c \ ivi.c \ pieblitfunc.c \ piedraw.c \ @@ -22,5 +21,9 @@ libivis_opengl_a_SOURCES = \ tex.c \ textdraw.c +if !SYSTEM_GLEE +libivis_opengl_a_SOURCES += GLee.c +endif + libivis_opengl_a_LIBADD = $(top_builddir)/lib/ivis_common/libivis_common.a \ $(top_builddir)/lib/framework/libframework.a diff --git a/lib/ivis_opengl/pieblitfunc.c b/lib/ivis_opengl/pieblitfunc.c index 59691f4..100f32a 100644 --- a/lib/ivis_opengl/pieblitfunc.c +++ b/lib/ivis_opengl/pieblitfunc.c @@ -26,7 +26,7 @@ */ /***************************************************************************/ -#include "lib/ivis_opengl/GLee.h" +#include #include "lib/framework/frame.h" #include diff --git a/lib/ivis_opengl/piedraw.c b/lib/ivis_opengl/piedraw.c index 8cff803..228634e 100644 --- a/lib/ivis_opengl/piedraw.c +++ b/lib/ivis_opengl/piedraw.c @@ -21,7 +21,7 @@ * Render routines for 3D coloured and shaded transparency rendering. */ -#include "lib/ivis_opengl/GLee.h" +#include #include #include diff --git a/lib/ivis_opengl/piefunc.c b/lib/ivis_opengl/piefunc.c index 98f4c80..0dc62d5 100644 --- a/lib/ivis_opengl/piefunc.c +++ b/lib/ivis_opengl/piefunc.c @@ -21,7 +21,7 @@ * Extended render routines for 3D rendering. */ -#include "lib/ivis_opengl/GLee.h" +#include #include "lib/framework/frame.h" #include "lib/framework/frameint.h" diff --git a/lib/ivis_opengl/piematrix.c b/lib/ivis_opengl/piematrix.c index eabb884..56d1990 100644 --- a/lib/ivis_opengl/piematrix.c +++ b/lib/ivis_opengl/piematrix.c @@ -21,7 +21,7 @@ * Matrix manipulation functions. */ -#include "lib/ivis_opengl/GLee.h" +#include #include "lib/framework/frame.h" #include "lib/framework/fixedpoint.h" diff --git a/lib/ivis_opengl/piemode.c b/lib/ivis_opengl/piemode.c index d2713fb..5419015 100644 --- a/lib/ivis_opengl/piemode.c +++ b/lib/ivis_opengl/piemode.c @@ -26,7 +26,7 @@ */ /***************************************************************************/ -#include "lib/ivis_opengl/GLee.h" +#include #include "lib/framework/frame.h" #include diff --git a/lib/ivis_opengl/piestate.c b/lib/ivis_opengl/piestate.c index 5ccb73c..2c11b1a 100644 --- a/lib/ivis_opengl/piestate.c +++ b/lib/ivis_opengl/piestate.c @@ -21,7 +21,7 @@ * Renderer setup and state control routines for 3D rendering. */ -#include "lib/ivis_opengl/GLee.h" +#include #include "lib/framework/frame.h" #include diff --git a/lib/ivis_opengl/screen.c b/lib/ivis_opengl/screen.c index 25222ba..5d81dde 100644 --- a/lib/ivis_opengl/screen.c +++ b/lib/ivis_opengl/screen.c @@ -24,7 +24,7 @@ * */ -#include "lib/ivis_opengl/GLee.h" +#include #include "lib/framework/frame.h" #include "lib/exceptionhandler/dumpinfo.h" diff --git a/lib/ivis_opengl/tex.c b/lib/ivis_opengl/tex.c index 7230e2b..5b97dbb 100644 --- a/lib/ivis_opengl/tex.c +++ b/lib/ivis_opengl/tex.c @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib/ivis_opengl/GLee.h" +#include #include "lib/framework/frame.h" #if defined(WZ_OS_MAC) diff --git a/lib/ivis_opengl/textdraw.c b/lib/ivis_opengl/textdraw.c index 61fd86b..88320aa 100644 --- a/lib/ivis_opengl/textdraw.c +++ b/lib/ivis_opengl/textdraw.c @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib/ivis_opengl/GLee.h" +#include #include "lib/framework/frame.h" #include #include diff --git a/lib/sequence/Makefile.am b/lib/sequence/Makefile.am index 66ad41c..c820990 100644 --- a/lib/sequence/Makefile.am +++ b/lib/sequence/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = $(SDL_CFLAGS) $(THEORA_CFLAGS) $(WZ_CPPFLAGS) +AM_CPPFLAGS = $(SDL_CFLAGS) $(THEORA_CFLAGS) $(WZ_CPPFLAGS) $(GLee_CFLAGS) AM_CFLAGS = $(WZ_CFLAGS) noinst_LIBRARIES = libsequence.a diff --git a/lib/sequence/sequence.c b/lib/sequence/sequence.c index 577a4f0..7635fcf 100644 --- a/lib/sequence/sequence.c +++ b/lib/sequence/sequence.c @@ -55,10 +55,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include "sequence.h" #include "timer.h" #include "lib/framework/math_ext.h" -#include "lib/ivis_opengl/GLee.h" #include "lib/ivis_common/piestate.h" #include "lib/sound/audio.h" #include "lib/sound/openal_error.h" diff --git a/src/Makefile.am b/src/Makefile.am index eb4e42d..f6c8c36 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,7 +8,7 @@ force-linker.cpp: touch $@ -AM_CPPFLAGS = -DYY_NO_INPUT $(SDL_CFLAGS) $(PHYSFS_CFLAGS) $(PNG_CFLAGS) $(OGGVORBIS_CFLAGS) $(OPENAL_CFLAGS) $(OPENGLC_CFLAGS) $(OPENGL_CFLAGS) $(POPT_CFLAGS) $(WZ_CPPFLAGS) +AM_CPPFLAGS = -DYY_NO_INPUT $(SDL_CFLAGS) $(PHYSFS_CFLAGS) $(PNG_CFLAGS) $(OGGVORBIS_CFLAGS) $(OPENAL_CFLAGS) $(OPENGLC_CFLAGS) $(OPENGL_CFLAGS) $(POPT_CFLAGS) $(WZ_CPPFLAGS) $(GLee_CFLAGS) AM_CFLAGS = $(WZ_CFLAGS) AM_LFLAGS = $(FLEX_FLAGS) AM_YFLAGS = -d @@ -296,7 +296,7 @@ warzone2100_LDADD = \ $(top_builddir)/lib/iniparser/libiniparser.a \ $(top_builddir)/lib/exceptionhandler/libexceptionhandler.a -warzone2100_LDADD += $(LTLIBINTL) $(SDL_LIBS) $(PHYSFS_LIBS) $(PNG_LIBS) $(OGGVORBIS_LIBS) $(THEORA_LIBS) $(OPENAL_LIBS) $(OPENGLC_LIBS) $(OPENGL_LIBS) $(POPT_LIBS) $(MOTIF_LIBS) $(X11_LIBS) +warzone2100_LDADD += $(LTLIBINTL) $(SDL_LIBS) $(PHYSFS_LIBS) $(PNG_LIBS) $(OGGVORBIS_LIBS) $(THEORA_LIBS) $(OPENAL_LIBS) $(OPENGLC_LIBS) $(OPENGL_LIBS) $(POPT_LIBS) $(MOTIF_LIBS) $(X11_LIBS) $(GLee_LIBS) if MINGW32 warzone2100_LDADD += $(top_builddir)/win32/warzone2100.o $(WIN32_LIBS) diff --git a/src/multiint.c b/src/multiint.c index 58f8ae6..1c3ef56 100644 --- a/src/multiint.c +++ b/src/multiint.c @@ -25,7 +25,7 @@ * along with connection and game options. */ -#include "lib/ivis_opengl/GLee.h" +#include #include "lib/framework/frame.h" #include diff --git a/src/texture.c b/src/texture.c index 4bffead..2f7d878 100644 --- a/src/texture.c +++ b/src/texture.c @@ -23,7 +23,7 @@ * This is where we do texture atlas generation. */ -#include "lib/ivis_opengl/GLee.h" +#include #include "lib/framework/frame.h"