diff options
Diffstat (limited to '')
-rw-r--r-- | default.bld | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/default.bld b/default.bld index de31b78..19b66bf 100644 --- a/default.bld +++ b/default.bld | |||
@@ -5,6 +5,8 @@ | |||
5 | 5 | ||
6 | CXXFLAGS += "-ggdb -W -Wall"; | 6 | CXXFLAGS += "-ggdb -W -Wall"; |
7 | 7 | ||
8 | CC = CXX; // We actually want to use c++ to compile our c files. | ||
9 | |||
8 | action "default" | 10 | action "default" |
9 | { | 11 | { |
10 | build: "build"; | 12 | build: "build"; |
@@ -49,6 +51,7 @@ target "build" | |||
49 | rule "exe"; | 51 | rule "exe"; |
50 | LDFLAGS += "-Llibbu++ -lbu++ -ldl"; | 52 | LDFLAGS += "-Llibbu++ -lbu++ -ldl"; |
51 | CXXFLAGS += "-Ilibbu++"; | 53 | CXXFLAGS += "-Ilibbu++"; |
54 | CFLAGS = CXXFLAGS; | ||
52 | tag "tools"; | 55 | tag "tools"; |
53 | } | 56 | } |
54 | 57 | ||
@@ -74,19 +77,6 @@ target "build-r$(svnversion "-n").tar.bz2" | |||
74 | tag "pkg"; | 77 | tag "pkg"; |
75 | } | 78 | } |
76 | 79 | ||
77 | // We want to override the c rule, and just use c++ for it | ||
78 | rule "c" | ||
79 | { | ||
80 | input "*.c"; | ||
81 | output replace(".c", ".o"); | ||
82 | tag "auto-source"; | ||
83 | requires getMakeDeps("g++ ${CXXFLAGS} -M ${INPUT}"); | ||
84 | profile "build" | ||
85 | { | ||
86 | execute("g++ ${CXXFLAGS} -c -o ${OUTPUT} ${INPUT}"); | ||
87 | } | ||
88 | } | ||
89 | |||
90 | rule "tarball" | 80 | rule "tarball" |
91 | { | 81 | { |
92 | input matches("*.cpp", "*.h", "*.c", "*.y", "*.l", "*.conf", "Doxyfile", | 82 | input matches("*.cpp", "*.h", "*.c", "*.y", "*.l", "*.conf", "Doxyfile", |