projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more work on castle door, changed nolok image
[supertux.git]
/
Jamrules
diff --git
a/Jamrules
b/Jamrules
index
5a51ca1
..
2e3d6b0
100644
(file)
--- a/
Jamrules
+++ b/
Jamrules
@@
-4,6
+4,9
@@
if ! $(top_builddir)
}
top_srcdir = $(TOP) ;
}
top_srcdir = $(TOP) ;
+# unset some stuff defined in Jambase
+LEX = ;
+
JAMCONFIG ?= $(top_builddir)/Jamconfig ;
include $(JAMCONFIG) ;
if ! $(JAMCONFIG_READ)
JAMCONFIG ?= $(top_builddir)/Jamconfig ;
include $(JAMCONFIG) ;
if ! $(JAMCONFIG_READ)
@@
-21,16
+24,16
@@
if $(USE_STLPORT_DEBUG)
switch $(VARIANT) {
case optimize :
switch $(VARIANT) {
case optimize :
- CFLAGS += -O3 -g ;
- CXXFLAGS += -O3 -g ;
+ CFLAGS += -
Wall -
O3 -g ;
+ CXXFLAGS += -
Wall -
O3 -g ;
LIBS += -g ;
case debug :
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 :
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" ;
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
# Include Dirs
IncludeDir $(top_builddir) ; # for config.h
-IncludeDir
lib
src ;
+IncludeDir
$(top_srcdir)/
src ;
if $(XGETTEXT) != ""
{
if $(XGETTEXT) != ""
{