From bbca3b6e59d8028b1efd29d5b012b7705b8bd633 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Sun, 18 Nov 2012 01:10:29 +0000 Subject: [PATCH] build: fixes for out-of-tree builds, and get rid of some deprecated stuff. --- configure.ac | 2 ++ src/Makefile.am | 2 +- src/lolgl.h | 9 --------- test/Makefile.am | 12 ++++++------ test/math/Makefile.am | 12 ++++++------ test/sandbox/Makefile.am | 4 ++-- test/xolotl/Makefile.am | 4 ++-- tutorial/Makefile.am | 28 ++++++++++++++-------------- 8 files changed, 33 insertions(+), 40 deletions(-) diff --git a/configure.ac b/configure.ac index c7ee9897..fd1216f2 100644 --- a/configure.ac +++ b/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") diff --git a/src/Makefile.am b/src/Makefile.am index 99f724cc..9dfd5b8b 100644 --- a/src/Makefile.am +++ b/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 diff --git a/src/lolgl.h b/src/lolgl.h index 31794a16..3d786ebc 100644 --- a/src/lolgl.h +++ b/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__ diff --git a/test/Makefile.am b/test/Makefile.am index b67555df..9383c791 100644 --- a/test/Makefile.am +++ b/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 diff --git a/test/math/Makefile.am b/test/math/Makefile.am index 0c270d75..9cac90db 100644 --- a/test/math/Makefile.am +++ b/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 diff --git a/test/sandbox/Makefile.am b/test/sandbox/Makefile.am index 1178424a..57140791 100644 --- a/test/sandbox/Makefile.am +++ b/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 diff --git a/test/xolotl/Makefile.am b/test/xolotl/Makefile.am index d39d3624..a767fb14 100644 --- a/test/xolotl/Makefile.am +++ b/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 diff --git a/tutorial/Makefile.am b/tutorial/Makefile.am index 1c3d3a71..25f50054 100644 --- a/tutorial/Makefile.am +++ b/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