X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fscripting%2FJamfile;h=7dc9dc0c5ce8547d01ca2d58efbacd34d59e59f3;hb=8f82a8e619346be81a3c1bf943baf68953f1f4e7;hp=eb5c4929ac323e3290d8cea7293af8d53c536065;hpb=60908c905544776c376421b8d3e12eeb936c068f;p=supertux.git

diff --git a/src/scripting/Jamfile b/src/scripting/Jamfile
index eb5c4929a..7dc9dc0c5 100644
--- a/src/scripting/Jamfile
+++ b/src/scripting/Jamfile
@@ -7,11 +7,12 @@ if $(MINISWIG)
     {
         local sources = [ SearchSource $(>) ] ;
         local cppfile = [ LocateTarget $(<) : $(SUBDIR) ] ;
-        local headerfile = [ LocateTarget $(<:S=.h) : $(SUBDIR) ] ;
+        local headerfile = [ LocateTarget $(<:S=.hpp) : $(SUBDIR) ] ;	
         SEARCH on $(headerfile) = $(SOURCH_SOURCE) ;
-    
+
+        Depends $(cppfile) : $(headerfile) ;
         MiniSwig $(cppfile) : $(sources) ;
-        CPPFLAGS on $(cppfile) = $(CPPFLAGS) ;
+        CPPFLAGS on $(cppfile) = $(CPPFLAGS) -DSCRIPTING_API ;
         headerfile on $(cppfile) = $(headerfile) ;
         modulename on $(cppfile) = $(3) ;
         FLAGS on $(cppfile) = $(4) ;
@@ -24,26 +25,25 @@ if $(MINISWIG)
     rule MiniSwig
     {
         Depends $(<) : $(>) $(MINISWIG) ;
-        Clean clean : $(<) ;
     }
 
     actions MiniSwig bind headerfile
     {
-        $(CPP) -x c $(CPPFLAGS) $(>) -o $(LOCATE_OBJECTS)/miniswig.tmp
-        $(MINISWIG) --output-cpp $(<) --input $(LOCATE_OBJECTS)/miniswig.tmp --output-hpp $(headerfile) --module $(modulename) $(FLAGS)
-#        rm -f $(LOCATE_OBJECTS)/miniswig.tmp
+        $(CPP) -x c -CC $(CPPFLAGS) $(>) -o $(LOCATE_OBJECTS)/miniswig.tmp
+        ./miniswig --output-cpp $(<) --input $(LOCATE_OBJECTS)/miniswig.tmp --output-hpp $(headerfile) --module $(modulename) $(FLAGS)
+#       rm -f $(LOCATE_OBJECTS)/miniswig.tmp
     }
 }
 
-wrapper_sources = [ Filter [ Wildcard *.cpp *.h ] : wrapper.cpp wrapper.h ] ;
+wrapper_sources = [ Filter [ Wildcard *.cpp *.hpp ] : wrapper.cpp wrapper.hpp ] ;
 if ! $(MINISWIG)
 {
-    wrapper_sources += wrapper.cpp ;
+    wrapper_sources += [ SearchSource wrapper.cpp ] ;
 }
 wrapper_objects = [ CompileObjects $(wrapper_sources) ] ;
 if $(MINISWIG)
 {
     wrapper_objects += 
-        [ MiniSwigRule wrapper.cpp : wrapper.interface.h : supertux : --select-namespace Scripting ] ;
+        [ MiniSwigRule wrapper.cpp : wrapper.interface.hpp : supertux : --select-namespace Scripting ] ;
 }