aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Buland <eichlan@xagasoft.com>2009-08-14 21:20:30 +0000
committerMike Buland <eichlan@xagasoft.com>2009-08-14 21:20:30 +0000
commite3180ada12753c23d67be6a9eb9c19fb92f6c8e5 (patch)
treea59cb4230c20d13a3cdf74b88bb78e87729dcfd1
parentc6a908253d0264834878fabbe0e7e78c42b11284 (diff)
downloadbuild-e3180ada12753c23d67be6a9eb9c19fb92f6c8e5.tar.gz
build-e3180ada12753c23d67be6a9eb9c19fb92f6c8e5.tar.bz2
build-e3180ada12753c23d67be6a9eb9c19fb92f6c8e5.tar.xz
build-e3180ada12753c23d67be6a9eb9c19fb92f6c8e5.zip
Corrected some logic, and ensured that build always builds against the static
version of libbu++, just to be safe.
Diffstat (limited to '')
-rw-r--r--build.conf2
-rw-r--r--src/main.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/build.conf b/build.conf
index 1f6d0f1..b52528c 100644
--- a/build.conf
+++ b/build.conf
@@ -8,7 +8,7 @@ set "CXXFLAGS" += "-ggdb"
8 rule "exe", 8 rule "exe",
9 target file, 9 target file,
10 requires "libbu++/libbu++.a", 10 requires "libbu++/libbu++.a",
11 set "LDFLAGS" += "-Llibbu++ -lbu++ -ldl", 11 set "LDFLAGS" += "-Llibbu++ -Wl,-Bstatic -lbu++ -Wl,-Bdynamic -ldl",
12 set "CXXFLAGS" += "-Ilibbu++", 12 set "CXXFLAGS" += "-Ilibbu++",
13 set "FLEXFLAGS" = "--bison-bridge --bison-locations", 13 set "FLEXFLAGS" = "--bison-bridge --bison-locations",
14 input filesIn("src") filter regexp(".*\\.(cpp|y|l)$") 14 input filesIn("src") filter regexp(".*\\.(cpp|y|l)$")
diff --git a/src/main.cpp b/src/main.cpp
index 7ea2f18..4153982 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -57,7 +57,7 @@ public:
57 57
58 virtual int cmdParam( int argc, char *argv[] ) 58 virtual int cmdParam( int argc, char *argv[] )
59 { 59 {
60 if( !sAction.isSet() ) 60 if( sAction.isSet() )
61 { 61 {
62 printf("You can only specify one action per command line.\n\n"); 62 printf("You can only specify one action per command line.\n\n");
63 exit( 1 ); 63 exit( 1 );