X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=Jamrules;h=3213e5db005deb6093c1594b3292a8a2f39d4074;hb=99095f57c0c103f77fe0a12624450e6f99435830;hp=abdd715b714e35868e3ecd3c543e7ab7abd3f119;hpb=6fe1f3519eecbbb75eca97c45a6697eee36b2442;p=supertux.git

diff --git a/Jamrules b/Jamrules
index abdd715b7..3213e5db0 100644
--- a/Jamrules
+++ b/Jamrules
@@ -13,22 +13,28 @@ if ! $(JAMCONFIG_READ)
 
 if $(USE_STLPORT_DEBUG)
 {
-  CPPFLAGS += -I/usr/include/stlport ;
-  CPPFLAGS += -D_STLP_DEBUG=1 -D_STLP_DEBUG_UNINITIALIZED=1 ;
-  CPPFLAGS += -D_STLP_SHRED_BYTE=0xA3 ;
+  CXXFLAGS += -I/usr/include/stlport ;
+  CXXFLAGS += -D_STLP_DEBUG=1 -D_STLP_DEBUG_UNINITIALIZED=1 ;
+  CXXFLAGS += -D_STLP_SHRED_BYTE=0xA3 ;
   LIBS += -lstlport_gcc_debug ;
 }
 
-COMPILER_CFLAGS += -Wall -W ;
-COMPILER_CFLAGS_optimize += -O3 -g3 ;
-COMPILER_C++FLAGS_optimize += -O3 -g3 ;
-COMPILER_LFLAGS_optimize += -O3 -g3 ;
-COMPILER_CFLAGS_debug += -DDEBUG -Werror -g3 ;
-COMPILER_CXXFLAGS_debug += -DDEBUG -Werror -g3 ;
-COMPILER_LFLAGS_debug += -g3 ;
-COMPILER_CFLAGS_profile += -O2 -g3 -pg ;
-COMPILER_CXXFLAGS_profile += -O2 -g3 -pg ;
-COMPILER_LFLAGS_profile += -g3 -pg ;
+switch $(VARIANT) {
+    case optimize :
+        CFLAGS += -Wall -O3 -g ;
+        CXXFLAGS += -Wall -O3 -g ;
+        LIBS += -g ;
+    case debug :
+        CFLAGS += -Wall -W -Werror -O0 -g3 -DDEBUG ;
+        CXXFLAGS += -Wall -W -Werror -O0 -g3 -DDEBUG ;
+        LIBS += -g3 ;
+    case profile :
+        CFLAGS += -Wall -W -O3 -g3 -pg ;
+        CXXFLAGS += -Wall -W -O3 -g3 -pg ;
+        LIBS += -g3 -pg ;
+    case * :
+        EXIT "Invalid variant $(VARIANT) selected" ;
+}
 
 LINK = $(CXX) ;
 
@@ -38,3 +44,23 @@ include $(TOP)/mk/jam/build.jam ;
 # Include Dirs
 IncludeDir $(top_builddir) ; # for config.h
 IncludeDir lib src ;
+
+if $(XGETTEXT) != ""
+{
+    actions XGetText
+    {
+        $(XGETTEXT) $(XGETTEXT_FLAGS) --keyword='_:1' -o $(<) $(>)
+    }
+    rule MakePot
+    {
+      if $(>) {
+        XGetText $(<) : $(>) ;
+        Depends $(<) : $(>) ;
+        Depends all : $(<) ;
+      }
+    }
+} else {
+    rule MakePot
+    { }
+}
+