From 19efdee15fba412475430df96df38e2c7e4de9a1 Mon Sep 17 00:00:00 2001 From: pixel Date: Fri, 5 Sep 2003 21:35:15 +0000 Subject: Trying to poke the makefile... --- MSVC/Baltisot - generic/Baltisot - generic.vcproj | 4 ++-- MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj | 4 ++-- MSVC/Tools/makefile | 2 -- MSVC/Tools/master.mak | 2 +- Xenogears/nmakefile | 2 +- nmakefile | 2 +- 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/MSVC/Baltisot - generic/Baltisot - generic.vcproj b/MSVC/Baltisot - generic/Baltisot - generic.vcproj index a6253a9..28277e5 100644 --- a/MSVC/Baltisot - generic/Baltisot - generic.vcproj +++ b/MSVC/Baltisot - generic/Baltisot - generic.vcproj @@ -20,7 +20,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\generic\include;..\..\..\zlib" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + PreprocessorDefinitions="_WINDOWS;ZLIB_DLL" MinimalRebuild="TRUE" BasicRuntimeChecks="3" RuntimeLibrary="5" @@ -58,7 +58,7 @@ InlineFunctionExpansion="1" OmitFramePointers="TRUE" AdditionalIncludeDirectories="..\..\generic\include;..\..\..\zlib" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + PreprocessorDefinitions="_WINDOWS;ZLIB_DLL" StringPooling="TRUE" RuntimeLibrary="4" EnableFunctionLevelLinking="TRUE" diff --git a/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj b/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj index 4baf4f4..f3537ed 100644 --- a/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj +++ b/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj @@ -20,7 +20,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\generic\include;..\..\includes;..\..\..\zlib" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + PreprocessorDefinitions="_WINDOWS;ZLIB_DLL" MinimalRebuild="TRUE" BasicRuntimeChecks="3" RuntimeLibrary="5" @@ -58,7 +58,7 @@ InlineFunctionExpansion="1" OmitFramePointers="TRUE" AdditionalIncludeDirectories="..\..\generic\include;..\..\includes;..\..\..\zlib" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + PreprocessorDefinitions="_WINDOWS;ZLIB_DLL" StringPooling="TRUE" RuntimeLibrary="4" EnableFunctionLevelLinking="TRUE" diff --git a/MSVC/Tools/makefile b/MSVC/Tools/makefile index f6960c4..1757440 100644 --- a/MSVC/Tools/makefile +++ b/MSVC/Tools/makefile @@ -1,6 +1,4 @@ -!IFNDEF COMMONTOOLSPATH COMMONTOOLSPATH=$(MAKEDIR) -!ENDIF !include $(COMMONTOOLSPATH)\master.mak diff --git a/MSVC/Tools/master.mak b/MSVC/Tools/master.mak index 87b3aeb..a57cfc7 100644 --- a/MSVC/Tools/master.mak +++ b/MSVC/Tools/master.mak @@ -82,7 +82,7 @@ _CLEANFILES=*.obj *.tlb *.reg !ENDIF #set some command C++ flags -_CFLAGS=$(_CCFLAGS) /c /EHsc +_CFLAGS=$(_CCFLAGS) /c /EHsc /D "_WINDOWS" /D "ZLIB_DLL" #set debug as the default for c++ _CDFLAGS=$(_CFLAGS) /Zi diff --git a/Xenogears/nmakefile b/Xenogears/nmakefile index 2f62663..9feae9e 100644 --- a/Xenogears/nmakefile +++ b/Xenogears/nmakefile @@ -1,5 +1,5 @@ _CCFLAGS = /I ..\includes /I ..\generic\include /I ..\..\zlib -_LIBS = "..\MSVC\Baltisot - generic\Debug\Baltisot - generic.lib" "..\MSVC\PSX-Bundle - library\Debug\PSX-Bundle - library.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\dll32\zlib.lib ..\..\zlib\static32\zlibstat.lib !include $(COMMONTOOLSPATH)\master.mak diff --git a/nmakefile b/nmakefile index af66aff..c6f6592 100644 --- a/nmakefile +++ b/nmakefile @@ -1,5 +1,5 @@ _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 +_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 !include $(COMMONTOOLSPATH)\master.mak -- cgit v1.2.3