From 59a157a58c068aa2fa354579d2e8b9b857ab8430 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Mon, 23 Jun 2014 17:01:35 +0000
Subject: [PATCH] build: port solution to VS2013. Muahahaha.

---
 build/vs2012/Lol.Core.Config.props | 8 +++++---
 build/vs2012/Lol.Core.Rules.props  | 4 +++-
 src/lol/base/array.h               | 4 ----
 src/lolcore.vcxproj                | 1 +
 src/lolcore.vcxproj.filters        | 3 +++
 test/unit/array.cpp                | 9 +++++++++
 6 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/build/vs2012/Lol.Core.Config.props b/build/vs2012/Lol.Core.Config.props
index ff7ef7c5..af889add 100644
--- a/build/vs2012/Lol.Core.Config.props
+++ b/build/vs2012/Lol.Core.Config.props
@@ -11,13 +11,15 @@
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
     <CharacterSet>MultiByte</CharacterSet>
-    <UseOfMfc>Dynamic</UseOfMfc>
+    <UseOfMfc>false</UseOfMfc>
+    <ExceptionHandling>false</ExceptionHandling>
+    <FloatingPointModel>Fast</FloatingPointModel>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Platform)'=='Win32'" Label="Configuration">
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Platform)'=='x64'" Label="Configuration">
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Platform)'=='PS3'" Label="Configuration">
     <PlatformToolset>SNC</PlatformToolset>
diff --git a/build/vs2012/Lol.Core.Rules.props b/build/vs2012/Lol.Core.Rules.props
index 5c3f14e2..216f3b22 100644
--- a/build/vs2012/Lol.Core.Rules.props
+++ b/build/vs2012/Lol.Core.Rules.props
@@ -12,7 +12,9 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
 
-      <FloatingPointModel>Fast</FloatingPointModel>
+      <!-- We should use %(RelativeDir) here but for some reason it's an _absolute_ dir. WTF. -->
+      <ObjectFileName>$(IntDir)/%(Directory)/</ObjectFileName>
+
       <AdditionalIncludeDirectories>$(SolutionDir)\..\..\src;$(SolutionDir)\..\..\src\bullet;$(FlexIncludes);$(BtPhysIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Platform)'=='Win32'">$(GlIncludes);$(SdlIncludes);$(D3d9Includes);$(XinputIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Platform)'=='x64'">$(GlIncludes);$(SdlIncludes);$(D3d9Includes);$(XinputIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
diff --git a/src/lol/base/array.h b/src/lol/base/array.h
index 5cf49a5f..0fae7542 100644
--- a/src/lol/base/array.h
+++ b/src/lol/base/array.h
@@ -24,9 +24,7 @@
 #include <new> /* for placement new */
 #include <algorithm> /* for std::swap */
 #include <stdint.h>
-#if 0 // disabled: Visual Studio 2012 doesn't have this
 #include <initializer_list>
-#endif
 
 namespace lol
 {
@@ -49,7 +47,6 @@ public:
     {
     }
 
-#if 0
     inline ArrayBase(std::initializer_list<Element> list)
       : m_data(0),
         m_count(0),
@@ -59,7 +56,6 @@ public:
         for (auto elem : list)
             Push(elem);
     }
-#endif
 
     inline ~ArrayBase()
     {
diff --git a/src/lolcore.vcxproj b/src/lolcore.vcxproj
index af2858bd..7fa70332 100644
--- a/src/lolcore.vcxproj
+++ b/src/lolcore.vcxproj
@@ -143,6 +143,7 @@
     <ClCompile Include="image\codec\dummy-image.cpp" />
     <ClCompile Include="image\codec\gdiplus-image.cpp" />
     <ClCompile Include="image\codec\ios-image.cpp" />
+    <ClCompile Include="image\codec\oric-image.cpp" />
     <ClCompile Include="image\codec\ps3-image.cpp" />
     <ClCompile Include="image\codec\sdl-image.cpp" />
     <ClCompile Include="image\codec\zed-image.cpp" />
diff --git a/src/lolcore.vcxproj.filters b/src/lolcore.vcxproj.filters
index 1c3a4898..71c8ab81 100644
--- a/src/lolcore.vcxproj.filters
+++ b/src/lolcore.vcxproj.filters
@@ -165,6 +165,9 @@
     <ClCompile Include="image\codec\ios-image.cpp">
       <Filter>image\codec</Filter>
     </ClCompile>
+    <ClCompile Include="image\codec\oric-image.cpp">
+      <Filter>image\codec</Filter>
+    </ClCompile>
     <ClCompile Include="image\codec\ps3-image.cpp">
       <Filter>image\codec</Filter>
     </ClCompile>
diff --git a/test/unit/array.cpp b/test/unit/array.cpp
index 31c644a1..816af9de 100644
--- a/test/unit/array.cpp
+++ b/test/unit/array.cpp
@@ -53,6 +53,15 @@ LOLUNIT_FIXTURE(ArrayTest)
         LOLUNIT_ASSERT_EQUAL(a[3], 3);
     }
 
+    LOLUNIT_TEST(ArrayInitializer)
+    {
+        Array<int> a = { 2, 4, 6 };
+
+        LOLUNIT_ASSERT_EQUAL(a[0], 2);
+        LOLUNIT_ASSERT_EQUAL(a[1], 4);
+        LOLUNIT_ASSERT_EQUAL(a[2], 6);
+    }
+
     LOLUNIT_TEST(ArrayPushWithShift)
     {
         Array<int> a;