Compiling again

5 files changed, 23 insertions, 19 deletions

diff --git a/Xenogears/Decrypt.cpp b/Xenogears/Decrypt.cpp
index 5f606a7..8bee7c3 100644
--- a/Xenogears/Decrypt.cpp
+++ b/Xenogears/Decrypt.cpp
@@ -1,5 +1,10 @@
-#include<stdio.h>
-#include<string.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "generic.h"
+#include "Input.h"
+#include "Output.h"
 #include "Main.h"
 
 CODE_BEGINS
diff --git a/Xenogears/Makefile b/Xenogears/Makefile
index 5fbefb7..2069324 100755
--- a/Xenogears/Makefile
+++ b/Xenogears/Makefile
@@ -1,33 +1,33 @@
 #!/usr/bin/make -f
 
-CPPFLAGS=-Wall -g -O3 -mcpu=i686 -pedantic -pedantic-errors -I../includes -DHAVE_ZLIB
+CPPFLAGS=-Wall -g -O3 -mcpu=i686 -pedantic -I../includes -DHAVE_ZLIB `baltisot-config --cflags`
 CXX=g++
 CC=gcc
-LEX=flex
+LEX=flex -l
 
 LIBS=-lz
 #-lefence
-LDFLAGS=${LIBS}
+LDFLAGS=${LIBS} `baltisot-config --libs`
 #`pkg-config --libs glib-2.0`
 
 TARGET = reinsert main_dump Decrypt script-comp script-dec XenoCD1.sqr XenoCD2.sqr compil compil-2
 
 all: ${TARGET}
 
-main_dump: main_dump.o ../includes/cdutils.h ../includes/generic.h ../includes/yazedc.h ../lib/lib.a ../generic/generic.a Makefile
-	${CXX} main_dump.o ../lib/lib.a ../generic/generic.a -o main_dump ${LDFLAGS}
+main_dump: main_dump.o ../includes/cdutils.h ../includes/yazedc.h ../lib/lib.a Makefile
+	${CXX} main_dump.o ../lib/lib.a -o main_dump ${LDFLAGS}
 
-reinsert: reinsert.o ../includes/cdutils.h ../includes/generic.h ../includes/yazedc.h ../lib/lib.a ../generic/generic.a Makefile
-	${CXX} ${LDFLAGS} reinsert.o ../lib/lib.a ../generic/generic.a -o reinsert
+reinsert: reinsert.o ../includes/cdutils.h ../includes/yazedc.h ../lib/lib.a Makefile
+	${CXX} ${LDFLAGS} reinsert.o ../lib/lib.a -o reinsert
 
-Decrypt: Decrypt.o ../includes/generic.h ../generic/generic.a Makefile
-	${CXX} ${LDFLAGS} Decrypt.o ../generic/generic.a -o Decrypt
+Decrypt: Decrypt.o Makefile
+	${CXX} ${LDFLAGS} Decrypt.o -o Decrypt
 
-script-comp: script-comp.o ../includes/generic.h ../includes/lzss.h ../lib/lib.a ../generic/generic.a Makefile
-	${CXX} ${LDFLAGS} script-comp.o ../lib/lib.a ../generic/generic.a -o script-comp
+script-comp: script-comp.o ../includes/lzss.h ../lib/lib.a Makefile
+	${CXX} ${LDFLAGS} script-comp.o ../lib/lib.a -o script-comp
 
-script-dec: script-dec.o ../includes/generic.h ../includes/lzss.h ../lib/lib.a ../generic/generic.a Makefile
-	${CXX} ${LDFLAGS} script-dec.o ../lib/lib.a ../generic/generic.a -o script-dec
+script-dec: script-dec.o ../includes/lzss.h ../lib/lib.a Makefile
+	${CXX} ${LDFLAGS} script-dec.o ../lib/lib.a -o script-dec
 
 compil: compil.o
 	${CC} ${LDFLAGS} compil.o -o compil
diff --git a/Xenogears/main_dump.cpp b/Xenogears/main_dump.cpp
index 79b805d..c39a9fe 100644
--- a/Xenogears/main_dump.cpp
+++ b/Xenogears/main_dump.cpp
@@ -281,5 +281,4 @@ void file_dump(unsigned long debut, unsigned long taille, long num, int seq)
     f_out = 0;
     printm(M_BARE, "  (*) Dumped file number %4ld - type \"" + sequences[seq].name + "\"           \r", num);
 }
-
-} * Application = new Appli();
+CODE_ENDS
diff --git a/Xenogears/script-comp.cpp b/Xenogears/script-comp.cpp
index ca6fb09..964b350 100644
--- a/Xenogears/script-comp.cpp
+++ b/Xenogears/script-comp.cpp
@@ -15,7 +15,7 @@ lzss * lzss_o;
 void process_one_file(Handle * f, Handle * d, Handle * f_part, int n) {
     String nom_du_fichier;
     char zeros[4] = {0, 0, 0, 0}, * datas;
-    long script_position, true_length, delta, data_length;
+    int script_position, true_length, delta, data_length;
     printm(M_BARE, "  Copying header\n");
     
     f->seek(0x14c);
diff --git a/Xenogears/script-dec.cpp b/Xenogears/script-dec.cpp
index a829231..7fcc023 100644
--- a/Xenogears/script-dec.cpp
+++ b/Xenogears/script-dec.cpp
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include "lzss.h"
-#include "String.h"
+#include "BString.h"
 #include "Input.h"
 #include "Output.h"
 #include "Main.h"