X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=mk%2Fjam%2Fapplication.jam;h=eea3907573534cb16c73d023164401d4032bf839;hb=147634cda2b097cf34753268ef83849fce379292;hp=e561df057823e30d0045994377954e720af45a5c;hpb=6c3a5307b87bc3fff19e819281cf2b87a2b5010b;p=supertux.git diff --git a/mk/jam/application.jam b/mk/jam/application.jam index e561df057..eea390757 100644 --- a/mk/jam/application.jam +++ b/mk/jam/application.jam @@ -28,7 +28,7 @@ rule Application CheckOptions noinstall console independent : $(3) : $(<) ; local target = [ ConstructApplicationTarget $(<) : $(3) ] ; - local sources = [ DoSourceGrist $(>) ] ; + local sources = [ SearchSource $(>) ] ; local objects = [ CompileObjects $(sources) ] ; $(<)_TYPE = application ; @@ -71,16 +71,18 @@ rule Application SystemLinkApplication $(<) : $(objects) : $(3) ; # Import default flags - CppFlags $(<) : $(CPPFLAGS) $(APPLICTION_CPPFLAGS) ; - CFlags $(<) : $(CFLAGS) $(APPLICATION_CFLAGS) ; - C++Flags $(<) : $(C++FLAGS) $(APPLICATION_C++FLAGS) ; - LFlags $(<) : $(LFLAGS) $(APPLICATION_LFLAGS) ; + CppFlags $(<) : $(APPLICTION_CPPFLAGS) ; + CFlags $(<) : $(APPLICATION_CFLAGS) ; + C++Flags $(<) : $(APPLICATION_CXXFLAGS) ; + LFlags $(<) : $(APPLICATION_LIBS) ; # Sources are part of the package if ! [ IsElem nopackage : $(3) ] { Package $(sources) ; } + + return $(target) ; } #----------------------------------------------------------------------------