updated..

This commit is contained in:
Aaron Robinson 2004-03-08 17:37:47 +00:00
parent 54c8ede808
commit f24e6674d4
3 changed files with 68 additions and 25 deletions

View File

@ -1,14 +1,14 @@
Microsoft Visual Studio Solution File, Format Version 8.00 Microsoft Visual Studio Solution File, Format Version 8.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbe", "Cxbe.vcproj", "{7BA1906A-C382-4C3F-90F4-8A5A73E637D2}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbe", "Cxbe.vcproj", "{234A640C-29A8-4117-A967-737B489AB557}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbx", "Cxbx.vcproj", "{B37D8D33-9DE5-4CE1-81B5-DF100AA63DDB}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbx", "Cxbx.vcproj", "{E28C5107-0DF8-4C9C-A06F-3145777EE4DF}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{93E3D9EB-480F-4F9E-BE6F-8CC05EB0D81A} = {93E3D9EB-480F-4F9E-BE6F-8CC05EB0D81A} {52CFEDF1-C726-4010-B6CC-6A2F934E35AA} = {52CFEDF1-C726-4010-B6CC-6A2F934E35AA}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CxbxKrnl", "CxbxKrnl.vcproj", "{93E3D9EB-480F-4F9E-BE6F-8CC05EB0D81A}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CxbxKrnl", "CxbxKrnl.vcproj", "{52CFEDF1-C726-4010-B6CC-6A2F934E35AA}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
EndProjectSection EndProjectSection
EndProject EndProject
@ -18,18 +18,18 @@ Global
Release = Release Release = Release
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution GlobalSection(ProjectConfiguration) = postSolution
{7BA1906A-C382-4C3F-90F4-8A5A73E637D2}.Debug.ActiveCfg = Debug|Win32 {234A640C-29A8-4117-A967-737B489AB557}.Debug.ActiveCfg = Debug|Win32
{7BA1906A-C382-4C3F-90F4-8A5A73E637D2}.Debug.Build.0 = Debug|Win32 {234A640C-29A8-4117-A967-737B489AB557}.Debug.Build.0 = Debug|Win32
{7BA1906A-C382-4C3F-90F4-8A5A73E637D2}.Release.ActiveCfg = Release|Win32 {234A640C-29A8-4117-A967-737B489AB557}.Release.ActiveCfg = Release|Win32
{7BA1906A-C382-4C3F-90F4-8A5A73E637D2}.Release.Build.0 = Release|Win32 {234A640C-29A8-4117-A967-737B489AB557}.Release.Build.0 = Release|Win32
{B37D8D33-9DE5-4CE1-81B5-DF100AA63DDB}.Debug.ActiveCfg = Debug|Win32 {E28C5107-0DF8-4C9C-A06F-3145777EE4DF}.Debug.ActiveCfg = Debug|Win32
{B37D8D33-9DE5-4CE1-81B5-DF100AA63DDB}.Debug.Build.0 = Debug|Win32 {E28C5107-0DF8-4C9C-A06F-3145777EE4DF}.Debug.Build.0 = Debug|Win32
{B37D8D33-9DE5-4CE1-81B5-DF100AA63DDB}.Release.ActiveCfg = Release|Win32 {E28C5107-0DF8-4C9C-A06F-3145777EE4DF}.Release.ActiveCfg = Release|Win32
{B37D8D33-9DE5-4CE1-81B5-DF100AA63DDB}.Release.Build.0 = Release|Win32 {E28C5107-0DF8-4C9C-A06F-3145777EE4DF}.Release.Build.0 = Release|Win32
{93E3D9EB-480F-4F9E-BE6F-8CC05EB0D81A}.Debug.ActiveCfg = Debug|Win32 {52CFEDF1-C726-4010-B6CC-6A2F934E35AA}.Debug.ActiveCfg = Debug|Win32
{93E3D9EB-480F-4F9E-BE6F-8CC05EB0D81A}.Debug.Build.0 = Debug|Win32 {52CFEDF1-C726-4010-B6CC-6A2F934E35AA}.Debug.Build.0 = Debug|Win32
{93E3D9EB-480F-4F9E-BE6F-8CC05EB0D81A}.Release.ActiveCfg = Release|Win32 {52CFEDF1-C726-4010-B6CC-6A2F934E35AA}.Release.ActiveCfg = Release|Win32
{93E3D9EB-480F-4F9E-BE6F-8CC05EB0D81A}.Release.Build.0 = Release|Win32 {52CFEDF1-C726-4010-B6CC-6A2F934E35AA}.Release.Build.0 = Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection EndGlobalSection

