summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MSVC/Baltisot - generic/Baltisot - generic.vcproj3
-rw-r--r--MSVC/Tools/Tools.vcproj8
-rw-r--r--MSVC/Tools/makefile12
-rw-r--r--MSVC/Tools/master.mak22
-rw-r--r--PE/nmakefile4
-rw-r--r--Xenogears/nmakefile4
-rw-r--r--cd-tool.cpp16
-rw-r--r--nmakefile4
8 files changed, 45 insertions, 28 deletions
diff --git a/MSVC/Baltisot - generic/Baltisot - generic.vcproj b/MSVC/Baltisot - generic/Baltisot - generic.vcproj
index 28277e5..aa9996b 100644
--- a/MSVC/Baltisot - generic/Baltisot - generic.vcproj
+++ b/MSVC/Baltisot - generic/Baltisot - generic.vcproj
@@ -162,6 +162,9 @@
Name="Documentation"
Filter="">
<File
+ RelativePath="..\..\generic\doc\API">
+ </File>
+ <File
RelativePath="..\..\generic\doc\README">
</File>
<File
diff --git a/MSVC/Tools/Tools.vcproj b/MSVC/Tools/Tools.vcproj
index 531e0a3..0abb1ad 100644
--- a/MSVC/Tools/Tools.vcproj
+++ b/MSVC/Tools/Tools.vcproj
@@ -17,8 +17,8 @@
ConfigurationType="0">
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake all"
- ReBuildCommandLine="nmake rebuild"
+ BuildCommandLine="nmake debugall"
+ ReBuildCommandLine="nmake debugrebuild"
CleanCommandLine="nmake clean"/>
</Configuration>
<Configuration
@@ -29,8 +29,8 @@
<Tool
Name="VCNMakeTool"
BuildCommandLine="nmake all"
- ReBuildCommandLine="nmake clear all"
- CleanCommandLine="nmake clear"/>
+ ReBuildCommandLine="nmake rebuild"
+ CleanCommandLine="nmake clean"/>
</Configuration>
</Configurations>
<Files>
diff --git a/MSVC/Tools/makefile b/MSVC/Tools/makefile
index 10ec37c..5373e4a 100644
--- a/MSVC/Tools/makefile
+++ b/MSVC/Tools/makefile
@@ -9,6 +9,12 @@ all :
cd ..\..
$(MAKE) /F nmakefile all
+debugall :
+ set COMMONTOOLSPATH=$(COMMONTOOLSPATH)
+ set DEBUG=true
+ cd ..\..
+ $(MAKE) /F nmakefile all
+
clean :
set COMMONTOOLSPATH=$(COMMONTOOLSPATH)
cd ..\..
@@ -18,3 +24,9 @@ rebuild:
set COMMONTOOLSPATH=$(COMMONTOOLSPATH)
cd ..\..
$(MAKE) /f nmakefile clean all
+
+debugrebuild:
+ set COMMONTOOLSPATH=$(COMMONTOOLSPATH)
+ set DEBUG=true
+ cd ..\..
+ $(MAKE) /f nmakefile clean all
diff --git a/MSVC/Tools/master.mak b/MSVC/Tools/master.mak
index 07cf981..8d186b8 100644
--- a/MSVC/Tools/master.mak
+++ b/MSVC/Tools/master.mak
@@ -1,7 +1,3 @@
-!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 .lex
@@ -18,7 +14,7 @@ _JS=jsc.exe
_ASSEM=ilasm.exe
# Comment this line out to turn debug mode off
-DEBUG=TRUE
+#DEBUG=TRUE
#--------------------------------------------------------------------------
#Use the _MAKE_STOP environment variable if you want NMAKE to stop on error
@@ -44,22 +40,18 @@ _AL=al.exe
_SHAREDNAME=sn.exe
_LEX=flex.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
+!IFDEF DEBUG
_LINK=link.exe /INCREMENTAL /NOLOGO /DEBUG /SUBSYSTEM:CONSOLE /MACHINE:IX86 /NODEFAULTLIB:LIBC
+!ELSE
+_LINK=link.exe /INCREMENTAL /NOLOGO /SUBSYSTEM:CONSOLE /MACHINE:IX86 /NODEFAULTLIB:LIBCD
+!ENDIF
#this is used for compiling C# samples
#reset this in individual sample makefile to your imports if required
@@ -86,7 +78,11 @@ _CLEANFILES=*.obj *.tlb *.reg
_CFLAGS=$(_CCFLAGS) /c /EHsc /D "_WINDOWS" /D "ZLIB_DLL"
#set debug as the default for c++
+!IFDEF DEBUG
_CDFLAGS=$(_CFLAGS) /Zi
+!ELSE
+_CDFLAGS=$(_CFLAGS)
+!ENDIF
#set some command link flags
_LFLAGS=-noentry
diff --git a/PE/nmakefile b/PE/nmakefile
index cab1737..58d0230 100644
--- a/PE/nmakefile
+++ b/PE/nmakefile
@@ -1,5 +1,9 @@
_CCFLAGS = /I ..\includes /I ..\generic\include /I ..\..\zlib
+!IFDEF DEBUG
_LIBS = "..\MSVC\Baltisot - generic\Debug\Baltisot - generic.lib" "..\MSVC\PSX-Bundle - library\Debug\PSX-Bundle - library.lib" ..\..\zlib\dll32\zlib.lib ..\..\zlib\static32\zlibstat.lib
+!ELSE
+_LIBS = "..\MSVC\Baltisot - generic\Release\Baltisot - generic.lib" "..\MSVC\PSX-Bundle - library\Release\PSX-Bundle - library.lib" ..\..\zlib\dll32\zlib.lib ..\..\zlib\static32\zlibstat.lib
+!ENDIF
!include ..\MSVC\Tools\master.mak
diff --git a/Xenogears/nmakefile b/Xenogears/nmakefile
index d41bd71..640a9ee 100644
--- a/Xenogears/nmakefile
+++ b/Xenogears/nmakefile
@@ -1,5 +1,9 @@
_CCFLAGS = /I ..\includes /I ..\generic\include /I ..\..\zlib
+!IFDEF DEBUG
_LIBS = "..\MSVC\Baltisot - generic\Debug\Baltisot - generic.lib" "..\MSVC\PSX-Bundle - library\Debug\PSX-Bundle - library.lib" ..\..\zlib\dll32\zlib.lib ..\..\zlib\static32\zlibstat.lib
+!ELSE
+_LIBS = "..\MSVC\Baltisot - generic\Release\Baltisot - generic.lib" "..\MSVC\PSX-Bundle - library\Release\PSX-Bundle - library.lib" ..\..\zlib\dll32\zlib.lib ..\..\zlib\static32\zlibstat.lib
+!ENDIF
!include ..\MSVC\Tools\master.mak
diff --git a/cd-tool.cpp b/cd-tool.cpp
index cf7578b..e748aec 100644
--- a/cd-tool.cpp
+++ b/cd-tool.cpp
@@ -45,14 +45,10 @@ CODE_BEGINS
public:
Appli() : cdutil(0), iso_r(0), iso_w(0), file(0) {}
virtual ~Appli() {
- if (cdutil)
- delete cdutil;
- if (iso_r)
- delete iso_r;
- if (iso_w)
- delete iso_w;
- if (file)
- delete file;
+ delete cdutil;
+ delete iso_r;
+ delete iso_w;
+ delete file;
}
private:
@@ -169,7 +165,6 @@ virtual int startup() throw (GeneralException) {
}
printm(M_STATUS, "Reading path %s to file %s.\n", arg2, arg1);
cdutil->read_file(file, type, dir.Sector, dir.Size);
- delete file;
} else if (!strcmp(argv[optind], "extract")) {
optind++;
if ((argc - 3) != optind) {
@@ -183,7 +178,6 @@ virtual int startup() throw (GeneralException) {
file = new Output(arg1);
printm(M_STATUS, "Reading %i bytes from sector %i to file %s.\n", size, sector, arg1);
cdutil->read_file(file, type, sector, size);
- delete file;
} else if (!strcmp(argv[optind], "insert-file")) {
cdutils::DirEntry dir, * d;
unsigned char * buffer;
@@ -240,7 +234,7 @@ virtual int startup() throw (GeneralException) {
}
d = cdutil->find_dir_entry(&buffer, &dir, f);
d->Size = file->GetSize();
- cdutil->write_datas(buffer, GUESS, dir.Sector, dir.Size);
+ // cdutil->write_datas(buffer, GUESS, dir.Sector, dir.Size);
free(buffer);
} else if (!strcmp(argv[optind], "insert")) {
if (ppf) {
diff --git a/nmakefile b/nmakefile
index 6c93a27..8ac283a 100644
--- a/nmakefile
+++ b/nmakefile
@@ -1,5 +1,9 @@
_CCFLAGS = /I includes /I generic\include /I ..\zlib /I msvc/getopt
+!IFDEF DEBUG
_LIBS = "MSVC\Baltisot - generic\Debug\Baltisot - generic.lib" "MSVC\PSX-Bundle - library\Debug\PSX-Bundle - library.lib" ..\zlib\dll32\zlib.lib ..\zlib\static32\zlibstat.lib
+!ELSE
+_LIBS = "MSVC\Baltisot - generic\Release\Baltisot - generic.lib" "MSVC\PSX-Bundle - library\Release\PSX-Bundle - library.lib" ..\zlib\dll32\zlib.lib ..\zlib\static32\zlibstat.lib
+!ENDIF
!include MSVC\Tools\master.mak
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-25 02:14:50 +0000