summaryrefslogtreecommitdiff
path: root/VP
diff options
context:
space:
mode:
authorpixel <pixel>2003-06-20 14:08:16 +0000
committerpixel <pixel>2003-06-20 14:08:16 +0000
commit30f218eb43414407ff8fad136ac1b14d419c29b5 (patch)
tree1e4c1dd71272f861daf90baced75fa604cdbf168 /VP
parent7fc9c6dfbef57331c8b5eae0943f3fe95f2e63e1 (diff)
Compiling again
Diffstat (limited to 'VP')
-rwxr-xr-xVP/Makefile20
-rw-r--r--VP/main_dump.cpp2
2 files changed, 11 insertions, 11 deletions
diff --git a/VP/Makefile b/VP/Makefile
index 815eb9d..bc2acb3 100755
--- a/VP/Makefile
+++ b/VP/Makefile
@@ -1,26 +1,26 @@
#!/usr/bin/make -f
-CPPFLAGS=-Wall -g -O3 -mcpu=i686 -pedantic -pedantic-errors -Werror -I../includes -DHAVE_ZLIB
+CPPFLAGS=-Wall -g -O3 -mcpu=i686 -pedantic -I../includes -DHAVE_ZLIB `baltisot-config --cflags`
CXX=g++
LIBS=-lz
-LDFLAGS=${LIBS}
+LDFLAGS=${LIBS} `baltisot-config --libs`
TARGET = main_dump VP-CD1.sqr decomp-slz unarc
all: ${TARGET}
-main_dump: main_dump.o ../includes/cdutils.h ../includes/generic.h ../lib/lib.a ../generic/generic.a Makefile
- ${CXX} ${LDFLAGS} main_dump.o ../lib/lib.a ../generic/generic.a -o main_dump
+main_dump: main_dump.o ../includes/cdutils.h ../lib/lib.a Makefile
+ ${CXX} ${LDFLAGS} main_dump.o ../lib/lib.a -o main_dump
-decomp-slz: decomp-slz.o ../includes/generic.h ../includes/lzss.h Makefile
- ${CXX} ${LDFLAGS} decomp-slz.o ../lib/lib.a ../generic/generic.a -o decomp-slz
+decomp-slz: decomp-slz.o ../includes/lzss.h Makefile
+ ${CXX} ${LDFLAGS} decomp-slz.o ../lib/lib.a -o decomp-slz
-unarc: unarc.o ../includes/generic.h Makefile
- ${CXX} ${LDFLAGS} unarc.o ../generic/generic.a -o unarc
+unarc: unarc.o Makefile
+ ${CXX} ${LDFLAGS} unarc.o -o unarc
-search-script: search-script.o ../includes/generic.h Makefile
- ${CXX} ${LDFLAGS} search-script.o ../generic/generic.a -o search-script
+search-script: search-script.o Makefile
+ ${CXX} ${LDFLAGS} search-script.o -o search-script
clean:
rm -f *.o ${TARGET}
diff --git a/VP/main_dump.cpp b/VP/main_dump.cpp
index 421db66..9fa4dfa 100644
--- a/VP/main_dump.cpp
+++ b/VP/main_dump.cpp
@@ -32,7 +32,7 @@
#include "generic.h"
#include "Input.h"
#include "Output.h"
-#include "String.h"
+#include "BString.h"
#include "Main.h"
#include "cdabstract.h"