Ignore:
Timestamp:
Feb 9, 2013, 11:05:15 PM (7 years ago)
Author:
sam
Message:

build: reorganise AM_CPPFLAGS handling so that we can disable the
shitload of warnings Bullet spits at us.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r2386 r2388  
    141141
    142142dnl No exceptions
    143 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-rtti"
     143AM_CXXFLAGS="${AM_CXXFLAGS} -fno-exceptions -fno-rtti"
    144144dnl Optimizations
    145 CXXFLAGS="${CXXFLAGS} ${REL} ${OPT}"
     145AM_CXXFLAGS="${AM_CXXFLAGS} ${REL} ${OPT}"
    146146dnl 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"
     147AM_CPPFLAGS="${AM_CPPFLAGS} -Wall -Wextra -Wpointer-arith -Wcast-align -Wcast-qual -Wshadow -Wsign-compare"
    148148
    149149AC_CHECK_LIB(m, sin, MATH_LIBS="${MATH_LIBS} -lm")
     
    182182  LOL_LIBS="${LOL_LIBS} -lio_stub -lusbd_stub -lpadfilter"
    183183  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"
    185185  AC_PATH_PROG(MAKE_FSELF, make_fself, no)
    186186  if test "${MAKE_FSELF}" = "no"; then
     
    197197AC_TRY_LINK([], [],
    198198 [AC_MSG_RESULT(yes)
    199   CXXFLAGS="${CXXFLAGS} -mwindows -mwin32"
     199  AM_CXXFLAGS="${AM_CXXFLAGS} -mwindows -mwin32"
    200200  LOL_LIBS="${LOL_LIBS} -uWinMain -u_WinMain@16"],
    201201 [AC_MSG_RESULT(no)])
     
    250250 [ac_cv_my_have_nacl="yes"
    251251  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"])
    253253AC_LANG_POP(C++)
    254254AM_CONDITIONAL(USE_NACL, test "${ac_cv_my_have_nacl}" != "no")
     
    351351AC_SUBST(UTIL_LIBS)
    352352
    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)\\\""
     353dnl  How to use the Lol Engine outside this tree
    356354LOL_CFLAGS="$LOL_CFLAGS $SDL_CFLAGS $GL_CFLAGS $EGL_CFLAGS $LIBPNG_CFLAGS"
    357355LOL_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
     357dnl  How to use the Lol Engine inside this tree
     358AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(top_srcdir)/src"
     359AM_CPPFLAGS="${AM_CPPFLAGS} -DLOL_SOURCE_SUBDIR=\\\"\$(subdir)\\\""
     360AM_CPPFLAGS="${AM_CPPFLAGS} $LOL_CFLAGS"
     361AM_LDFLAGS="${AM_LDFLAGS} \$(top_builddir)/src/liblolcore.a"
     362AM_LDFLAGS="${AM_LDFLAGS} \$(top_builddir)/src/bullet/liblolbullet.a"
     363AM_LDFLAGS="${AM_LDFLAGS} $LOL_LIBS"
    360364
    361365dnl  Extra flags
    362366AC_SUBST(LOL_CFLAGS)
    363367AC_SUBST(LOL_LIBS)
    364 AC_SUBST(LOL_STATIC_LIBS)
     368
     369AC_SUBST(AM_CFLAGS)
     370AC_SUBST(AM_CPPFLAGS)
     371AC_SUBST(AM_CXXFLAGS)
     372AC_SUBST(AM_LDFLAGS)
    365373
    366374AC_SUBST(USE_DOT)
Note: See TracChangeset for help on using the changeset viewer.