X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2FJamfile;h=092591a9e8a67402643c477482f6e70e7a595150;hb=566f8eb2da26d5a2bb4ed5798a5774499f2e511f;hp=330588b8d2e3dbf85971b7d5a18988f2f0783691;hpb=4cff34ef66c22342718c0b6ff59677a11cc6492b;p=supertux.git

diff --git a/src/Jamfile b/src/Jamfile
index 330588b8d..092591a9e 100644
--- a/src/Jamfile
+++ b/src/Jamfile
@@ -3,39 +3,33 @@ SubDir TOP src ;
 SubInclude TOP src squirrel ;
 SubInclude TOP src scripting ;
 
-#------------------------
-# SuperTux ARCHIVE FILES:
-#------------------------
-# the following keeps the .o files after an archive file (.a) is created
-NOARUPDATE = true ;
-
-for i in audio badguy control gui lisp math object physfs sprite
-    tinygettext trigger video worldmap
-{
-    sources = [ Wildcard $(i) : *.cpp *.hpp ] ;
-    Library $(i) : $(sources) : noinstall ;
-    TRANSLATABLE_SOURCES += [ SearchSource $(sources) ] ;
-}
-
-ExternalLibs audio badguy control gui lisp math object physfs sprite
-      tinygettext trigger video worldmap
-    : SDL SDLIMAGE GL OPENAL VORBIS VORBISFILE OGG ICONV PHYSFS BINRELOC ;
-IncludeDir audio badguy control gui lisp math object physfs sprite
-      tinygettext trigger video worldmap
-    : squirrel/include squirrel ;
-
-#----------------------
-# SuperTux Application:
-#----------------------
-sources = [ Wildcard *.cpp *.hpp ] ;
+sources =
+    [ Wildcard *.cpp *.hpp ]
+    [ Wildcard audio : *.cpp *.hpp ]
+    [ Wildcard audio/newapi : *.cpp *.hpp ]
+    [ Wildcard badguy : *.cpp *.hpp ]
+    [ Wildcard binreloc : *.c *.h ]
+    [ Wildcard control : *.cpp *.hpp ]
+    [ Wildcard gui : *.cpp *.hpp ]
+    [ Wildcard lisp : *.cpp *.hpp ]
+    [ Wildcard math : *.cpp *.hpp ]
+    [ Wildcard object : *.cpp *.hpp ]
+    [ Wildcard physfs : *.cpp *.hpp ]
+    [ Wildcard sprite : *.cpp *.hpp ]
+    [ Wildcard tinygettext : *.cpp *.hpp ]
+    [ Wildcard trigger : *.cpp *.hpp ]
+    [ Wildcard video : *.cpp *.hpp ]
+    [ Wildcard worldmap : *.cpp *.hpp ]
+	[ Wildcard obstack : *.c *.h *.hpp ]
+;
 TRANSLATABLE_SOURCES += [ SearchSource $(sources) ] ;
 
-Application supertux : $(sources) $(wrapper_objects) ;
-C++Flags supertux : -DAPPDATADIR='\"$(appdatadir)\"' ;
-LinkWith supertux : squirrel ;
-ExternalLibs supertux : SDL SDLIMAGE GL OPENAL VORBIS VORBISFILE OGG ICONV PHYSFS BINRELOC ;
-Help supertux : "Build the supertux executable" ;
-IncludeDir supertux : squirrel/include squirrel ;
+#Application supertux : $(sources) $(wrapper_objects) ;
+Application supertux2 : $(sources) $(wrapper_objects) : linkerfile ;
+C++Flags supertux2 : -DAPPDATADIR=\'\"$(appdatadir)\"\' ;
+LinkWith supertux2 : squirrel ;
+ExternalLibs supertux2 : SDL SDLIMAGE GL OPENAL VORBIS VORBISFILE OGG ICONV PHYSFS BINRELOC LIBCURL ;
+Help supertux2 : "Build the supertux2 executable" ;
+IncludeDir supertux2 : squirrel/include squirrel ;
+Package [ Wildcard scripting : *.cpp *.hpp ] ;
 
-LinkWithWholeArchive supertux : audio badguy control gui lisp math object physfs sprite
-    tinygettext trigger video worldmap ;