From d576166c99d936a9339f5db68dd8a5574e1f9098 Mon Sep 17 00:00:00 2001 From: Dominik Tugend Date: Tue, 29 Oct 2013 18:08:07 +0100 Subject: [PATCH 1/2] Fixed VC++ 6.0 .dsp files Minor fixes to make sure the code compiles without errors. --- dlls/hl.dsp | 2 +- utils/mkmovie/mkmovie.dsp | 6 +++--- utils/studiomdl/studiomdl.dsp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/hl.dsp b/dlls/hl.dsp index 13ef157..c551ced 100644 --- a/dlls/hl.dsp +++ b/dlls/hl.dsp @@ -62,7 +62,7 @@ SOURCE="$(InputPath)" BuildCmds= \ call ..\filecopy.bat $(InputPath) $(ProjDir)\..\..\game\mod\dlls\$(InputName).dll \ - call ..\filecopy.bat $(InputDir)\$(InputName).pdb $(ProjDir)\..\..\game\moddlls\$(InputName).pdb \ + call ..\filecopy.bat $(InputDir)\$(InputName).pdb $(ProjDir)\..\..\game\mod\dlls\$(InputName).pdb \ "$(ProjDir)\..\..\game\mod\dlls\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" diff --git a/utils/mkmovie/mkmovie.dsp b/utils/mkmovie/mkmovie.dsp index b2f5993..4bed82d 100644 --- a/utils/mkmovie/mkmovie.dsp +++ b/utils/mkmovie/mkmovie.dsp @@ -1,5 +1,5 @@ # Microsoft Developer Studio Project File - Name="mkmovie" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 +# Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 @@ -40,7 +40,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -63,7 +63,7 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/utils/studiomdl/studiomdl.dsp b/utils/studiomdl/studiomdl.dsp index f7b399c..9551160 100644 --- a/utils/studiomdl/studiomdl.dsp +++ b/utils/studiomdl/studiomdl.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir ".\Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FR /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\common" /I "..\..\common" /I "..\..\public" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FR /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -64,7 +64,7 @@ LINK32=link.exe # PROP Intermediate_Dir ".\Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FR /YX /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\common" /I "..\..\common" /I "..\..\public" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FR /YX /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe From 989fa5c42e72fa0345e19b79632b79f394cd7f36 Mon Sep 17 00:00:00 2001 From: Dominik Tugend Date: Tue, 29 Oct 2013 18:15:14 +0100 Subject: [PATCH 2/2] CRLF for .bat too --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index 3b8a251..fea6f6f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,5 @@ # Force CRLF for Windows files: +*.bat text eol=crlf *.dsp text eol=crlf *.dsw text eol=crlf *.sln text eol=crlf