build: fixes for out-of-tree builds, and get rid of

some deprecated stuff.

configure.ac

@@ -339,6 +339,8 @@ ac_cv_my_have_pipi="no"
 PKG_CHECK_MODULES(PIPI, pipi, [ac_cv_my_have_pipi="yes"], [:])
 if test "${ac_cv_my_have_pipi}" != "no"; then
   AC_DEFINE(USE_PIPI, 1, Define to 1 to use libpipi)
+  LOL_CFLAGS="${LOL_CFLAGS} ${PIPI_CFLAGS}"],
+  LOL_LIBS="${LOL_LIBS} ${PIPI_LIBS}"],
 fi
 AM_CONDITIONAL(USE_PIPI, test "${ac_cv_my_have_pipi}" != "no")
 

src/Makefile.am

@@ -73,7 +73,7 @@ liblol_a_SOURCES = \
     loldebug.h \
     debug/fps.cpp debug/fps.h \
     debug/record.cpp debug/record.h debug/stats.cpp debug/stats.h
-liblol_a_CPPFLAGS = @LOL_CFLAGS@ -Ibullet
+liblol_a_CPPFLAGS = @LOL_CFLAGS@ -I$(srcdir)/bullet
 
 EXTRA_DIST = easymesh/easymesh-scanner.l easymesh/easymesh-parser.y \
              gpu/lolfx-scanner.l gpu/lolfx-parser.y

src/lolgl.h

@@ -54,14 +54,5 @@
 #   endif
 #endif
 
-/* Redefine some function names */
-#if defined HAVE_GL_2X
-#elif defined HAVE_GLES_2X
-#   define glClearDepth glClearDepthf
-#   define glGenVertexArrays glGenVertexArraysOES
-#   define glDeleteVertexArrays glDeleteVertexArraysOES
-#   define glBindVertexArray glBindVertexArrayOES
-#endif
-
 #endif // __LOL_LOLGL_H__
 

test/Makefile.am

@@ -23,15 +23,15 @@ testsuite_SOURCES = testsuite.cpp \
     unit/vector.cpp unit/matrix.cpp unit/half.cpp unit/trig.cpp \
     unit/build.cpp unit/real.cpp unit/image.cpp unit/quat.cpp unit/cmplx.cpp \
     unit/array.cpp unit/rotation.cpp
-testsuite_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
-testsuite_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
+testsuite_CPPFLAGS = @LOL_CFLAGS@
+testsuite_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
 testsuite_DEPENDENCIES = $(top_builddir)/src/liblol.a
 
 benchsuite_SOURCES = benchsuite.cpp \
     benchmark/vector.cpp benchmark/half.cpp benchmark/trig.cpp \
     benchmark/real.cpp
-benchsuite_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
-benchsuite_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
+benchsuite_CPPFLAGS = @LOL_CFLAGS@
+benchsuite_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
 benchsuite_DEPENDENCIES = $(top_builddir)/src/liblol.a
 
 btphystest_SOURCES = BtPhysTest.cpp BtPhysTest.h \
@@ -43,8 +43,8 @@ btphystest_SOURCES = BtPhysTest.cpp BtPhysTest.h \
     Physics/Include/EasyConstraint.h \
     Physics/Src/BulletCharacterController.cpp \
     Physics/Include/BulletCharacterController.h
-btphystest_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@ -I$(top_builddir)/src/bullet \
+btphystest_CPPFLAGS = @LOL_CFLAGS@ -I$(top_srcdir)/src/bullet \
     -DHAVE_PHYS_USE_BULLET
-btphystest_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
+btphystest_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
 btphystest_DEPENDENCIES = $(top_builddir)/src/liblol.a
 

test/math/Makefile.am

@@ -8,17 +8,17 @@ EXTRA_DIST = NEWS.txt lolremez.sln remez.vcxproj remez.vcxproj.filters
 noinst_PROGRAMS = pi poly remez
 
 pi_SOURCES = pi.cpp
