X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Jamrules;h=2e3d6b0ae8572b95dabb5b7df01580329350ceff;hb=0ef18fd6af2ad886d7a13d43d1309fc391c26bb7;hp=5a51ca184d6513ab3b057ac1dd964a702d890245;hpb=c0093d25093395cb62fc2526ab42be65a9f015b8;p=supertux.git

diff --git a/Jamrules b/Jamrules
index 5a51ca184..2e3d6b0ae 100644
--- 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)
@@ -21,16 +24,16 @@ if $(USE_STLPORT_DEBUG)
 
 switch $(VARIANT) {
     case optimize :
-        CFLAGS += -O3 -g ;
-        CXXFLAGS += -O3 -g ;
+        CFLAGS += -Wall -O3 -g ;
+        CXXFLAGS += -Wall -O3 -g ;
         LIBS += -g ;
     case debug :
-        CFLAGS += -O0 -g3 -DDEBUG ;
-        CXXFLAGS += -O0 -g3 -DDEBUG ;
+        CFLAGS += -Wall -W -Werror -O0 -g3 -DDEBUG ;
+        CXXFLAGS += -Wall -W -Werror -O0 -g3 -DDEBUG ;
         LIBS += -g3 ;
     case profile :
-        CFLAGS += -O3 -g3 -pg ;
-        CXXFLAGS += -O3 -g3 -pg ;
+        CFLAGS += -Wall -W -O3 -g3 -pg ;
+        CXXFLAGS += -Wall -W -O3 -g3 -pg ;
         LIBS += -g3 -pg ;
     case * :
         EXIT "Invalid variant $(VARIANT) selected" ;
@@ -43,7 +46,7 @@ include $(TOP)/mk/jam/build.jam ;
 
 # Include Dirs
 IncludeDir $(top_builddir) ; # for config.h
-IncludeDir lib src ;
+IncludeDir $(top_srcdir)/src ;
 
 if $(XGETTEXT) != ""
 {