mirror of
https://github.com/PatrickvL/Dxbx.git
synced 2024-05-31 19:17:53 -04:00
DxbxKrnl was not compiling correct.. dpr and dproj where not checked in.
This commit is contained in:
shadowtj
parent
fb6a696b43
commit
1a6e8ef785
|
|
@ -39,7 +39,6 @@ uses
|
|||
OpenGL1x in '..\..\..\Source\Delphi\Libraries\GLScene\OpenGL1x.pas',
|
||||
OpenGLTokens in '..\..\..\Source\Delphi\Libraries\GLScene\OpenGLTokens.pas',
|
||||
VectorTypes in '..\..\..\Source\Delphi\Libraries\GLScene\VectorTypes.pas',
|
||||
JclDebug in '..\..\..\Source\Delphi\Libraries\Jcl\windows\JclDebug.pas',
|
||||
XboxKrnl in '..\..\..\Source\Delphi\Libraries\OpenXDK\include\xboxkrnl\XboxKrnl.pas',
|
||||
uConvert in '..\..\..\Source\Delphi\src\DxbxKrnl\EmuD3D8\uConvert.pas',
|
||||
uMiniport in '..\..\..\Source\Delphi\src\DxbxKrnl\EmuD3D8\uMiniport.pas',
|
||||
|
|
@ -87,7 +86,37 @@ uses
|
|||
uEmuXOnline in '..\..\..\Source\Delphi\src\DxbxKrnl\uEmuXOnline.pas',
|
||||
uEmuXTL in '..\..\..\Source\Delphi\src\DxbxKrnl\uEmuXTL.pas',
|
||||
uHLEIntercept in '..\..\..\Source\Delphi\src\DxbxKrnl\uHLEIntercept.pas',
|
||||
uResourceTracker in '..\..\..\Source\Delphi\src\DxbxKrnl\uResourceTracker.pas';
|
||||
uResourceTracker in '..\..\..\Source\Delphi\src\DxbxKrnl\uResourceTracker.pas',
|
||||
uBitUtils in '..\..\..\Source\Delphi\src\uBitUtils.pas',
|
||||
uConsoleClass in '..\..\..\Source\Delphi\src\uConsoleClass.pas',
|
||||
uConsts in '..\..\..\Source\Delphi\src\uConsts.pas',
|
||||
uCRC16 in '..\..\..\Source\Delphi\src\uCRC16.pas',
|
||||
uDisassembleUtils in '..\..\..\Source\Delphi\src\uDisassembleUtils.pas',
|
||||
uDxbxUtils in '..\..\..\Source\Delphi\src\uDxbxUtils.pas',
|
||||
uDxbxXml in '..\..\..\Source\Delphi\src\uDxbxXml.pas' {DxbxXml: TDataModule},
|
||||
uEmuExe in '..\..\..\Source\Delphi\src\uEmuExe.pas',
|
||||
uEmuShared in '..\..\..\Source\Delphi\src\uEmuShared.pas',
|
||||
uError in '..\..\..\Source\Delphi\src\uError.pas',
|
||||
uFileSystem in '..\..\..\Source\Delphi\src\uFileSystem.pas',
|
||||
ufrm_About in '..\..\..\Source\Delphi\src\ufrm_About.pas' {frm_About},
|
||||
ufrm_Configuration in '..\..\..\Source\Delphi\src\ufrm_Configuration.pas' {fmConfiguration},
|
||||
ufrm_Main in '..\..\..\Source\Delphi\src\ufrm_Main.pas' {frm_Main},
|
||||
uImportGames in '..\..\..\Source\Delphi\src\uImportGames.pas' {frm_XBEList},
|
||||
uKernelThunk in '..\..\..\Source\Delphi\src\uKernelThunk.pas',
|
||||
uLog in '..\..\..\Source\Delphi\src\uLog.pas',
|
||||
uMutex in '..\..\..\Source\Delphi\src\uMutex.pas',
|
||||
uStoredTrieTypes in '..\..\..\Source\Delphi\src\uStoredTrieTypes.pas',
|
||||
uTime in '..\..\..\Source\Delphi\src\uTime.pas',
|
||||
uTypes in '..\..\..\Source\Delphi\src\uTypes.pas',
|
||||
uWindows in '..\..\..\Source\Delphi\src\uWindows.pas',
|
||||
uXBController in '..\..\..\Source\Delphi\src\uXBController.pas',
|
||||
uXbe in '..\..\..\Source\Delphi\src\uXbe.pas',
|
||||
uXboxLibraryUtils in '..\..\..\Source\Delphi\src\uXboxLibraryUtils.pas',
|
||||
uXbSound in '..\..\..\Source\Delphi\src\uXbSound.pas',
|
||||
uXbVideo in '..\..\..\Source\Delphi\src\uXbVideo.pas',
|
||||
uXDVDFS in '..\..\..\Source\Delphi\src\uXDVDFS.pas',
|
||||
VistaIconFix in '..\..\..\Source\Delphi\src\VistaIconFix.pas',
|
||||
uData in '..\..\..\Source\Delphi\src\uData.pas';
|
||||
|
||||
{$IMAGEBASE $10000000}
|
||||
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
<Base>true</Base>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Base)'!=''">
|
||||
<DCC_UnitSearchPath>..\..\..\Source\Delphi\src\Include;..\..\..\Source\Delphi\Libraries\Jcl\include;..\..\..\Source\Delphi\Libraries\Jcl\Commen;..\..\..\Source\Delphi\Libraries\Jcl\Windows;..\..\..\Source\Delphi\Libraries\Jwapi\Win32API;..\..\..\Source\Delphi\Libraries\Jwapi\includes;..\..\..\Source\Delphi\Libraries\DirectX9;..\..\..\Source\Delphi\Libraries\BeaEngine;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
|
||||
<DCC_ExeOutput>..\..\..\Source\Delphi\Bin</DCC_ExeOutput>
|
||||
<DCC_DcuOutput>..\..\..\Source\Delphi\Dcu</DCC_DcuOutput>
|
||||
<DCC_Define>DXBX_DLL;$(DCC_Define)</DCC_Define>
|
||||
|
|
@ -120,7 +121,6 @@
|
|||
<DCCReference Include="..\..\..\Source\Delphi\Libraries\GLScene\OpenGL1x.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\Libraries\GLScene\OpenGLTokens.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\Libraries\GLScene\VectorTypes.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\Libraries\Jcl\windows\JclDebug.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\Libraries\OpenXDK\include\xboxkrnl\XboxKrnl.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\DxbxKrnl\EmuD3D8\uConvert.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\DxbxKrnl\EmuD3D8\uMiniport.pas"/>
|
||||
|
|
@ -169,6 +169,47 @@
|
|||
<DCCReference Include="..\..\..\Source\Delphi\src\DxbxKrnl\uEmuXTL.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\DxbxKrnl\uHLEIntercept.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\DxbxKrnl\uResourceTracker.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\uBitUtils.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\uConsoleClass.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\uConsts.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\uCRC16.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\uDisassembleUtils.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\uDxbxUtils.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\uDxbxXml.pas">
|
||||
<Form>DxbxXml</Form>
|
||||
<DesignClass>TDataModule</DesignClass>
|
||||
</DCCReference>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\uEmuExe.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\uEmuShared.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\uError.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\uFileSystem.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\ufrm_About.pas">
|
||||
<Form>frm_About</Form>
|
||||
</DCCReference>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\ufrm_Configuration.pas">
|
||||
<Form>fmConfiguration</Form>
|
||||
</DCCReference>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\ufrm_Main.pas">
|
||||
<Form>frm_Main</Form>
|
||||
</DCCReference>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\uImportGames.pas">
|
||||
<Form>frm_XBEList</Form>
|
||||
</DCCReference>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\uKernelThunk.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\uLog.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\uMutex.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\uStoredTrieTypes.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\uTime.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\uTypes.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\uWindows.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\uXBController.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\uXbe.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\uXboxLibraryUtils.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\uXbSound.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\uXbVideo.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\uXDVDFS.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\VistaIconFix.pas"/>
|
||||
<DCCReference Include="..\..\..\Source\Delphi\src\uData.pas"/>
|
||||
<BuildConfiguration Include="Base">
|
||||
<Key>Base</Key>
|
||||
</BuildConfiguration>
|
||||
|
|
|
|||
80
Source/Delphi/src/uData.pas
Normal file
80
Source/Delphi/src/uData.pas
Normal file
|
|
@ -0,0 +1,80 @@
|
|||
(*
|
||||
This file is part of Dxbx - a XBox emulator written in Delphi (ported over from cxbx)
|
||||
Copyright (C) 2007 Shadow_tj and other members of the development team.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*)
|
||||
unit uData;
|
||||
|
||||
{$INCLUDE DXBX.inc}
|
||||
|
||||
interface
|
||||
|
||||
uses
|
||||
// Delphi
|
||||
SysUtils,
|
||||
Classes;
|
||||
|
||||
type
|
||||
TXBEInfo = class(TObject)
|
||||
protected
|
||||
MyLibVersions: TStringList;
|
||||
public
|
||||
DumpInfo: string; // first line of dump file, mentions dump-tool & version
|
||||
FileName: string;
|
||||
Title: string;
|
||||
GameRegion: Cardinal;
|
||||
IsDuplicate: Boolean; // temporary
|
||||
|
||||
property LibVersions: TStringList read MyLibVersions;
|
||||
|
||||
constructor Create;
|
||||
destructor Destroy; override;
|
||||
|
||||
function MatchesVersion(const aVersion: string): Boolean;
|
||||
end;
|
||||
|
||||
implementation
|
||||
|
||||
{ TXBEInfo }
|
||||
|
||||
constructor TXBEInfo.Create;
|
||||
begin
|
||||
inherited Create;
|
||||
|
||||
MyLibVersions := TStringList.Create;
|
||||
end;
|
||||
|
||||
destructor TXBEInfo.Destroy;
|
||||
begin
|
||||
FreeAndNil(MyLibVersions);
|
||||
|
||||
inherited Destroy;
|
||||
end;
|
||||
|
||||
function TXBEInfo.MatchesVersion(const aVersion: string): Boolean;
|
||||
var
|
||||
i: Integer;
|
||||
begin
|
||||
for i := 0 to LibVersions.Count - 1 do
|
||||
if SameText(LibVersions.ValueFromIndex[i], aVersion) then
|
||||
begin
|
||||
Result := True;
|
||||
Exit;
|
||||
end;
|
||||
|
||||
Result := False;
|
||||
end;
|
||||
|
||||
end.
|
||||
|
|
@ -27,8 +27,8 @@ uses
|
|||
Windows,
|
||||
SysUtils,
|
||||
// Dxbx
|
||||
uTypes
|
||||
, uError;
|
||||
uTypes,
|
||||
uError;
|
||||
|
||||
// Dxbx Note : Cxbx uses BOOL in this unit, but that's an int-based type and we prefer a true boolean type,
|
||||
// so we'll use the _BOOL type (=System.Boolean) instead for our property getters and setters.
|
||||
|
|
|
|||
Loading…
Reference in a new issue