From 4a5e6ba6ba48ced51222dbda36a3d3dd99d75ec5 Mon Sep 17 00:00:00 2001 From: pixel Date: Fri, 5 Sep 2003 13:24:52 +0000 Subject: Added getopt code and fixed some more windows things. --- MSVC/Baltisot - generic/Baltisot - generic.vcproj | 13 +++++++++ .../PSX-Bundle - library.vcproj | 31 ++++++++++++++++++++++ MSVC/Tools/Tools.vcproj | 3 +++ Xenogears/main_dump.cpp | 3 +-- Xenogears/nmakefile | 4 +-- cd-tool.cpp | 1 - crypto-search.cpp | 6 ++++- lzss-main.cpp | 4 ++- nmakefile | 4 +-- 9 files changed, 60 insertions(+), 9 deletions(-) diff --git a/MSVC/Baltisot - generic/Baltisot - generic.vcproj b/MSVC/Baltisot - generic/Baltisot - generic.vcproj index fbd3d67..a6253a9 100644 --- a/MSVC/Baltisot - generic/Baltisot - generic.vcproj +++ b/MSVC/Baltisot - generic/Baltisot - generic.vcproj @@ -177,6 +177,19 @@ RelativePath="..\..\generic\doc\rfc959.txt"> + + + + + + + + diff --git a/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj b/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj index df944fb..44bfe6a 100644 --- a/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj +++ b/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj @@ -124,6 +124,37 @@ RelativePath="..\..\includes\yazedc.h"> + + + + + + + + + + + + + + + + + + + + diff --git a/MSVC/Tools/Tools.vcproj b/MSVC/Tools/Tools.vcproj index 5ebd000..eb6d59b 100644 --- a/MSVC/Tools/Tools.vcproj +++ b/MSVC/Tools/Tools.vcproj @@ -56,6 +56,9 @@ + + diff --git a/Xenogears/main_dump.cpp b/Xenogears/main_dump.cpp index c39a9fe..65b7466 100644 --- a/Xenogears/main_dump.cpp +++ b/Xenogears/main_dump.cpp @@ -27,7 +27,6 @@ #include #include #include -#include #include "cdutils.h" #include "generic.h" #include "Input.h" @@ -113,7 +112,7 @@ virtual int startup() throw (GeneralException) printm(M_STATUS, "Entering files read sequence\n"); read_files(); - exit(0); + return 0; } /* diff --git a/Xenogears/nmakefile b/Xenogears/nmakefile index 3e3f4ad..2f62663 100644 --- a/Xenogears/nmakefile +++ b/Xenogears/nmakefile @@ -1,11 +1,11 @@ _CCFLAGS = /I ..\includes /I ..\generic\include /I ..\..\zlib -_LIBS = "..\MSVC\Baltisot - generic\Debug\Baltisot - generic.lib" ..\..\zlib\zlibdll.lib ..\..\zlib\zlibstat.lib +_LIBS = "..\MSVC\Baltisot - generic\Debug\Baltisot - generic.lib" "..\MSVC\PSX-Bundle - library\Debug\PSX-Bundle - library.lib" ..\..\zlib\zlibdll.lib ..\..\zlib\zlibstat.lib !include $(COMMONTOOLSPATH)\master.mak #------------------------------------------------------------------ -TARGETS = decrypt.exe +TARGETS = decrypt.exe main_dump.exe all : $(TARGETS) diff --git a/cd-tool.cpp b/cd-tool.cpp index 38131b6..9facf0e 100644 --- a/cd-tool.cpp +++ b/cd-tool.cpp @@ -24,7 +24,6 @@ #include #include #include -#include #include "Input.h" #include "Output.h" #include "cdreader.h" diff --git a/crypto-search.cpp b/crypto-search.cpp index d08efc2..bd6cf4c 100644 --- a/crypto-search.cpp +++ b/crypto-search.cpp @@ -19,9 +19,13 @@ #include #include +#ifdef __linux__ #include +#else +#define MAXINT INT_MAX +#define MININT INT_MIN +#endif #include -#include #include "generic.h" #include "Input.h" #include "Main.h" diff --git a/lzss-main.cpp b/lzss-main.cpp index ed07eec..50f40bc 100644 --- a/lzss-main.cpp +++ b/lzss-main.cpp @@ -168,10 +168,12 @@ virtual int startup() throw (GeneralException) { p = strlen(pname) - 5; verbosity = M_STATUS; - + +#ifdef __linux__ if (!strcasecmp(pname + p, "dlzss")) { lzsscompress = 0; } +#endif printm(M_BARE, LZSS_NAME + " compressor/decompressor version " + LZSS_VERSION + ",\n" diff --git a/nmakefile b/nmakefile index 9241859..af66aff 100644 --- a/nmakefile +++ b/nmakefile @@ -1,5 +1,5 @@ -_CCFLAGS = /I includes /I generic\include /I ..\zlib -_LIBS = "MSVC\Baltisot - generic\Debug\Baltisot - generic.lib" ..\zlib\zlibdll.lib ..\zlib\zlibstat.lib +_CCFLAGS = /I includes /I generic\include /I ..\zlib /I msvc/getopt +_LIBS = "MSVC\Baltisot - generic\Debug\Baltisot - generic.lib" "MSVC\PSX-Bundle - library\Debug\PSX-Bundle - library.lib" ..\zlib\zlibdll.lib ..\zlib\zlibstat.lib !include $(COMMONTOOLSPATH)\master.mak -- cgit v1.2.3