BIN
Cxbx.suo

Binary file not shown.

View File

@ -21,7 +21,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="Include,Include/Core/,Include/Win32/,Include/Win32/Cxbxkrnl,Include/Win32/Cxbx" AdditionalIncludeDirectories="Include,Include/Core/,Include/Win32/,Include/Win32/Cxbxkrnl,Include/Win32/Cxbx,Include/Win32/Cxbx/jpegdec"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -39,10 +39,12 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="d3d8.lib dinput8.lib dxguid.lib odbc32.lib odbccp32.lib" AdditionalDependencies="libjpeg.lib d3d8.lib dinput8.lib dxguid.lib odbc32.lib odbccp32.lib"
OutputFile=".\Bin\Debug/Cxbx.exe" OutputFile=".\Bin\Debug/Cxbx.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="Lib"
IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Bin\Debug/Cxbx.pdb" ProgramDatabaseFile=".\Bin\Debug/Cxbx.pdb"
GenerateMapFile="TRUE" GenerateMapFile="TRUE"
@ -91,7 +93,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="Include,Include/Core/,Include/Win32/,Include/Win32/Cxbxkrnl,Include/Win32/Cxbx" AdditionalIncludeDirectories="Include,Include/Core/,Include/Win32/,Include/Win32/Cxbxkrnl,Include/Win32/Cxbx,Include/Win32/Cxbx/jpegdec"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="2" RuntimeLibrary="2"
@ -110,10 +112,12 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="d3d8.lib dinput8.lib dxguid.lib odbc32.lib odbccp32.lib" AdditionalDependencies="libjpeg.lib d3d8.lib dinput8.lib dxguid.lib odbc32.lib odbccp32.lib"
OutputFile=".\Bin/Cxbx.exe" OutputFile=".\Bin/Cxbx.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="lib"
IgnoreDefaultLibraryNames="libc"
GenerateMapFile="TRUE" GenerateMapFile="TRUE"
MapFileName=".\Bin/Cxbx.map" MapFileName=".\Bin/Cxbx.map"
SubSystem="2" SubSystem="2"
@ -263,12 +267,28 @@ upxCxbx.bat
<File <File
RelativePath="Include\Win32\XBVideo.h"> RelativePath="Include\Win32\XBVideo.h">
</File> </File>
<Filter
Name="jpegdec (h)"
Filter="">
<File
RelativePath="Include\Win32\Cxbx\jpegdec\jconfig.h">
</File>
<File
RelativePath="Include\Win32\Cxbx\jpegdec\jmorecfg.h">
</File>
<File
RelativePath="Include\Win32\Cxbx\jpegdec\jpegdec.h">
</File>
<File
RelativePath="Include\Win32\Cxbx\jpegdec\jpeglib.h">
</File>
</Filter>
</Filter> </Filter>
<Filter <Filter
Name="Resource" Name="Resource"
Filter=""> Filter="">
<File <File
RelativePath="Resource\About.bmp"> RelativePath="Resource\About.jpg">
</File> </File>
<File <File
RelativePath="Resource\Cxbx.ico"> RelativePath="Resource\Cxbx.ico">
@ -291,10 +311,7 @@ upxCxbx.bat
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="Resource\Logo.bmp"> RelativePath="Resource\Splash.jpg">
</File>
<File
RelativePath="Resource\Splash.bmp">
</File> </File>
</Filter> </Filter>
<Filter <Filter
@ -630,6 +647,32 @@ upxCxbx.bat
BrowseInformation="1"/> BrowseInformation="1"/>
</FileConfiguration> </FileConfiguration>
</File> </File>
<Filter
Name="jpegdec (cpp)"
Filter="">
<File
RelativePath="Source\Win32\Cxbx\jpegdec\jpegdec.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"/>
</FileConfiguration>
</File>
</Filter>
</Filter> </Filter>
</Files> </Files>
<Globals> <Globals>