summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpixel <pixel>2003-09-05 23:12:26 +0000
committerpixel <pixel>2003-09-05 23:12:26 +0000
commit23e2f62a8cc7b92826307fda62676b01d54bf9de (patch)
treeb9f38ad831ec0ef7adbe8bba123b61176d2d762f
parent343acb603be88ce4e9ac75de1d5ff64c086dfd77 (diff)
Still some more VC7++ port...
-rw-r--r--MSVC/Tools/Links.htm12
-rw-r--r--MSVC/Tools/Tools.vcproj29
-rw-r--r--MSVC/Tools/master.mak10
-rw-r--r--Xenogears/nmakefile2
-rw-r--r--Xenogears/reinsert.cpp1
-rw-r--r--Xenogears/script-dec.cpp1
-rw-r--r--lib/cdutils.cpp3
7 files changed, 53 insertions, 5 deletions
diff --git a/MSVC/Tools/Links.htm b/MSVC/Tools/Links.htm
new file mode 100644
index 0000000..7970b6f
--- /dev/null
+++ b/MSVC/Tools/Links.htm
@@ -0,0 +1,12 @@
+<HTML>
+ <HEAD>
+ <TITLE></TITLE>
+ <META NAME="GENERATOR" Content="Microsoft Visual Studio 7.0">
+ </HEAD>
+ <BODY>
+ <P>Flex parser: <A href="http://www.monmouth.com/~wstreett/lex-yacc/flex.exe">http://www.monmouth.com/~wstreett/lex-yacc/flex.exe</A></P>
+ <P>Gawk processor: http://topeka.isri.cmu.edu/~jusung/gc/gawk.98.exe</P>
+ <P>Zlib used: <A href="http://www.winimage.com/zLibDll/zlib114dll.zip">http://www.winimage.com/zLibDll/zlib114dll.zip</A></P>
+ <P>&nbsp;</P>
+ </BODY>
+</HTML>
diff --git a/MSVC/Tools/Tools.vcproj b/MSVC/Tools/Tools.vcproj
index eb6d59b..7576dfa 100644
--- a/MSVC/Tools/Tools.vcproj
+++ b/MSVC/Tools/Tools.vcproj
@@ -57,8 +57,33 @@
RelativePath="..\..\Xenogears\Decrypt.cpp">
</File>
<File
+ RelativePath="..\..\Xenogears\compil.lex">
+ </File>
+ <File
RelativePath="..\..\Xenogears\main_dump.cpp">
</File>
+ <File
+ RelativePath="..\..\Xenogears\reinsert.cpp">
+ </File>
+ <File
+ RelativePath="..\..\Xenogears\script-comp.cpp">
+ </File>
+ <File
+ RelativePath="..\..\Xenogears\script-dec.cpp">
+ </File>
+ <Filter
+ Name="Helpers"
+ Filter="">
+ <File
+ RelativePath="..\..\Xenogears\XenoCD1.map">
+ </File>
+ <File
+ RelativePath="..\..\Xenogears\XenoCD2.map">
+ </File>
+ <File
+ RelativePath="..\..\Xenogears\map2sqr">
+ </File>
+ </Filter>
</Filter>
<Filter
Name="Makefiles">
@@ -86,6 +111,10 @@
</File>
</Filter>
</Filter>
+ <File
+ RelativePath="Links.htm"
+ DeploymentContent="TRUE">
+ </File>
</Files>
<Globals>
</Globals>
diff --git a/MSVC/Tools/master.mak b/MSVC/Tools/master.mak
index bb12dce..5811ec5 100644
--- a/MSVC/Tools/master.mak
+++ b/MSVC/Tools/master.mak
@@ -4,7 +4,7 @@
#--------------------------------------------------------------------------
#needed so we can say foo.dll: foo.cpp and it will just work
-.SUFFIXES: .tlb .il .dll .cpp .js .cs .vb .rc .ocx .reg .resources .txt .resX .wsdl .asmx
+.SUFFIXES: .tlb .il .dll .cpp .js .cs .vb .rc .ocx .reg .resources .txt .resX .wsdl .asmx .lex
#--------------------------------------------------------------------------
#define the names of the compilers we ship
@@ -42,6 +42,7 @@ _RSC=rc.exe
_RESGEN=resgen.exe
_AL=al.exe
_SHAREDNAME=sn.exe
+_LEX=flex.exe
#IFDEF OS
@@ -133,12 +134,17 @@ _RMDIR=deltree /y
$(_LINK) $(_LDFLAGS) $(_LIBS) $*.obj
#default compile and link for c++ files building a exe
-#note: name.cpp and name.dll must match
+#note: name.cpp and name.exe must match
.cpp.exe:
if not exist $(_OUTDIR) md $(_OUTDIR)
$(_CL) $(_CDFLAGS) $*.cpp
$(_LINK) $(_LFLAGS) $(_LIBS) $*.obj
+.lex.exe:
+ if not exist $(_OUTDIR) md $(_OUTDIR)
+ $(_LEX) -o$*.c $*.lex
+ $(_CL) $(CDFLAGS) $*.c
+
#default compile and link for c++ files building an obj
#note: name.cpp and name.obj must match
.cpp.obj:
diff --git a/Xenogears/nmakefile b/Xenogears/nmakefile
index 9feae9e..9bad2fa 100644
--- a/Xenogears/nmakefile
+++ b/Xenogears/nmakefile
@@ -5,7 +5,7 @@ _LIBS = "..\MSVC\Baltisot - generic\Debug\Baltisot - generic.lib" "..\MSVC\PSX-B
#------------------------------------------------------------------
-TARGETS = decrypt.exe main_dump.exe
+TARGETS = decrypt.exe main_dump.exe script-dec.exe script-comp.exe compil.exe reinsert.exe
all : $(TARGETS)
diff --git a/Xenogears/reinsert.cpp b/Xenogears/reinsert.cpp
index da23033..bf60cb4 100644
--- a/Xenogears/reinsert.cpp
+++ b/Xenogears/reinsert.cpp
@@ -1,7 +1,6 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <unistd.h>
#include "cdutils.h"
#include "generic.h"
#include "Input.h"
diff --git a/Xenogears/script-dec.cpp b/Xenogears/script-dec.cpp
index 7fcc023..55edb31 100644
--- a/Xenogears/script-dec.cpp
+++ b/Xenogears/script-dec.cpp
@@ -1,6 +1,5 @@
#include <stdio.h>
#include <stdlib.h>
-#include <unistd.h>
#include "lzss.h"
#include "BString.h"
#include "Input.h"
diff --git a/lib/cdutils.cpp b/lib/cdutils.cpp
index 7130c87..81744e8 100644
--- a/lib/cdutils.cpp
+++ b/lib/cdutils.cpp
@@ -342,6 +342,9 @@ int cdutils::show_entry(struct DirEntry * dir) {
strcpy(pbuf, "..");
}
+ if (dir->Year < 70)
+ dir->Year += 100;
+
printm(M_BARE, "%6i - %8i - %2i/%02i/%04i - %2i:%02i:%02i%+03.1f - %c%c%c%c%c%c%c%c - %s\n",
dir->Sector, dir->Size, dir->Day, dir->Month, dir->Year + 1900, dir->Hour, dir->Minute, dir->Second, ((float) dir->Offset) / 4,
dir->Flags & 1 ? 'H' : '-', dir->Flags & 2 ? 'D' : '-', dir->Flags & 4 ? 'A' : '-', dir->Flags & 8 ? 'R' : '-',