Merge branch 'master' of bitbucket.org:JWorthe/spacebot

2 files changed, 57 insertions, 3 deletions

diff --git a/Spacebot.vcxproj b/Spacebot.vcxproj
index f278a76..0831959 100644
--- a/Spacebot.vcxproj
+++ b/Spacebot.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -18,12 +18,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -75,6 +75,12 @@
   <ItemGroup>
     <ClCompile Include="main\main.cpp" />
     <ClCompile Include="src\alien.cpp" />
+    <ClCompile Include="src\brain\bias_node.cpp" />
+    <ClCompile Include="src\brain\neural_link.cpp" />
+    <ClCompile Include="src\brain\neural_network.cpp" />
+    <ClCompile Include="src\brain\neural_node.cpp" />
+    <ClCompile Include="src\brain\neuron.cpp" />
+    <ClCompile Include="src\brain\sensor.cpp" />
     <ClCompile Include="src\enemy_bullet.cpp" />
     <ClCompile Include="src\game_entity.cpp" />
     <ClCompile Include="src\game_state.cpp" />
@@ -86,6 +92,12 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\alien.h" />
+    <ClInclude Include="include\brain\bias_node.h" />
+    <ClInclude Include="include\brain\neural_link.h" />
+    <ClInclude Include="include\brain\neural_network.h" />
+    <ClInclude Include="include\brain\neural_node.h" />
+    <ClInclude Include="include\brain\neuron.h" />
+    <ClInclude Include="include\brain\sensor.h" />
     <ClInclude Include="include\enemy_bullet.h" />
     <ClInclude Include="include\game_entity.h" />
     <ClInclude Include="include\game_state.h" />
diff --git a/Spacebot.vcxproj.filters b/Spacebot.vcxproj.filters
index 39df8bb..c03ec82 100644
--- a/Spacebot.vcxproj.filters
+++ b/Spacebot.vcxproj.filters
@@ -13,6 +13,12 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
     </Filter>
+    <Filter Include="Header Files\brain">
+      <UniqueIdentifier>{b20525b7-b3c2-4e24-847b-d9c6f5630885}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\brain">
+      <UniqueIdentifier>{f31b18e6-4609-4702-a6ed-9bf41faa1c84}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\alien.cpp">
@@ -45,6 +51,24 @@
     <ClCompile Include="main\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\brain\bias_node.cpp">
+      <Filter>Source Files\brain</Filter>
+    </ClCompile>
+    <ClCompile Include="src\brain\neural_link.cpp">
+      <Filter>Source Files\brain</Filter>
+    </ClCompile>
+    <ClCompile Include="src\brain\neural_network.cpp">
+      <Filter>Source Files\brain</Filter>
+    </ClCompile>
+    <ClCompile Include="src\brain\neural_node.cpp">
+      <Filter>Source Files\brain</Filter>
+    </ClCompile>
+    <ClCompile Include="src\brain\neuron.cpp">
+      <Filter>Source Files\brain</Filter>
+    </ClCompile>
+    <ClCompile Include="src\brain\sensor.cpp">
+      <Filter>Source Files\brain</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\alien.h">
@@ -77,5 +101,23 @@
     <ClInclude Include="include\move_string_mapper.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\brain\bias_node.h">
+      <Filter>Header Files\brain</Filter>
+    </ClInclude>
+    <ClInclude Include="include\brain\neural_link.h">
+      <Filter>Header Files\brain</Filter>
+    </ClInclude>
+    <ClInclude Include="include\brain\neural_network.h">
+      <Filter>Header Files\brain</Filter>
+    </ClInclude>
+    <ClInclude Include="include\brain\neural_node.h">
+      <Filter>Header Files\brain</Filter>
+    </ClInclude>
+    <ClInclude Include="include\brain\neuron.h">
+      <Filter>Header Files\brain</Filter>
+    </ClInclude>
+    <ClInclude Include="include\brain\sensor.h">
+      <Filter>Header Files\brain</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file