-pi_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
-pi_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
+pi_CPPFLAGS = @LOL_CFLAGS@
+pi_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
 pi_DEPENDENCIES = $(top_builddir)/src/liblol.a
 
 poly_SOURCES = poly.cpp
-poly_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
-poly_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
+poly_CPPFLAGS = @LOL_CFLAGS@
+poly_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
 poly_DEPENDENCIES = $(top_builddir)/src/liblol.a
 
 remez_SOURCES = remez.cpp
-remez_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
-remez_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
+remez_CPPFLAGS = @LOL_CFLAGS@
+remez_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
 remez_DEPENDENCIES = $(top_builddir)/src/liblol.a
 

test/sandbox/Makefile.am

@@ -6,7 +6,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src
 noinst_PROGRAMS = sample
 
 sample_SOURCES = sample.cpp
-sample_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
-sample_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
+sample_CPPFLAGS = @LOL_CFLAGS@
+sample_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
 sample_DEPENDENCIES = $(top_builddir)/src/liblol.a
 

test/xolotl/Makefile.am

@@ -6,7 +6,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src
 noinst_PROGRAMS = xolotl
 
 xolotl_SOURCES = xolotl.cpp xolotl.h
-xolotl_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
-xolotl_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
+xolotl_CPPFLAGS = @LOL_CFLAGS@
+xolotl_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
 xolotl_DEPENDENCIES = $(top_builddir)/src/liblol.a
 

tutorial/Makefile.am

@@ -7,37 +7,37 @@ noinst_PROGRAMS = 01_triangle 02_cube 03_noise 04_texture 05_easymesh \
                   08_fbo 11_fractal
 
 01_triangle_SOURCES = 01_triangle.cpp 01_triangle.lolfx
-01_triangle_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
-01_triangle_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
+01_triangle_CPPFLAGS = @LOL_CFLAGS@
+01_triangle_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
 01_triangle_DEPENDENCIES = $(top_builddir)/src/liblol.a
 
 02_cube_SOURCES = 02_cube.cpp 02_cube.lolfx
-02_cube_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
-02_cube_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
+02_cube_CPPFLAGS = @LOL_CFLAGS@
+02_cube_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
 02_cube_DEPENDENCIES = $(top_builddir)/src/liblol.a
 
 03_noise_SOURCES = 03_noise.cpp 03_noise.lolfx
-03_noise_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
-03_noise_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
+03_noise_CPPFLAGS = @LOL_CFLAGS@
+03_noise_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
 03_noise_DEPENDENCIES = $(top_builddir)/src/liblol.a
 
 04_texture_SOURCES = 04_texture.cpp 04_texture.lolfx
-04_texture_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
-04_texture_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
+04_texture_CPPFLAGS = @LOL_CFLAGS@
+04_texture_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
 04_texture_DEPENDENCIES = $(top_builddir)/src/liblol.a
 
 05_easymesh_SOURCES = 05_easymesh.cpp
-05_easymesh_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
-05_easymesh_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
+05_easymesh_CPPFLAGS = @LOL_CFLAGS@
+05_easymesh_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
 05_easymesh_DEPENDENCIES = $(top_builddir)/src/liblol.a
 
 08_fbo_SOURCES = 08_fbo.cpp 08_fbo.lolfx
-08_fbo_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
-08_fbo_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
+08_fbo_CPPFLAGS = @LOL_CFLAGS@
+08_fbo_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
 08_fbo_DEPENDENCIES = $(top_builddir)/src/liblol.a
 
 11_fractal_SOURCES = 11_fractal.cpp 11_fractal.lolfx
-11_fractal_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
-11_fractal_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
+11_fractal_CPPFLAGS = @LOL_CFLAGS@
+11_fractal_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
 11_fractal_DEPENDENCIES = $(top_builddir)/src/liblol.a