From 97f6a480777588b97fe1016692a5ca7de7c0bb78 Mon Sep 17 00:00:00 2001 From: pixel Date: Fri, 5 Sep 2003 12:48:10 +0000 Subject: Starting to build the project MSVC - continued --- MSVC/Baltisot - generic/Baltisot - generic.vcproj | 22 +- MSVC/PSX-Bundle.sln | 8 + MSVC/Tools/MakInDir.bat | 27 ++ MSVC/Tools/Tools.vcproj | 89 +++++++ MSVC/Tools/makefile | 22 ++ MSVC/Tools/master.mak | 311 ++++++++++++++++++++++ Xenogears/Decrypt.cpp | 1 - Xenogears/nmakefile | 13 + bgrep.cpp | 7 +- nmakefile | 16 ++ 10 files changed, 504 insertions(+), 12 deletions(-) create mode 100644 MSVC/Tools/MakInDir.bat create mode 100644 MSVC/Tools/Tools.vcproj create mode 100644 MSVC/Tools/makefile create mode 100644 MSVC/Tools/master.mak create mode 100644 Xenogears/nmakefile create mode 100644 nmakefile diff --git a/MSVC/Baltisot - generic/Baltisot - generic.vcproj b/MSVC/Baltisot - generic/Baltisot - generic.vcproj index ddb7ca3..fbd3d67 100644 --- a/MSVC/Baltisot - generic/Baltisot - generic.vcproj +++ b/MSVC/Baltisot - generic/Baltisot - generic.vcproj @@ -95,6 +95,12 @@ + + + + + + + + - - - - - - diff --git a/MSVC/PSX-Bundle.sln b/MSVC/PSX-Bundle.sln index 5db6060..da7a778 100644 --- a/MSVC/PSX-Bundle.sln +++ b/MSVC/PSX-Bundle.sln @@ -3,6 +3,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Baltisot - generic", "Balti EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PSX-Bundle - library", "PSX-Bundle - library\PSX-Bundle - library.vcproj", "{0A2CD193-F270-4F2B-943C-F8BDF792D25C}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tools", "Tools\Tools.vcproj", "{6CAE7F4D-C27B-43F3-B30A-84C5F32EFA29}" +EndProject Global GlobalSection(SolutionConfiguration) = preSolution ConfigName.0 = Debug @@ -10,6 +12,8 @@ Global EndGlobalSection GlobalSection(ProjectDependencies) = postSolution {0A2CD193-F270-4F2B-943C-F8BDF792D25C}.0 = {879D8D90-9A7E-4F3C-9B4E-F1648C8AE927} + {6CAE7F4D-C27B-43F3-B30A-84C5F32EFA29}.0 = {879D8D90-9A7E-4F3C-9B4E-F1648C8AE927} + {6CAE7F4D-C27B-43F3-B30A-84C5F32EFA29}.1 = {0A2CD193-F270-4F2B-943C-F8BDF792D25C} EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}.Debug.ActiveCfg = Debug|Win32 @@ -20,6 +24,10 @@ Global {0A2CD193-F270-4F2B-943C-F8BDF792D25C}.Debug.Build.0 = Debug|Win32 {0A2CD193-F270-4F2B-943C-F8BDF792D25C}.Release.ActiveCfg = Release|Win32 {0A2CD193-F270-4F2B-943C-F8BDF792D25C}.Release.Build.0 = Release|Win32 + {6CAE7F4D-C27B-43F3-B30A-84C5F32EFA29}.Debug.ActiveCfg = Debug|Win32 + {6CAE7F4D-C27B-43F3-B30A-84C5F32EFA29}.Debug.Build.0 = Debug|Win32 + {6CAE7F4D-C27B-43F3-B30A-84C5F32EFA29}.Release.ActiveCfg = Release|Win32 + {6CAE7F4D-C27B-43F3-B30A-84C5F32EFA29}.Release.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/MSVC/Tools/MakInDir.bat b/MSVC/Tools/MakInDir.bat new file mode 100644 index 0000000..6c28109 --- /dev/null +++ b/MSVC/Tools/MakInDir.bat @@ -0,0 +1,27 @@ +@echo off + +if "%2" == "" echo. +if "%2" == "" echo USAGE: MakInDir [Directory] [Target] +if "%2" == "" echo ------ Directory: directory to run NMAKE within +if "%2" == "" echo ------ Target: the target of the NMAKE session +if "%2" == "" goto done + +cd %1 +echo on +nmake /f nmakefile /nologo %2 +@echo off +if errorlevel 0 goto finish else goto bomb + +:bomb +if "%OS%" == "" goto Win9xbomb else goto NTbomb + +:Win9xbomb +exit + +:NTbomb +exit 1 + +:finish +cd .. + +:done diff --git a/MSVC/Tools/Tools.vcproj b/MSVC/Tools/Tools.vcproj new file mode 100644 index 0000000..5ebd000 --- /dev/null +++ b/MSVC/Tools/Tools.vcproj @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MSVC/Tools/makefile b/MSVC/Tools/makefile new file mode 100644 index 0000000..f6960c4 --- /dev/null +++ b/MSVC/Tools/makefile @@ -0,0 +1,22 @@ +!IFNDEF COMMONTOOLSPATH +COMMONTOOLSPATH=$(MAKEDIR) +!ENDIF + +!include $(COMMONTOOLSPATH)\master.mak + +#------------------------------------------------------------------ + +all : + set COMMONTOOLSPATH=$(COMMONTOOLSPATH) + cd ..\.. + $(MAKE) /F nmakefile all + +clean : + set COMMONTOOLSPATH=$(COMMONTOOLSPATH) + cd ..\.. + $(MAKE) /f nmakefile clean + +rebuild: + set COMMONTOOLSPATH=$(COMMONTOOLSPATH) + cd ..\.. + $(MAKE) /f nmakefile clean all diff --git a/MSVC/Tools/master.mak b/MSVC/Tools/master.mak new file mode 100644 index 0000000..3cef157 --- /dev/null +++ b/MSVC/Tools/master.mak @@ -0,0 +1,311 @@ +!IFNDEF COMMONTOOLSPATH +!ERROR Env Variable COMMONTOOLSPATH must be defined +!ENDIF + +#-------------------------------------------------------------------------- +#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 + +#-------------------------------------------------------------------------- +#define the names of the compilers we ship +_BC=vbc.exe +_CL=cl.exe +_C1=C1.dll +_CX=c1xx.dll +_C2=c2.dll +_CS=csc.exe +_JS=jsc.exe +_ASSEM=ilasm.exe + +# Comment this line out to turn debug mode off +DEBUG=TRUE + +#-------------------------------------------------------------------------- +#Use the _MAKE_STOP environment variable if you want NMAKE to stop on error +# if not defined (default), NMAKE will IGNORE errors and continue +!IFNDEF _MAKE_STOP +.IGNORE : +!ENDIF +#--------------------------------------------------------------------------- + +#Allow builds with custom compiler path +!IFDEF CUST_CS +_CS=$(CUST_CS) +!ENDIF + +#define the names of some common tools +_TLBIMP=tlbimp.exe +_TLBEXP=tlbexp.exe +_REGASM=regasm.exe +_REGSVR=regsvr32.exe +_RSC=rc.exe +_RESGEN=resgen.exe +_AL=al.exe +_SHAREDNAME=sn.exe + +#IFDEF OS + +_MAKE_IN_DIR = $(COMMONTOOLSPATH)\MakInDir.bat + +#ELSE + +_MAKE_IN_DIR = call $(COMMONTOOLSPATH)\MakInDir.bat + +#ENDIF + +_GACUTIL=gacutil.exe +_WSDL=wsdl.exe +_XSD=xsd.exe + +#define our basic link line for managed code +_LINK=link.exe /INCREMENTAL /NOLOGO /DEBUG /SUBSYSTEM:CONSOLE /MACHINE:IX86 /NODEFAULTLIB:LIBC + +#this is used for compiling C# samples +#reset this in individual sample makefile to your imports if required +_IMPORTS= + +#this is used for compiling C# samples, that use Resources +#reset this in individual sample makefile to your resource imports if required +_WIN32RES= + +#This is used for compiling C# samples that use Assembly and key files +#reset this in individual sample makefile to your resource imports if required +_KEYFILE= + +#this is used for compiling C# samples +#set the default out directory to . +_OUTDIR=. + +#Set what to clean by default +!IFNDEF _CLEANFILES +_CLEANFILES=*.obj *.tlb *.reg +!ENDIF + +#set some command C++ flags +_CFLAGS=$(_CCFLAGS) /c + +#set debug as the default for c++ +_CDFLAGS=$(_CFLAGS) /Zi + +#set some command link flags +_LFLAGS=-noentry +_LDFLAGS=-noentry -dll + +!IFDEF DEBUG + +_CS_DLL_FLAGS=/nologo /t:library /debug+ $(TRACE) +_CS_EXE_FLAGS=/nologo /t:exe /debug+ $(TRACE) + +_VB_DLL_FLAGS=/nologo /t:library /debug+ $(TRACE) +_VB_EXE_FLAGS=/nologo /t:exe /debug+ $(TRACE) + +_JS_DLL_FLAGS=/nologo /t:library /debug+ $(TRACE) +_JS_EXE_FLAGS=/nologo /t:exe /debug+ $(TRACE) +_RESGEN_FLAGS= + +!ELSE + +_CS_DLL_FLAGS=/nologo /t:library $(TRACE) +_CS_EXE_FLAGS=/nologo $(TRACE) +_VB_DLL_FLAGS=/nologo /t:library $(TRACE) +_VB_EXE_FLAGS=/nologo /t:exe $(TRACE) +_JS_DLL_FLAGS=/nologo $(TRACE) +_JS_EXE_FLAGS=/nologo /exe $(TRACE) +_RESGEN_FLAGS= + +!ENDIF + +!IFDEF OS + +_RMDIR=rd /s /q + +!ELSE + +_RMDIR=deltree /y + +!ENDIF + +#default compile and link for c++ files building a dll +#note: name.cpp and name.dll must match +.cpp.dll: + if not exist $(_OUTDIR) md $(_OUTDIR) + $(_CL) $(_CDFLAGS) $*.cpp + $(_LINK) $(_LDFLAGS) $(_LIBS) $*.obj + +#default compile and link for c++ files building a exe +#note: name.cpp and name.dll must match +.cpp.exe: + if not exist $(_OUTDIR) md $(_OUTDIR) + $(_CL) $(_CDFLAGS) $*.cpp + $(_LINK) $(_LFLAGS) $(_LIBS) $*.obj + +#default compile and link for c++ files building an obj +#note: name.cpp and name.obj must match +.cpp.obj: + $(_CL) $(_CDFLAGS) $*.cpp + +#default compile and link for c++ files building an exe +#note: name.obj and name.exe must match +.obj.exe: + $(_LINK) $(_LFLAGS) $(_LIBS) $** + +#default compile and link for c++ files building a dll +.obj.dll: + $(_LINK) $(_LDFLAGS) $(_LIBS) $*.obj + +#default compiling vb files +.vb.dll: + if not exist $(_OUTDIR) md $(_OUTDIR) + $(_BC) $(_VB_DLL_FLAGS) $(_IMPORTS) /out:$(_OUTDIR)\$@ $** $(COMMONTOOLSPATH)\QuickStart\QSVersion.vb $(_WIN32RES) $(_KEYFILE) + +.vb.exe: + if not exist $(_OUTDIR) md $(_OUTDIR) + $(_BC) $(_VB_EXE_FLAGS) $(_IMPORTS) /out:$(_OUTDIR)\$@ $** $(COMMONTOOLSPATH)\QuickStart\QSVersion.vb $(_WIN32RES) $(_KEYFILE) + +#default compiling C# files +.cs.dll: + if not exist $(_OUTDIR) md $(_OUTDIR) + $(_CS) $(_CS_DLL_FLAGS) $(_IMPORTS) /out:$(_OUTDIR)\$@ $** $(COMMONTOOLSPATH)\QuickStart\QSVersion.cs $(_WIN32RES) $(_KEYFILE) + + +#default compiling C# files +.cs.exe: + if not exist $(_OUTDIR) md $(_OUTDIR) + $(_CS) $(_CS_EXE_FLAGS) $(_IMPORTS) /out:$(_OUTDIR)\$@ $** $(COMMONTOOLSPATH)\QuickStart\QSVersion.cs $(_WIN32RES) $(_KEYFILE) + + +#default compiling C# files +.js.dll: + if not exist $(_OUTDIR) md $(_OUTDIR) + $(_JS) $(_JS_DLL_FLAGS) $(_IMPORTS) /out:$(_OUTDIR)\$@ $** $(COMMONTOOLSPATH)\QuickStart\QSVersion.js $(_WIN32RES) $(_KEYFILE) + + +#default compiling C# files +.js.exe: + if not exist $(_OUTDIR) md $(_OUTDIR) + $(_JS) $(_JS_EXE_FLAGS) $(_IMPORTS) /out:$(_OUTDIR)\$@ $** $(COMMONTOOLSPATH)\QuickStart\QSVersion.js $(_WIN32RES) $(_KEYFILE) + +#default for registering an ocx + +.ocx.reg: + $(_REGSVR) /s $*.ocx + +#define for compiling il to an exe +.il.exe: + $(_ASSEM) $*.il + +#define for compiling il to a dll +.il.dll: + $(_ASSEM) $*.il /DLL + +#define for compiling asm to an exe +.asm.exe: + $(_ASSEM) $*.asm + +#define for compiling asm to an exe +.asm.dll: + $(_ASSEM) $*.asm /DLL + +#define for compiling Service Desc Language to C# (names must match (files & classes)) +.wsdl.cs: +!IFDEF _NAMESPACE +!IFDEF _SDLPATH + $(_WSDL) /l:CS /n:$(_NAMESPACE) /out:$*.cs $(_SDLPATH) +!ELSE + $(_WSDL) /l:CS /n:$(_NAMESPACE) /out:$*.cs $** +!ENDIF +!ELSE +!IFDEF _SDLPATH + $(_WSDL) /l:CS /n:$* /out:$*.cs $(_SDLPATH) +!ELSE + $(_WSDL) /l:CS /n:$* /out:$*.cs $** +!ENDIF +!ENDIF + +#define for compiling Service Desc Language to JScript (names must match (files & classes)) +.wsdl.js: +!IFDEF _NAMESPACE +!IFDEF _SDLPATH + $(_WSDL) /l:JS /n:$(_NAMESPACE) /out:$*.js $(_SDLPATH) +!ELSE + $(_WSDL) /l:JS /n:$(_NAMESPACE) /out:$*.js $** +!ENDIF +!ELSE +!IFDEF _SDLPATH + $(_WSDL) /l:JS /n:$*JS /out:$*.js $(_SDLPATH) +!ELSE + $(_WSDL) /l:JS /n:$*JS /out:$*.js $** +!ENDIF +!ENDIF + +#define for compiling Service Desc Language to VB (names must match (files & classes)) +.wsdl.vb: +!IFDEF _NAMESPACE +!IFDEF _SDLPATH + $(_WSDL) /l:VB /n:$(_NAMESPACE) /out:$*.vb $(_SDLPATH) +!ELSE + $(_WSDL) /l:VB /n:$(_NAMESPACE) /out:$*.vb $** +!ENDIF +!ELSE +!IFDEF _SDLPATH + $(_WSDL) /l:VB /n:$*VB /out:$*.vb $(_SDLPATH) +!ELSE + $(_WSDL) /l:VB /n:$*VB /out:$*.vb $** +!ENDIF +!ENDIF + +#define for compiling Service Desc Language from Web Service to JS +.asmx.js: +!IFDEF _NAMESPACE +!IFDEF _SDLPATH + $(_WSDL) /l:JS /n:$(_NAMESPACE) /out:$*.js $(_SDLPATH) +!ELSE + $(_WSDL) /l:JS /n:$(_NAMESPACE) /out:$*.js $** +!ENDIF +!ELSE +!IFDEF _SDLPATH + $(_WSDL) /l:JS /n:$*JS /out:$*.js $(_SDLPATH) +!ELSE + $(_WSDL) /l:JS /n:$*JS /out:$*.js $** +!ENDIF +!ENDIF + +#define for compiling Service Desc Language from Web Service to CSharp +.asmx.cs: +!IFDEF _NAMESPACE +!IFDEF _SDLPATH + $(_WSDL) /l:CS /n:$(_NAMESPACE) /out:$*.cs $(_SDLPATH) +!ELSE + $(_WSDL) /l:CS /n:$(_NAMESPACE) /out:$*.cs $** +!ENDIF +!ELSE +!IFDEF _SDLPATH + $(_WSDL) /l:CS /n:$* /out:$*.cs $(_SDLPATH) +!ELSE + $(_WSDL) /l:CS /n:$* /out:$*.cs $** +!ENDIF +!ENDIF + +#define for compiling Service Desc Language from Web Service to VB +.asmx.vb: +!IFDEF _NAMESPACE +!IFDEF _SDLPATH + $(_WSDL) /l:VB /n:$(_NAMESPACE) /out:$*.vb $(_SDLPATH) +!ELSE + $(_WSDL) /l:VB /n:$(_NAMESPACE) /out:$*.vb $** +!ENDIF +!ELSE +!IFDEF _SDLPATH + $(_WSDL) /l:VB /n:$*VB /out:$*.vb $(_SDLPATH) +!ELSE + $(_WSDL) /l:VB /n:$*VB /out:$*.vb $** +!ENDIF +!ENDIF + +#define for compiling RESX files to resource files using Resgen +.resX.resources: + $(_RESGEN) $(_RESGEN_FLAGS) $*.resX $*.resources + +#define for compiling .TXT files to resource files using Resgen +.txt.resources: + $(_RESGEN) $(_RESGEN_FLAGS) $*.txt $*.resources \ No newline at end of file diff --git a/Xenogears/Decrypt.cpp b/Xenogears/Decrypt.cpp index 8bee7c3..0683078 100644 --- a/Xenogears/Decrypt.cpp +++ b/Xenogears/Decrypt.cpp @@ -1,7 +1,6 @@ #include #include #include -#include #include "generic.h" #include "Input.h" #include "Output.h" diff --git a/Xenogears/nmakefile b/Xenogears/nmakefile new file mode 100644 index 0000000..3e3f4ad --- /dev/null +++ b/Xenogears/nmakefile @@ -0,0 +1,13 @@ +_CCFLAGS = /I ..\includes /I ..\generic\include /I ..\..\zlib +_LIBS = "..\MSVC\Baltisot - generic\Debug\Baltisot - generic.lib" ..\..\zlib\zlibdll.lib ..\..\zlib\zlibstat.lib + +!include $(COMMONTOOLSPATH)\master.mak + +#------------------------------------------------------------------ + +TARGETS = decrypt.exe + +all : $(TARGETS) + +clean : + -del /Q $(TARGETS) *.ilk *.pdb *.obj diff --git a/bgrep.cpp b/bgrep.cpp index 8759907..b3ff324 100644 --- a/bgrep.cpp +++ b/bgrep.cpp @@ -1,10 +1,12 @@ #include #include #include "Input.h" +#include "Main.h" #define THRESHOLD 20480 -int main(int argc, char ** argv) { +CODE_BEGINS +virtual int startup() throw (GeneralException) { unsigned int p = strtol(argv[1], 0, 0); char * fn = argv[2]; Handle * f = new Input(fn); @@ -26,4 +28,7 @@ int main(int argc, char ** argv) { } delete f; + + return 0; } +CODE_ENDS \ No newline at end of file diff --git a/nmakefile b/nmakefile new file mode 100644 index 0000000..9241859 --- /dev/null +++ b/nmakefile @@ -0,0 +1,16 @@ +_CCFLAGS = /I includes /I generic\include /I ..\zlib +_LIBS = "MSVC\Baltisot - generic\Debug\Baltisot - generic.lib" ..\zlib\zlibdll.lib ..\zlib\zlibstat.lib + +!include $(COMMONTOOLSPATH)\master.mak + +#------------------------------------------------------------------ + +TARGETS = bgrep.exe lzss-main.exe cd-tool.exe crypto-search.exe +SUBDIRS = Xenogears + +all : $(TARGETS) + for %i in ( $(SUBDIRS) ) do $(_MAKE_IN_DIR) %i all + +clean : + -del /Q $(TARGETS) *.ilk *.pdb *.obj + for %i in ( $(SUBDIRS) ) do $(_MAKE_IN_DIR) %i clean -- cgit v1.2.3