Changeset 2397


Ignore:
Timestamp:
Feb 12, 2013, 1:51:52 PM (6 years ago)
Author:
sam
Message:

build: re-add liblolcore dependency tracking to all binary objects.

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r2395 r2397  
    370370LOL_CFLAGS="$LOL_CFLAGS $SDL_CFLAGS $GL_CFLAGS $EGL_CFLAGS $LIBPNG_CFLAGS"
    371371LOL_LIBS="$LOL_LIBS $SDL_LIBS $GL_LIBS $EGL_LIBS $LIBPNG_LIBS $D3D_LIBS"
     372LOL_DEPENDENCIES="${LOL_DEPENDENCIES} \$(top_builddir)/src/liblolcore.a"
     373LOL_DEPENDENCIES="${LOL_DEPENDENCIES} \$(top_builddir)/src/bullet/liblolbullet.a"
    372374
    373375dnl  How to use the Lol Engine inside this tree
    374376AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(top_srcdir)/src"
    375377AM_CPPFLAGS="${AM_CPPFLAGS} -DLOL_SOURCE_SUBDIR=\\\"\$(subdir)\\\""
    376 AM_CPPFLAGS="${AM_CPPFLAGS} $LOL_CFLAGS"
    377 AM_LDFLAGS="${AM_LDFLAGS} \$(top_builddir)/src/liblolcore.a"
    378 AM_LDFLAGS="${AM_LDFLAGS} \$(top_builddir)/src/bullet/liblolbullet.a"
    379 AM_LDFLAGS="${AM_LDFLAGS} $LOL_LIBS"
     378AM_CPPFLAGS="${AM_CPPFLAGS} ${LOL_CFLAGS}"
     379AM_LDFLAGS="${AM_LDFLAGS} ${LOL_DEPENDENCIES}"
     380AM_LDFLAGS="${AM_LDFLAGS} ${LOL_LIBS}"
    380381
    381382dnl  Extra flags
    382383AC_SUBST(LOL_CFLAGS)
    383384AC_SUBST(LOL_LIBS)
     385AC_SUBST(LOL_DEPENDENCIES)
    384386
    385387AC_SUBST(AM_CFLAGS)
  • trunk/test/Makefile.am

    r2388 r2397  
    2424    unit/color.cpp unit/atomic.cpp
    2525testsuite_CPPFLAGS = $(AM_CPPFLAGS)
     26testsuite_DEPENDENCIES = @LOL_DEPENDENCIES@
    2627
    2728benchsuite_SOURCES = benchsuite.cpp \
     
    2930    benchmark/real.cpp
    3031benchsuite_CPPFLAGS = $(AM_CPPFLAGS)
     32benchsuite_DEPENDENCIES = @LOL_DEPENDENCIES@
    3133
    3234btphystest_SOURCES = BtPhysTest.cpp BtPhysTest.h PhysicObject.h \
     
    4143btphystest_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/bullet \
    4244    -DHAVE_PHYS_USE_BULLET
     45btphystest_DEPENDENCIES = @LOL_DEPENDENCIES@
    4346
    4447meshviewer_SOURCES = MeshViewer.cpp
    4548meshviewer_CPPFLAGS = $(AM_CPPFLAGS)
     49meshviewer_DEPENDENCIES = @LOL_DEPENDENCIES@
    4650
  • trunk/test/math/Makefile.am

    r2388 r2397  
    88pi_SOURCES = pi.cpp
    99pi_CPPFLAGS = $(AM_CPPFLAGS)
     10pi_DEPENDENCIES = @LOL_DEPENDENCIES@
    1011
    1112poly_SOURCES = poly.cpp
    1213poly_CPPFLAGS = $(AM_CPPFLAGS)
     14poly_DEPENDENCIES = @LOL_DEPENDENCIES@
    1315
    1416remez_SOURCES = remez.cpp
    1517remez_CPPFLAGS = $(AM_CPPFLAGS)
     18remez_DEPENDENCIES = @LOL_DEPENDENCIES@
    1619
  • trunk/test/sandbox/Makefile.am

    r2388 r2397  
    66sample_SOURCES = sample.cpp
    77sample_CPPFLAGS = $(AM_CPPFLAGS)
     8sample_DEPENDENCIES = @LOL_DEPENDENCIES@
    89
  • trunk/test/xolotl/Makefile.am

    r2388 r2397  
    66xolotl_SOURCES = xolotl.cpp xolotl.h
    77xolotl_CPPFLAGS = $(AM_CPPFLAGS)
     8xolotl_DEPENDENCIES = @LOL_DEPENDENCIES@
    89
  • trunk/tools/neercs/Makefile.am

    r2388 r2397  
    2323neercs_CPPFLAGS = $(AM_CPPFLAGS) @CACA_CFLAGS@ -Iold
    2424neercs_LDFLAGS = $(AM_LDFLAGS) @CACA_LIBS@ @UTIL_LIBS@ @PAM_LIBS@
     25neercs_DEPENDENCIES = @LOL_DEPENDENCIES@
    2526
    2627old_sources = \
  • trunk/tutorial/Makefile.am

    r2388 r2397  
    7701_triangle_SOURCES = 01_triangle.cpp 01_triangle.lolfx
    8801_triangle_CPPFLAGS = $(AM_CPPFLAGS)
     901_triangle_DEPENDENCIES = @LOL_DEPENDENCIES@
    910
    101102_cube_SOURCES = 02_cube.cpp 02_cube.lolfx
    111202_cube_CPPFLAGS = $(AM_CPPFLAGS)
     1302_cube_DEPENDENCIES = @LOL_DEPENDENCIES@
    1214
    131503_noise_SOURCES = 03_noise.cpp 03_noise.lolfx
    141603_noise_CPPFLAGS = $(AM_CPPFLAGS)
     1703_noise_DEPENDENCIES = @LOL_DEPENDENCIES@
    1518
    161904_texture_SOURCES = 04_texture.cpp 04_texture.lolfx
    172004_texture_CPPFLAGS = $(AM_CPPFLAGS)
     2104_texture_DEPENDENCIES = @LOL_DEPENDENCIES@
    1822
    192305_easymesh_SOURCES = 05_easymesh.cpp
    202405_easymesh_CPPFLAGS = $(AM_CPPFLAGS)
     2505_easymesh_DEPENDENCIES = @LOL_DEPENDENCIES@
    2126
    222708_fbo_SOURCES = 08_fbo.cpp 08_fbo.lolfx
    232808_fbo_CPPFLAGS = $(AM_CPPFLAGS)
     2908_fbo_DEPENDENCIES = @LOL_DEPENDENCIES@
    2430
    253111_fractal_SOURCES = 11_fractal.cpp 11_fractal.lolfx
    263211_fractal_CPPFLAGS = $(AM_CPPFLAGS)
     3311_fractal_DEPENDENCIES = @LOL_DEPENDENCIES@
    2734
Note: See TracChangeset for help on using the changeset viewer.