Cxbx now compiles with .NET in addition to 6.0.

This commit is contained in:
Aaron Robinson 2003-01-28 04:57:33 +00:00
parent 757e584d29
commit c80c1d9d7e
5 changed files with 641 additions and 1 deletions

186
Cxbe.vcproj Normal file
View File

@ -0,0 +1,186 @@
<?xml version="1.0" encoding = "Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.00"
Name="Cxbe"
SccProjectName=""
SccLocalPath="">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
<Configurations>
<Configuration
Name="Release|Win32"
OutputDirectory=".\Bin"
IntermediateDirectory=".\Bin"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="Include,Include/Standard,Include/Standard/Cxbe,Include/Win32/"
PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
StringPooling="TRUE"
RuntimeLibrary="4"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
PrecompiledHeaderFile=".\Bin/Cxbe.pch"
AssemblerListingLocation=".\Bin/"
ObjectFile=".\Bin/"
ProgramDataBaseFileName=".\Bin/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="odbc32.lib odbccp32.lib"
OutputFile=".\Bin/Cxbe.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
ProgramDatabaseFile=".\Bin/Cxbe.pdb"
SubSystem="1"/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\Bin/Cxbe.tlb"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\Bin/Debug"
IntermediateDirectory=".\Bin/Debug"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="Include,Include/Standard,Include/Standard/Cxbe,Include/Win32/"
PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="5"
UsePrecompiledHeader="2"
PrecompiledHeaderFile=".\Bin/Debug/Cxbe.pch"
AssemblerListingLocation=".\Bin/Debug/"
ObjectFile=".\Bin/Debug/"
ProgramDataBaseFileName=".\Bin/Debug/"
BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="4"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="odbc32.lib odbccp32.lib"
OutputFile=".\Bin/Debug/Cxbe.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Bin/Debug/Cxbe.pdb"
SubSystem="1"/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\Bin/Debug/Cxbe.tlb"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
</Configuration>
</Configurations>
<Files>
<Filter
Name="Bin"
Filter="">
<File
RelativePath=".\Bin\Cxbe.exe">
</File>
<Filter
Name="Debug"
Filter="">
<File
RelativePath=".\Bin\Debug\Cxbe.exe">
</File>
</Filter>
</Filter>
<Filter
Name="Include"
Filter="">
<File
RelativePath=".\Include\Win32\AlignPosfix1.h">
</File>
<File
RelativePath=".\Include\Win32\AlignPrefix1.h">
</File>
<File
RelativePath=".\Include\Cxbx.h">
</File>
<File
RelativePath=".\Include\Core\Error.h">
</File>
<File
RelativePath=".\Include\Core\Exe.h">
</File>
<File
RelativePath=".\Include\Core\Xbe.h">
</File>
</Filter>
<Filter
Name="Source"
Filter="">
<File
RelativePath=".\Source\Core\Error.cpp">
</File>
<File
RelativePath=".\Source\Core\Exe.cpp">
</File>
<File
RelativePath=".\Source\Standard\Cxbe\Main.cpp">
</File>
<File
RelativePath=".\Source\Core\Xbe.cpp">
</File>
</Filter>
<Filter
Name="Doc"
Filter="">
</Filter>
<Filter
Name="Resource"
Filter="">
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

34
Cxbx.sln Normal file
View File

