From 23e2f62a8cc7b92826307fda62676b01d54bf9de Mon Sep 17 00:00:00 2001 From: pixel Date: Fri, 5 Sep 2003 23:12:26 +0000 Subject: Still some more VC7++ port... --- MSVC/Tools/Links.htm | 12 ++++++++++++ MSVC/Tools/Tools.vcproj | 29 +++++++++++++++++++++++++++++ MSVC/Tools/master.mak | 10 ++++++++-- Xenogears/nmakefile | 2 +- Xenogears/reinsert.cpp | 1 - Xenogears/script-dec.cpp | 1 - lib/cdutils.cpp | 3 +++ 7 files changed, 53 insertions(+), 5 deletions(-) create mode 100644 MSVC/Tools/Links.htm 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 @@ + + + + + + +

Flex parser: http://www.monmouth.com/~wstreett/lex-yacc/flex.exe

Gawk processor: http://topeka.isri.cmu.edu/~jusung/gc/gawk.98.exe

Zlib used: http://www.winimage.com/zLibDll/zlib114dll.zip

+ + 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 @@ -56,9 +56,34 @@ + + + + + + + + + + + + + + + + @@ -86,6 +111,10 @@ + + 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 #include #include -#include #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 #include -#include #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' : '-', -- cgit v1.2.3