From c0807442a46d0cefdc8d4a858555cc0f5bcd7f36 Mon Sep 17 00:00:00 2001
From: dean11 <carl.dennis.andersen@gmail.com>
Date: Fri, 29 Nov 2013 11:04:52 +0100
Subject: [PATCH 1/3] Fixed some minor errors with project linking

---
 Code/GameLogic/Object.cpp                  | 2 +-
 Code/Misc/Resource/OResourceHandler.cpp    | 5 ++++-
 Code/OysterGraphics/OysterGraphics.vcxproj | 6 +++---
 Code/Tester/Tester.vcxproj                 | 5 ++++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Code/GameLogic/Object.cpp b/Code/GameLogic/Object.cpp
index 965af90e..33679058 100644
--- a/Code/GameLogic/Object.cpp
+++ b/Code/GameLogic/Object.cpp
@@ -16,7 +16,7 @@ Object::Object(void)
 {
 
 	model = new Model();
-	model = Oyster::Graphics::API::CreateModel(L"bth.obj");
+	model = Oyster::Graphics::API::CreateModel(L"orca");
 
 	API::SimpleBodyDescription sbDesc;
 	//sbDesc.centerPosition = 
diff --git a/Code/Misc/Resource/OResourceHandler.cpp b/Code/Misc/Resource/OResourceHandler.cpp
index 36154d09..f86c434c 100644
--- a/Code/Misc/Resource/OResourceHandler.cpp
+++ b/Code/Misc/Resource/OResourceHandler.cpp
@@ -88,7 +88,10 @@ OHRESOURCE OysterResource::LoadResource(const wchar_t filename[], CustomLoadFunc
 			resourcePrivate.SaveResource(resourceData);
 		}
 	}
-
+	if(!resourceData)
+	{
+		return 0;
+	}
 	return (OHRESOURCE)resourceData->GetResourceHandle();
 }
 
diff --git a/Code/OysterGraphics/OysterGraphics.vcxproj b/Code/OysterGraphics/OysterGraphics.vcxproj
index c5592230..0df3d45b 100644
--- a/Code/OysterGraphics/OysterGraphics.vcxproj
+++ b/Code/OysterGraphics/OysterGraphics.vcxproj
@@ -30,20 +30,20 @@
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v110</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v110</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
diff --git a/Code/Tester/Tester.vcxproj b/Code/Tester/Tester.vcxproj
index 27fc7682..3f48d244 100644
--- a/Code/Tester/Tester.vcxproj
+++ b/Code/Tester/Tester.vcxproj
@@ -113,7 +113,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>OysterGraphics_$(PlatformShortName)D.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(SolutionDir)..\Bin\DLL;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <DelayLoadDLLs>OysterGraphics_x86D.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <DelayLoadDLLs>OysterGraphics_$(PlatformShortName)D.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
     </Link>
     <ProjectReference>
       <LinkLibraryDependencies>
@@ -136,6 +136,7 @@
       <AdditionalDependencies>OysterGraphics_$(PlatformShortName)D.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(SolutionDir)..\Bin\DLL;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <PreventDllBinding>true</PreventDllBinding>
+      <DelayLoadDLLs>OysterGraphics_$(PlatformShortName)D.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -158,6 +159,7 @@
       <AdditionalDependencies>OysterGraphics_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(SolutionDir)..\Bin\DLL;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <PreventDllBinding>true</PreventDllBinding>
+      <DelayLoadDLLs>OysterGraphics_$(PlatformShortName)D.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -180,6 +182,7 @@
       <AdditionalDependencies>OysterGraphics_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(SolutionDir)..\Bin\DLL;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <PreventDllBinding>true</PreventDllBinding>
+      <DelayLoadDLLs>OysterGraphics_$(PlatformShortName)D.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

From afd7652b6e892a8726c1616b03402ea0da9f1a2e Mon Sep 17 00:00:00 2001
From: dean11 <carl.dennis.andersen@gmail.com>
Date: Fri, 29 Nov 2013 20:58:53 +0100
Subject: [PATCH 2/3] Update .gitignore

---
 .gitignore | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 0e264760..6c5ed59d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,9 +23,12 @@
 *.tlog
 *.vcxproj
 *.filters
+*.ilk
+*.exp
+*.dll
 
 
-Bin/Content/
+Bin/Content/Sound/
 Bin/Executable/
 Obj/
 External/

From 10c786b745201fc033f89965aa2e947a9f8bf04f Mon Sep 17 00:00:00 2001
From: dean11 <carl.dennis.andersen@gmail.com>
Date: Fri, 29 Nov 2013 21:23:05 +0100
Subject: [PATCH 3/3] Update .gitignore

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 6c5ed59d..c574ca5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,7 +21,6 @@
 *.lib
 *.exe
 *.tlog
-*.vcxproj
 *.filters
 *.ilk
 *.exp