X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=mk%2Fjam%2Fflags.jam;h=13641364cd3b5b0ee25cd044d3b5c12b5b067eec;hb=c0093d25093395cb62fc2526ab42be65a9f015b8;hp=be214357c281b316810cec7fb23b07fe8a7c7bd2;hpb=f54737bb28bec638b9f436d023b9f21fec2caadd;p=supertux.git diff --git a/mk/jam/flags.jam b/mk/jam/flags.jam index be214357c..13641364c 100644 --- a/mk/jam/flags.jam +++ b/mk/jam/flags.jam @@ -22,8 +22,8 @@ rule LinkWith # inherit the exported flags CppFlags $(<) : $($(i)_CPPFLAGS) : $(3) ; CFlags $(<) : $($(i)_CFLAGS) : $(3) ; - C++Flags $(<) : $($(i)_C++FLAGS) : $(3) ; - LFlags $(<) : $($(i)_LFLAGS) : $(3) ; + C++Flags $(<) : $($(i)_CXXFLAGS) : $(3) ; + LFlags $(<) : $($(i)_LIBS) : $(3) ; } } else { echo "WARNING: Trying to link" $(i) @@ -74,10 +74,10 @@ rule CFlags rule C++Flags { - C++FLAGS on $($(<)_OBJECTS) += $(>) ; + CXXFLAGS on $($(<)_OBJECTS) += $(>) ; if [ IsElem export : $(3) ] { - $(<)_C++FLAGS = $(>) ; + $(<)_CXXFLAGS = $(>) ; } } @@ -85,10 +85,10 @@ rule C++Flags ## Sets linker flags for a library, plugin or application target rule LFlags { - LFLAGS on $($(<)_TARGET) += $(>) ; + LIBS on $($(<)_TARGET) += $(>) ; if [ IsElem export : $(3) ] { - $(<)_LFLAGS = $(>) ; + $(<)_LIBS = $(>) ; } }