@ -0,0 +1,34 @@
Microsoft Visual Studio Solution File, Format Version 7.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbe", "Cxbe.vcproj", "{EEFA16C2-4652-43A1-B3F7-9B6022719A98}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbx", "Cxbx.vcproj", "{340C16B9-91E1-4FD5-B164-38E8668C83CE}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CxbxKrnl", "CxbxKrnl.vcproj", "{B07BD0D2-0B94-4AD3-B72A-D7E33F964B7F}"
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
ConfigName.0 = Debug
ConfigName.1 = Release
EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
{340C16B9-91E1-4FD5-B164-38E8668C83CE}.0 = {B07BD0D2-0B94-4AD3-B72A-D7E33F964B7F}
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{EEFA16C2-4652-43A1-B3F7-9B6022719A98}.Debug.ActiveCfg = Debug|Win32
{EEFA16C2-4652-43A1-B3F7-9B6022719A98}.Debug.Build.0 = Debug|Win32
{EEFA16C2-4652-43A1-B3F7-9B6022719A98}.Release.ActiveCfg = Release|Win32
{EEFA16C2-4652-43A1-B3F7-9B6022719A98}.Release.Build.0 = Release|Win32
{340C16B9-91E1-4FD5-B164-38E8668C83CE}.Debug.ActiveCfg = Debug|Win32
{340C16B9-91E1-4FD5-B164-38E8668C83CE}.Debug.Build.0 = Debug|Win32
{340C16B9-91E1-4FD5-B164-38E8668C83CE}.Release.ActiveCfg = Release|Win32
{340C16B9-91E1-4FD5-B164-38E8668C83CE}.Release.Build.0 = Release|Win32
{B07BD0D2-0B94-4AD3-B72A-D7E33F964B7F}.Debug.ActiveCfg = Debug|Win32
{B07BD0D2-0B94-4AD3-B72A-D7E33F964B7F}.Debug.Build.0 = Debug|Win32
{B07BD0D2-0B94-4AD3-B72A-D7E33F964B7F}.Release.ActiveCfg = Release|Win32
{B07BD0D2-0B94-4AD3-B72A-D7E33F964B7F}.Release.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
GlobalSection(ExtensibilityAddIns) = postSolution
EndGlobalSection
EndGlobal

251
Cxbx.vcproj Normal file
View File

@ -0,0 +1,251 @@
<?xml version="1.0" encoding = "Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.00"
Name="Cxbx"
SccProjectName=""
SccLocalPath="">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
<Configurations>
<Configuration
Name="Release|Win32"
OutputDirectory=".\Bin"
IntermediateDirectory=".\Bin"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="Include,Include/Win32/,Include/Win32/Cxbxkrnl,Include/Win32/Cxbx,Resource"
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS"
StringPooling="TRUE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
PrecompiledHeaderFile=".\Bin/Cxbx.pch"
AssemblerListingLocation=".\Bin/"
ObjectFile=".\Bin/"
ProgramDataBaseFileName=".\Bin/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="odbc32.lib odbccp32.lib"
OutputFile=".\Bin/Cxbx.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
ProgramDatabaseFile=".\Bin/Cxbx.pdb"
GenerateMapFile="FALSE"
SubSystem="2"/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
TypeLibraryName=".\Bin/Cxbx.tlb"/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="cd PostBuild
upxCxbx.bat
"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\Bin\Debug"
IntermediateDirectory=".\Bin\Debug"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="Include,Include/Win32/,Include/Win32/Cxbxkrnl,Include/Win32/Cxbx,Resource"
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="2"
PrecompiledHeaderFile=".\Bin\Debug/Cxbx.pch"
AssemblerListingLocation=".\Bin\Debug/"
ObjectFile=".\Bin\Debug/"
ProgramDataBaseFileName=".\Bin\Debug/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="4"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="odbc32.lib odbccp32.lib"
OutputFile=".\Bin\Debug/Cxbx.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Bin\Debug/Cxbx.pdb"
SubSystem="2"/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
TypeLibraryName=".\Bin\Debug/Cxbx.tlb"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
</Configuration>
</Configurations>
<Files>
<Filter
Name="Include"
Filter="">
<File
RelativePath=".\Include\Win32\AlignPosfix1.h">
</File>
<File
RelativePath=".\Include\Win32\AlignPrefix1.h">
</File>
<File
RelativePath=".\Include\Cxbx.h">
</File>
<File
RelativePath=".\Include\Win32\Cxbx\EmuExe.h">
</File>
<File
RelativePath=".\Include\Core\Error.h">
</File>
<File
RelativePath=".\Include\Core\Exe.h">
</File>
<File
RelativePath=".\Include\Win32\CxbxKrnl\Kernel.h">
</File>
<File
RelativePath=".\Include\Win32\Cxbx\Prolog.h">
</File>
<File
RelativePath=".\Include\Win32\Cxbx\Wnd.h">
</File>
<File
RelativePath=".\Include\Win32\Cxbx\WndAbout.h">
</File>
<File
RelativePath=".\Include\Win32\Cxbx\WndMain.h">
</File>
<File
RelativePath=".\Include\Core\Xbe.h">
</File>
<File
RelativePath=".\Resource\resource.h">
</File>
</Filter>
<Filter
Name="Resource"
Filter="">
<File
RelativePath=".\Resource\Cxbx.ico">
</File>
<File
RelativePath=".\Resource\Cxbx.rc">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="Resource;$(NoInherit)"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="Resource;$(NoInherit)"/>
</FileConfiguration>
</File>
<File
RelativePath=".\Resource\Logo.bmp">
</File>
<File
RelativePath=".\Resource\Splash.bmp">
</File>
</Filter>
<Filter
Name="Source"
Filter="">
<File
RelativePath=".\Source\Win32\Cxbx\EmuExe.cpp">
</File>
<File
RelativePath=".\Source\Core\Error.cpp">
</File>
<File
RelativePath=".\Source\Core\Exe.cpp">
</File>
<File
RelativePath=".\Source\Win32\Cxbx\Prolog.cpp">
</File>
<File
RelativePath=".\Source\Win32\Cxbx\WinMain.cpp">
</File>
<File
RelativePath=".\Source\Win32\Cxbx\Wnd.cpp">
</File>
<File
RelativePath=".\Source\Win32\Cxbx\WndAbout.cpp">
</File>
<File
RelativePath=".\Source\Win32\Cxbx\WndMain.cpp">
</File>
<File
RelativePath=".\Source\Core\Xbe.cpp">
</File>
</Filter>
<Filter
Name="Bin"
Filter="">
<Filter
Name="Debug"
Filter="">
</Filter>
</Filter>
<Filter
Name="Doc"
Filter="">
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

