From 9224c1445eec09e588220ee2f2dca5f71a0b0770 Mon Sep 17 00:00:00 2001
From: Ian C <ianc@noddybox.co.uk>
Date: Sun, 6 May 2012 23:14:16 +0000
Subject: Move different licensed objects to a custom root folder.
---
different-licenses/48.rom | Bin 0 -> 16384 bytes
different-licenses/Read Me.txt | 12 ++++++++++++
different-licenses/zxspec_v2.rar | Bin 0 -> 41198 bytes
wpspec/wpspec/Resources/48.rom | Bin 16384 -> 0 bytes
wpspec/wpspec/Spectrum/Emulation.cs | 5 +++++
wpspec/wpspec/wpspec.csproj | 4 +++-
6 files changed, 20 insertions(+), 1 deletion(-)
create mode 100644 different-licenses/48.rom
create mode 100644 different-licenses/zxspec_v2.rar
delete mode 100644 wpspec/wpspec/Resources/48.rom
diff --git a/different-licenses/48.rom b/different-licenses/48.rom
new file mode 100644
index 0000000..4d6895e
Binary files /dev/null and b/different-licenses/48.rom differ
diff --git a/different-licenses/Read Me.txt b/different-licenses/Read Me.txt
index e69de29..2021f47 100644
--- a/different-licenses/Read Me.txt
+++ b/different-licenses/Read Me.txt
@@ -0,0 +1,12 @@
+These files are not covered by the GNU General Public License.
+
+48.rom
+
+ This is an image of the Spectrum 48K ROM. This code is (c) Copyright
+ Amstrad PLC. They allow this to be used for emulation purposes.
+
+zxspec_v2.rar
+
+ A Spectrum Keyboard font, (c) Copyright Paul Reid (TracerTong).
+
+ http://tracertong.co.uk/ttf/2010/05/zx-spectrum-keyboard/
diff --git a/different-licenses/zxspec_v2.rar b/different-licenses/zxspec_v2.rar
new file mode 100644
index 0000000..fb42602
Binary files /dev/null and b/different-licenses/zxspec_v2.rar differ
diff --git a/wpspec/wpspec/Resources/48.rom b/wpspec/wpspec/Resources/48.rom
deleted file mode 100644
index 4d6895e..0000000
Binary files a/wpspec/wpspec/Resources/48.rom and /dev/null differ
diff --git a/wpspec/wpspec/Spectrum/Emulation.cs b/wpspec/wpspec/Spectrum/Emulation.cs
index 7564022..563e23a 100644
--- a/wpspec/wpspec/Spectrum/Emulation.cs
+++ b/wpspec/wpspec/Spectrum/Emulation.cs
@@ -442,6 +442,11 @@ namespace wpspec.Spectrum
Uri uri = new Uri("Resources/48.rom", UriKind.Relative);
StreamResourceInfo file = App.GetResourceStream(uri);
+ if (file == null)
+ {
+ throw new Exception("Failed to load Spectrum ROM");
+ }
+
file.Stream.Read(mem, 0, 0x4000);
file.Stream.Close();
diff --git a/wpspec/wpspec/wpspec.csproj b/wpspec/wpspec/wpspec.csproj
index 34fc200..09ae6bf 100644
--- a/wpspec/wpspec/wpspec.csproj
+++ b/wpspec/wpspec/wpspec.csproj
@@ -149,11 +149,13 @@
</Page>
</ItemGroup>
<ItemGroup>
+ <Content Include="..\..\different-licenses\48.rom">
+ <Link>Resources\48.rom</Link>
+ </Content>
<None Include="Properties\AppManifest.xml" />
<None Include="Properties\WMAppManifest.xml">
<SubType>Designer</SubType>
</None>
- <Content Include="Resources\48.rom" />
<Content Include="Resources\Spectrum.keyboard" />
</ItemGroup>
<ItemGroup>
--
cgit v1.2.3