- Timestamp:
- Feb 9, 2013, 11:05:15 PM (7 years ago)
- Location:
- trunk
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/configure.ac
r2386 r2388 141 141 142 142 dnl No exceptions 143 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-rtti"143 AM_CXXFLAGS="${AM_CXXFLAGS} -fno-exceptions -fno-rtti" 144 144 dnl Optimizations 145 CXXFLAGS="${CXXFLAGS} ${REL} ${OPT}"145 AM_CXXFLAGS="${AM_CXXFLAGS} ${REL} ${OPT}" 146 146 dnl Code qui fait des warnings == code de porc == deux baffes dans ta gueule 147 CXXFLAGS="${CXXFLAGS} -Wall -Wextra -Wpointer-arith -Wcast-align -Wcast-qual -Wshadow -Wsign-compare"147 AM_CPPFLAGS="${AM_CPPFLAGS} -Wall -Wextra -Wpointer-arith -Wcast-align -Wcast-qual -Wshadow -Wsign-compare" 148 148 149 149 AC_CHECK_LIB(m, sin, MATH_LIBS="${MATH_LIBS} -lm") … … 182 182 LOL_LIBS="${LOL_LIBS} -lio_stub -lusbd_stub -lpadfilter" 183 183 dnl Disable this warning, it's too verbose with vector.h 184 CXXFLAGS="${CXXFLAGS} -Wno-sign-compare"184 AM_CXXFLAGS="${AM_CXXFLAGS} -Wno-sign-compare" 185 185 AC_PATH_PROG(MAKE_FSELF, make_fself, no) 186 186 if test "${MAKE_FSELF}" = "no"; then … … 197 197 AC_TRY_LINK([], [], 198 198 [AC_MSG_RESULT(yes) 199 CXXFLAGS="${CXXFLAGS} -mwindows -mwin32"199 AM_CXXFLAGS="${AM_CXXFLAGS} -mwindows -mwin32" 200 200 LOL_LIBS="${LOL_LIBS} -uWinMain -u_WinMain@16"], 201 201 [AC_MSG_RESULT(no)]) … … 250 250 [ac_cv_my_have_nacl="yes" 251 251 dnl Disable this warning, it's too verbose with vector.h 252 CXXFLAGS="${CXXFLAGS} -Wno-sign-compare"])252 AM_CXXFLAGS="${AM_CXXFLAGS} -Wno-sign-compare"]) 253 253 AC_LANG_POP(C++) 254 254 AM_CONDITIONAL(USE_NACL, test "${ac_cv_my_have_nacl}" != "no") … … 351 351 AC_SUBST(UTIL_LIBS) 352 352 353 dnl How to use the Lol Engine inside this tree 354 LOL_CFLAGS="$LOL_CFLAGS -I\$(top_srcdir)/src" 355 LOL_CFLAGS="$LOL_CFLAGS -DLOL_SOURCE_SUBDIR=\\\"\$(subdir)\\\"" 353 dnl How to use the Lol Engine outside this tree 356 354 LOL_CFLAGS="$LOL_CFLAGS $SDL_CFLAGS $GL_CFLAGS $EGL_CFLAGS $LIBPNG_CFLAGS" 357 355 LOL_LIBS="$LOL_LIBS $SDL_LIBS $GL_LIBS $EGL_LIBS $LIBPNG_LIBS $D3D_LIBS" 358 LOL_STATIC_LIBS="\$(top_builddir)/src/liblolcore.a $LOL_STATIC_LIBS" 359 LOL_STATIC_LIBS="\$(top_builddir)/src/bullet/liblolbullet.a $LOL_STATIC_LIBS" 356 357 dnl How to use the Lol Engine inside this tree 358 AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(top_srcdir)/src" 359 AM_CPPFLAGS="${AM_CPPFLAGS} -DLOL_SOURCE_SUBDIR=\\\"\$(subdir)\\\"" 360 AM_CPPFLAGS="${AM_CPPFLAGS} $LOL_CFLAGS" 361 AM_LDFLAGS="${AM_LDFLAGS} \$(top_builddir)/src/liblolcore.a" 362 AM_LDFLAGS="${AM_LDFLAGS} \$(top_builddir)/src/bullet/liblolbullet.a" 363 AM_LDFLAGS="${AM_LDFLAGS} $LOL_LIBS" 360 364 361 365 dnl Extra flags 362 366 AC_SUBST(LOL_CFLAGS) 363 367 AC_SUBST(LOL_LIBS) 364 AC_SUBST(LOL_STATIC_LIBS) 368 369 AC_SUBST(AM_CFLAGS) 370 AC_SUBST(AM_CPPFLAGS) 371 AC_SUBST(AM_CXXFLAGS) 372 AC_SUBST(AM_LDFLAGS) 365 373 366 374 AC_SUBST(USE_DOT) -
trunk/src/Makefile.am
r2386 r2388 26 26 $(d3d9_sources) \ 27 27 $(android_sources) 28 liblolcore_a_CPPFLAGS = @LOL_CFLAGS@-I$(srcdir)/bullet28 liblolcore_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/bullet 29 29 30 30 EXTRA_DIST = easymesh/easymesh-scanner.l easymesh/easymesh-parser.y \ -
trunk/src/bullet/Makefile.am
r2386 r2388 5 5 6 6 liblolbullet_a_SOURCES = $(bullet_sources) 7 liblolbullet_a_CPPFLAGS = @LOL_CFLAGS@ -I$(srcdir) 7 liblolbullet_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir) \ 8 -Wno-shadow -Wno-unused -Wno-cast-qual -Wno-strict-aliasing \ 9 -Wno-maybe-uninitialized -Wno-narrowing -Wno-parentheses \ 10 -Wno-reorder 8 11 9 12 bullet_sources = … … 42 45 BulletMultiThreaded/SequentialThreadSupport.h 43 46 44 libBulletMultiThreaded_la_CXXFLAGS = ${CXXFLAGS}-I./BulletMultiThreaded/vectormath/scalar/cpp47 libBulletMultiThreaded_la_CXXFLAGS = -I./BulletMultiThreaded/vectormath/scalar/cpp 45 48 bullet_sources += \ 46 49 BulletMultiThreaded/SpuCollisionObjectWrapper.cpp \ -
trunk/test/Makefile.am
r2386 r2388 3 3 4 4 SUBDIRS = math sandbox xolotl 5 6 AM_CPPFLAGS = -I$(top_srcdir)/src7 5 8 6 bench: benchsuite$(EXEEXT) … … 25 23 unit/array.cpp unit/rotation.cpp unit/string.cpp unit/map.cpp \ 26 24 unit/color.cpp unit/atomic.cpp 27 testsuite_CPPFLAGS = @LOL_CFLAGS@ 28 testsuite_LDFLAGS = @LOL_STATIC_LIBS@ @LOL_LIBS@ 29 testsuite_DEPENDENCIES = @LOL_STATIC_LIBS@ 25 testsuite_CPPFLAGS = $(AM_CPPFLAGS) 30 26 31 27 benchsuite_SOURCES = benchsuite.cpp \ 32 28 benchmark/vector.cpp benchmark/half.cpp benchmark/trig.cpp \ 33 29 benchmark/real.cpp 34 benchsuite_CPPFLAGS = @LOL_CFLAGS@ 35 benchsuite_LDFLAGS = @LOL_STATIC_LIBS@ @LOL_LIBS@ 36 benchsuite_DEPENDENCIES = @LOL_STATIC_LIBS@ 30 benchsuite_CPPFLAGS = $(AM_CPPFLAGS) 37 31 38 32 btphystest_SOURCES = BtPhysTest.cpp BtPhysTest.h PhysicObject.h \ … … 45 39 Physics/Src/BulletCharacterController.cpp \ 46 40 Physics/Include/BulletCharacterController.h 47 btphystest_CPPFLAGS = @LOL_CFLAGS@-I$(top_srcdir)/src/bullet \41 btphystest_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/bullet \ 48 42 -DHAVE_PHYS_USE_BULLET 49 btphystest_LDFLAGS = @LOL_STATIC_LIBS@ @LOL_LIBS@50 btphystest_DEPENDENCIES = @LOL_STATIC_LIBS@51 43 52 44 meshviewer_SOURCES = MeshViewer.cpp 53 meshviewer_CPPFLAGS = @LOL_CFLAGS@ 54 meshviewer_LDFLAGS = @LOL_STATIC_LIBS@ @LOL_LIBS@ 55 meshviewer_DEPENDENCIES = @LOL_STATIC_LIBS@ 45 meshviewer_CPPFLAGS = $(AM_CPPFLAGS) 56 46 -
trunk/test/math/Makefile.am
r2386 r2388 1 1 2 2 include $(top_srcdir)/build/autotools/common.am 3 4 AM_CPPFLAGS = -I$(top_srcdir)/src5 3 6 4 EXTRA_DIST = NEWS.txt lolremez.sln remez.vcxproj remez.vcxproj.filters … … 9 7 10 8 pi_SOURCES = pi.cpp 11 pi_CPPFLAGS = @LOL_CFLAGS@ 12 pi_LDFLAGS = @LOL_STATIC_LIBS@ @LOL_LIBS@ 13 pi_DEPENDENCIES = @LOL_STATIC_LIBS@ 9 pi_CPPFLAGS = $(AM_CPPFLAGS) 14 10 15 11 poly_SOURCES = poly.cpp 16 poly_CPPFLAGS = @LOL_CFLAGS@ 17 poly_LDFLAGS = @LOL_STATIC_LIBS@ @LOL_LIBS@ 18 poly_DEPENDENCIES = @LOL_STATIC_LIBS@ 12 poly_CPPFLAGS = $(AM_CPPFLAGS) 19 13 20 14 remez_SOURCES = remez.cpp 21 remez_CPPFLAGS = @LOL_CFLAGS@ 22 remez_LDFLAGS = @LOL_STATIC_LIBS@ @LOL_LIBS@ 23 remez_DEPENDENCIES = @LOL_STATIC_LIBS@ 15 remez_CPPFLAGS = $(AM_CPPFLAGS) 24 16 -
trunk/test/sandbox/Makefile.am
r2386 r2388 1 1 2 2 include $(top_srcdir)/build/autotools/common.am 3 4 AM_CPPFLAGS = -I$(top_srcdir)/src5 3 6 4 noinst_PROGRAMS = sample 7 5 8 6 sample_SOURCES = sample.cpp 9 sample_CPPFLAGS = @LOL_CFLAGS@ 10 sample_LDFLAGS = @LOL_STATIC_LIBS@ @LOL_LIBS@ 11 sample_DEPENDENCIES = @LOL_STATIC_LIBS@ 7 sample_CPPFLAGS = $(AM_CPPFLAGS) 12 8 -
trunk/test/xolotl/Makefile.am
r2386 r2388 1 1 2 2 include $(top_srcdir)/build/autotools/common.am 3 4 AM_CPPFLAGS = -I$(top_srcdir)/src5 3 6 4 noinst_PROGRAMS = xolotl 7 5 8 6 xolotl_SOURCES = xolotl.cpp xolotl.h 9 xolotl_CPPFLAGS = @LOL_CFLAGS@ 10 xolotl_LDFLAGS = @LOL_STATIC_LIBS@ @LOL_LIBS@ 11 xolotl_DEPENDENCIES = @LOL_STATIC_LIBS@ 7 xolotl_CPPFLAGS = $(AM_CPPFLAGS) 12 8 -
trunk/tools/neercs/Makefile.am
r2386 r2388 18 18 video/simple.lolfx \ 19 19 video/blurh.lolfx video/blurv.lolfx video/glow.lolfx \ 20 video/remanence.lolfx video/copper.lolfx video/color.lolfx video/noise.lolfx \ 21 video/postfx.lolfx video/mirror.lolfx video/radial.lolfx \ 22 video/text.lolfx 23 neercs_CPPFLAGS = @LOL_CFLAGS@ @CACA_CFLAGS@ -Iold 24 neercs_LDADD = 25 neercs_LDFLAGS = @LOL_STATIC_LIBS@ \ 26 @LOL_LIBS@ @CACA_LIBS@ @UTIL_LIBS@ @PAM_LIBS@ 27 neercs_DEPENDENCIES = @LOL_STATIC_LIBS@ 20 video/remanence.lolfx video/copper.lolfx video/color.lolfx \ 21 video/noise.lolfx video/postfx.lolfx video/mirror.lolfx \ 22 video/radial.lolfx video/text.lolfx 23 neercs_CPPFLAGS = $(AM_CPPFLAGS) @CACA_CFLAGS@ -Iold 24 neercs_LDFLAGS = $(AM_LDFLAGS) @CACA_LIBS@ @UTIL_LIBS@ @PAM_LIBS@ 28 25 29 26 old_sources = \ -
trunk/tutorial/Makefile.am
r2386 r2388 1 1 2 2 include $(top_srcdir)/build/autotools/common.am 3 4 AM_CPPFLAGS = -I$(top_srcdir)/src5 3 6 4 noinst_PROGRAMS = 01_triangle 02_cube 03_noise 04_texture 05_easymesh \ … … 8 6 9 7 01_triangle_SOURCES = 01_triangle.cpp 01_triangle.lolfx 10 01_triangle_CPPFLAGS = @LOL_CFLAGS@ 11 01_triangle_LDFLAGS = @LOL_STATIC_LIBS@ @LOL_LIBS@ 12 01_triangle_DEPENDENCIES = @LOL_STATIC_LIBS@ 8 01_triangle_CPPFLAGS = $(AM_CPPFLAGS) 13 9 14 10 02_cube_SOURCES = 02_cube.cpp 02_cube.lolfx 15 02_cube_CPPFLAGS = @LOL_CFLAGS@ 16 02_cube_LDFLAGS = @LOL_STATIC_LIBS@ @LOL_LIBS@ 17 02_cube_DEPENDENCIES = @LOL_STATIC_LIBS@ 11 02_cube_CPPFLAGS = $(AM_CPPFLAGS) 18 12 19 13 03_noise_SOURCES = 03_noise.cpp 03_noise.lolfx 20 03_noise_CPPFLAGS = @LOL_CFLAGS@ 21 03_noise_LDFLAGS = @LOL_STATIC_LIBS@ @LOL_LIBS@ 22 03_noise_DEPENDENCIES = @LOL_STATIC_LIBS@ 14 03_noise_CPPFLAGS = $(AM_CPPFLAGS) 23 15 24 16 04_texture_SOURCES = 04_texture.cpp 04_texture.lolfx 25 04_texture_CPPFLAGS = @LOL_CFLAGS@ 26 04_texture_LDFLAGS = @LOL_STATIC_LIBS@ @LOL_LIBS@ 27 04_texture_DEPENDENCIES = @LOL_STATIC_LIBS@ 17 04_texture_CPPFLAGS = $(AM_CPPFLAGS) 28 18 29 19 05_easymesh_SOURCES = 05_easymesh.cpp 30 05_easymesh_CPPFLAGS = @LOL_CFLAGS@ 31 05_easymesh_LDFLAGS = @LOL_STATIC_LIBS@ @LOL_LIBS@ 32 05_easymesh_DEPENDENCIES = @LOL_STATIC_LIBS@ 20 05_easymesh_CPPFLAGS = $(AM_CPPFLAGS) 33 21 34 22 08_fbo_SOURCES = 08_fbo.cpp 08_fbo.lolfx 35 08_fbo_CPPFLAGS = @LOL_CFLAGS@ 36 08_fbo_LDFLAGS = @LOL_STATIC_LIBS@ @LOL_LIBS@ 37 08_fbo_DEPENDENCIES = @LOL_STATIC_LIBS@ 23 08_fbo_CPPFLAGS = $(AM_CPPFLAGS) 38 24 39 25 11_fractal_SOURCES = 11_fractal.cpp 11_fractal.lolfx 40 11_fractal_CPPFLAGS = @LOL_CFLAGS@ 41 11_fractal_LDFLAGS = @LOL_STATIC_LIBS@ @LOL_LIBS@ 42 11_fractal_DEPENDENCIES = @LOL_STATIC_LIBS@ 26 11_fractal_CPPFLAGS = $(AM_CPPFLAGS) 43 27
Note: See TracChangeset
for help on using the changeset viewer.