169
CxbxKrnl.vcproj Normal file
View File

@ -0,0 +1,169 @@
<?xml version="1.0" encoding = "Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.00"
Name="CxbxKrnl"
SccProjectName=""
SccLocalPath="">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\Bin\Debug"
IntermediateDirectory=".\Bin\Debug"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="Include,Include/Win32/,Include/Win32/Cxbxkrnl"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CXBXKRNL_EXPORTS"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="2"
PrecompiledHeaderFile=".\Bin\Debug/CxbxKrnl.pch"
AssemblerListingLocation=".\Bin\Debug/"
ObjectFile=".\Bin\Debug/"
ProgramDataBaseFileName=".\Bin\Debug/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="4"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="odbc32.lib odbccp32.lib"
OutputFile="Bin\Debug/Cxbx.dll"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Bin\Debug/Cxbx.pdb"
ImportLibrary=".\Bin\Debug/Cxbx.lib"/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
TypeLibraryName=".\Bin\Debug/CxbxKrnl.tlb"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\Bin"
IntermediateDirectory=".\Bin"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="Include,Include/Win32/,Include/Win32/Cxbxkrnl"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CXBXKRNL_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
PrecompiledHeaderFile=".\Bin/CxbxKrnl.pch"
AssemblerListingLocation=".\Bin/"
ObjectFile=".\Bin/"
ProgramDataBaseFileName=".\Bin/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="odbc32.lib odbccp32.lib"
OutputFile="Bin/Cxbx.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
ProgramDatabaseFile=".\Bin/Cxbx.pdb"
ImportLibrary=".\Bin/Cxbx.lib"/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
TypeLibraryName=".\Bin/CxbxKrnl.tlb"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
</Configuration>
</Configurations>
<Files>
<Filter
Name="Include"
Filter="">
<File
RelativePath=".\Include\Win32\CxbxKrnl\Kernel.h">
</File>
<File
RelativePath=".\Include\Win32\CxbxKrnl\xntdll.h">
</File>
</Filter>
<Filter
Name="Source"
Filter="">
<File
RelativePath=".\Source\Win32\CxbxKrnl\Kernel.cpp">
</File>
<File
RelativePath=".\Source\Win32\CxbxKrnl\KernelThunk.cpp">
</File>
</Filter>
<Filter
Name="Bin"
Filter="">
<Filter
Name="Debug"
Filter="">
</Filter>
</Filter>
<Filter
Name="Doc"
Filter="">
</Filter>
<Filter
Name="Resource"
Filter="">
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

View File

@ -362,7 +362,7 @@ EmuExe::EmuExe(Xbe *x_Xbe, uint32 x_debug_console) : Exe()
// * decode kernel thunk address
// ******************************************************************
{
if(kt ^ XOR_KT_DEBUG > 0x01000000)
if((kt ^ XOR_KT_DEBUG) > 0x01000000)
kt ^= XOR_KT_RETAIL;
else
kt ^= XOR_KT_DEBUG;