Add new files.
Add the SDL include directories. This removes dxutil.cpp,h. This won't compile until I commit the new RageTimer, which will be in a moment. Increase the default warning level to 4. (Thought I committed that; maybe I only did it for one build.) I think the rest is just harmless cruft changes from VC that happen every time someone commits to these files.
This commit is contained in:
@@ -43,7 +43,7 @@ RSC=rc.exe
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
|
||||
# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /Ob2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FR /YX /FD /c
|
||||
# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /Ob2 /I "SDL-1.2.5\include" /I "SDL_image-1.2" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FR /YX /FD /c
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
||||
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
||||
@@ -56,7 +56,7 @@ LINK32=link.exe
|
||||
# ADD LINK32 $(intdir)\verstub.obj /nologo /subsystem:windows /map /debug /machine:I386
|
||||
# Begin Special Build Tool
|
||||
IntDir=.\../Release6
|
||||
TargetDir=\stepmania\stepmania
|
||||
TargetDir=\temp\stepmania
|
||||
TargetName=StepMania
|
||||
SOURCE="$(InputPath)"
|
||||
PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
|
||||
@@ -77,7 +77,7 @@ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
|
||||
# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "DEBUG" /Fr /YX"stdafx.h" /FD /GZ /c
|
||||
# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "SDL-1.2.5\include" /I "SDL_image-1.2" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "DEBUG" /Fr /YX"stdafx.h" /FD /GZ /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
||||
# ADD BASE RSC /l 0x409 /d "_DEBUG"
|
||||
@@ -91,7 +91,7 @@ LINK32=link.exe
|
||||
# SUBTRACT LINK32 /profile /incremental:no /nodefaultlib
|
||||
# Begin Special Build Tool
|
||||
IntDir=.\../Debug6
|
||||
TargetDir=\stepmania\stepmania
|
||||
TargetDir=\temp\stepmania
|
||||
TargetName=StepMania-debug
|
||||
SOURCE="$(InputPath)"
|
||||
PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
|
||||
@@ -107,6 +107,34 @@ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania
|
||||
# Begin Group "Rage"
|
||||
|
||||
# PROP Default_Filter ""
|
||||
# Begin Group "Helpers"
|
||||
|
||||
# PROP Default_Filter ""
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\SDL_dither.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\SDL_dither.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\SDL_rotozoom.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\SDL_rotozoom.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\SDL_utils.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\SDL_utils.h
|
||||
# End Source File
|
||||
# End Group
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\RageBitmapTexture.cpp
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/EHa"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""
|
||||
AdditionalIncludeDirectories="SDL-1.2.5/include,SDL_image-1.2"
|
||||
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,DEBUG"
|
||||
ExceptionHandling="FALSE"
|
||||
BasicRuntimeChecks="3"
|
||||
@@ -92,7 +92,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
|
||||
WholeProgramOptimization="TRUE">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/EHa "
|
||||
AdditionalOptions="/EHa"
|
||||
Optimization="3"
|
||||
GlobalOptimizations="TRUE"
|
||||
InlineFunctionExpansion="2"
|
||||
@@ -100,7 +100,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
|
||||
FavorSizeOrSpeed="2"
|
||||
OptimizeForProcessor="2"
|
||||
OptimizeForWindowsApplication="TRUE"
|
||||
AdditionalIncludeDirectories="DevIL\include"
|
||||
AdditionalIncludeDirectories="SDL-1.2.5/include,SDL_image-1.2"
|
||||
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,RELEASE"
|
||||
StringPooling="TRUE"
|
||||
MinimalRebuild="FALSE"
|
||||
@@ -114,7 +114,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
|
||||
ObjectFile=".\../Release/"
|
||||
ProgramDataBaseFileName=".\../Release/"
|
||||
BrowseInformation="1"
|
||||
WarningLevel="3"
|
||||
WarningLevel="4"
|
||||
SuppressStartupBanner="TRUE"
|
||||
DebugInformationFormat="3"/>
|
||||
<Tool
|
||||
@@ -126,6 +126,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories=""
|
||||
IgnoreDefaultLibraryNames="wininet.lib;msimg32.lib"
|
||||
ProgramDatabaseFile=".\../StepMania.pdb"
|
||||
GenerateMapFile="TRUE"
|
||||
MapFileName="$(IntDir)\$(TargetName).map"
|
||||
@@ -561,6 +562,9 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
|
||||
<File
|
||||
RelativePath=".\StdAfx.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="StdString.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\StepMania.ICO">
|
||||
</File>
|
||||
@@ -573,12 +577,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
|
||||
<File
|
||||
RelativePath=".\StepMania.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\dxutil.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="dxutil.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="mycarray.h">
|
||||
</File>
|
||||
@@ -1039,6 +1037,28 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
|
||||
<File
|
||||
RelativePath=".\RageUtil.h">
|
||||
</File>
|
||||
<Filter
|
||||
Name="Helpers"
|
||||
Filter="">
|
||||
<File
|
||||
RelativePath="SDL_dither.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="SDL_dither.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="SDL_rotozoom.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="SDL_rotozoom.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="SDL_utils.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="SDL_utils.h">
|
||||
</File>
|
||||
</Filter>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Actors"
|
||||
|
||||
Reference in New Issue
Block a user