Changeset 2084


Ignore:
Timestamp:
Nov 18, 2012, 2:10:29 AM (7 years ago)
Author:
sam
Message:

build: fixes for out-of-tree builds, and get rid of
some deprecated stuff.

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r2071 r2084  
    340340if test "${ac_cv_my_have_pipi}" != "no"; then
    341341  AC_DEFINE(USE_PIPI, 1, Define to 1 to use libpipi)
     342  LOL_CFLAGS="${LOL_CFLAGS} ${PIPI_CFLAGS}"],
     343  LOL_LIBS="${LOL_LIBS} ${PIPI_LIBS}"],
    342344fi
    343345AM_CONDITIONAL(USE_PIPI, test "${ac_cv_my_have_pipi}" != "no")
  • trunk/src/Makefile.am

    r2077 r2084  
    7474    debug/fps.cpp debug/fps.h \
    7575    debug/record.cpp debug/record.h debug/stats.cpp debug/stats.h
    76 liblol_a_CPPFLAGS = @LOL_CFLAGS@ -Ibullet
     76liblol_a_CPPFLAGS = @LOL_CFLAGS@ -I$(srcdir)/bullet
    7777
    7878EXTRA_DIST = easymesh/easymesh-scanner.l easymesh/easymesh-parser.y \
  • trunk/src/lolgl.h

    r960 r2084  
    5555#endif
    5656
    57 /* Redefine some function names */
    58 #if defined HAVE_GL_2X
    59 #elif defined HAVE_GLES_2X
    60 #   define glClearDepth glClearDepthf
    61 #   define glGenVertexArrays glGenVertexArraysOES
    62 #   define glDeleteVertexArrays glDeleteVertexArraysOES
    63 #   define glBindVertexArray glBindVertexArrayOES
    64 #endif
    65 
    6657#endif // __LOL_LOLGL_H__
    6758
  • trunk/test/Makefile.am

    r1981 r2084  
    2424    unit/build.cpp unit/real.cpp unit/image.cpp unit/quat.cpp unit/cmplx.cpp \
    2525    unit/array.cpp unit/rotation.cpp
    26 testsuite_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
    27 testsuite_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
     26testsuite_CPPFLAGS = @LOL_CFLAGS@
     27testsuite_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
    2828testsuite_DEPENDENCIES = $(top_builddir)/src/liblol.a
    2929
     
    3131    benchmark/vector.cpp benchmark/half.cpp benchmark/trig.cpp \
    3232    benchmark/real.cpp
    33 benchsuite_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
    34 benchsuite_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
     33benchsuite_CPPFLAGS = @LOL_CFLAGS@
     34benchsuite_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
    3535benchsuite_DEPENDENCIES = $(top_builddir)/src/liblol.a
    3636
     
    4444    Physics/Src/BulletCharacterController.cpp \
    4545    Physics/Include/BulletCharacterController.h
    46 btphystest_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@ -I$(top_builddir)/src/bullet \
     46btphystest_CPPFLAGS = @LOL_CFLAGS@ -I$(top_srcdir)/src/bullet \
    4747    -DHAVE_PHYS_USE_BULLET
    48 btphystest_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
     48btphystest_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
    4949btphystest_DEPENDENCIES = $(top_builddir)/src/liblol.a
    5050
  • trunk/test/math/Makefile.am

    r1981 r2084  
    99
    1010pi_SOURCES = pi.cpp
    11 pi_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
    12 pi_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
     11pi_CPPFLAGS = @LOL_CFLAGS@
     12pi_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
    1313pi_DEPENDENCIES = $(top_builddir)/src/liblol.a
    1414
    1515poly_SOURCES = poly.cpp
    16 poly_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
    17 poly_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
     16poly_CPPFLAGS = @LOL_CFLAGS@
     17poly_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
    1818poly_DEPENDENCIES = $(top_builddir)/src/liblol.a
    1919
    2020remez_SOURCES = remez.cpp
    21 remez_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
    22 remez_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
     21remez_CPPFLAGS = @LOL_CFLAGS@
     22remez_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
    2323remez_DEPENDENCIES = $(top_builddir)/src/liblol.a
    2424
  • trunk/test/sandbox/Makefile.am

    r1981 r2084  
    77
    88sample_SOURCES = sample.cpp
    9 sample_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
    10 sample_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
     9sample_CPPFLAGS = @LOL_CFLAGS@
     10sample_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
    1111sample_DEPENDENCIES = $(top_builddir)/src/liblol.a
    1212
  • trunk/test/xolotl/Makefile.am

    r1981 r2084  
    77
    88xolotl_SOURCES = xolotl.cpp xolotl.h
    9 xolotl_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
    10 xolotl_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
     9xolotl_CPPFLAGS = @LOL_CFLAGS@
     10xolotl_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
    1111xolotl_DEPENDENCIES = $(top_builddir)/src/liblol.a
    1212
  • trunk/tools/neercs/Makefile.am

    r2007 r2084  
    2121    video/postfx.lolfx video/mirror.lolfx video/radial.lolfx \
    2222    video/text.lolfx
    23 neercs_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@ @CACA_CFLAGS@ -Iold
     23neercs_CPPFLAGS = @LOL_CFLAGS@ @CACA_CFLAGS@ -Iold
    2424neercs_LDADD =
    2525neercs_LDFLAGS = $(top_builddir)/src/liblol.a \
    26                  @LOL_LIBS@ @PIPI_LIBS@ @CACA_LIBS@ @UTIL_LIBS@ @PAM_LIBS@
     26                 @LOL_LIBS@ @CACA_LIBS@ @UTIL_LIBS@ @PAM_LIBS@
    2727neercs_DEPENDENCIES = $(top_builddir)/src/liblol.a
    2828
  • trunk/tutorial/Makefile.am

    r2001 r2084  
    88
    9901_triangle_SOURCES = 01_triangle.cpp 01_triangle.lolfx
    10 01_triangle_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
    11 01_triangle_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
     1001_triangle_CPPFLAGS = @LOL_CFLAGS@
     1101_triangle_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
    121201_triangle_DEPENDENCIES = $(top_builddir)/src/liblol.a
    1313
    141402_cube_SOURCES = 02_cube.cpp 02_cube.lolfx
    15 02_cube_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
    16 02_cube_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
     1502_cube_CPPFLAGS = @LOL_CFLAGS@
     1602_cube_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
    171702_cube_DEPENDENCIES = $(top_builddir)/src/liblol.a
    1818
    191903_noise_SOURCES = 03_noise.cpp 03_noise.lolfx
    20 03_noise_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
    21 03_noise_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
     2003_noise_CPPFLAGS = @LOL_CFLAGS@
     2103_noise_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
    222203_noise_DEPENDENCIES = $(top_builddir)/src/liblol.a
    2323
    242404_texture_SOURCES = 04_texture.cpp 04_texture.lolfx
    25 04_texture_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
    26 04_texture_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
     2504_texture_CPPFLAGS = @LOL_CFLAGS@
     2604_texture_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
    272704_texture_DEPENDENCIES = $(top_builddir)/src/liblol.a
    2828
    292905_easymesh_SOURCES = 05_easymesh.cpp
    30 05_easymesh_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
    31 05_easymesh_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
     3005_easymesh_CPPFLAGS = @LOL_CFLAGS@
     3105_easymesh_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
    323205_easymesh_DEPENDENCIES = $(top_builddir)/src/liblol.a
    3333
    343408_fbo_SOURCES = 08_fbo.cpp 08_fbo.lolfx
    35 08_fbo_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
    36 08_fbo_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
     3508_fbo_CPPFLAGS = @LOL_CFLAGS@
     3608_fbo_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
    373708_fbo_DEPENDENCIES = $(top_builddir)/src/liblol.a
    3838
    393911_fractal_SOURCES = 11_fractal.cpp 11_fractal.lolfx
    40 11_fractal_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
    41 11_fractal_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
     4011_fractal_CPPFLAGS = @LOL_CFLAGS@
     4111_fractal_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@
    424211_fractal_DEPENDENCIES = $(top_builddir)/src/liblol.a
    4343
Note: See TracChangeset for help on using the changeset viewer.