- fixed edges a bit

[supertux.git] / Jamrules

diff --git a/Jamrules b/Jamrules
index b07ecd4..5c35590 100644 (file)
--- a/Jamrules
+++ b/Jamrules
@@ -4,6 +4,9 @@ if ! $(top_builddir)
 }
 top_srcdir = $(TOP) ;
 
+# unset some stuff defined in Jambase
+LEX = ;
+
 JAMCONFIG ?= $(top_builddir)/Jamconfig ;
 include $(JAMCONFIG) ;
 if ! $(JAMCONFIG_READ)
@@ -13,22 +16,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) ;
 
@@ -37,13 +46,13 @@ include $(TOP)/mk/jam/build.jam ;
 
 # Include Dirs
 IncludeDir $(top_builddir) ; # for config.h
-IncludeDir lib src ;
+IncludeDir $(top_srcdir)/src ;
 
 if $(XGETTEXT) != ""
 {
     actions XGetText
     {
-        $(XGETTEXT) $(XGETTEXT_FLAGS) --keyword='_:1' -o $(<) $(>)
+        $(XGETTEXT) $(XGETTEXT_FLAGS) -o $(<) "$(>)"
     }
     rule MakePot
     {