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 @@ MultiByte - Dynamic + false + false + Fast - v110 + v120 - v110 + v120 SNC 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 @@ true false - Fast + + $(IntDir)/%(Directory)/ + $(SolutionDir)\..\..\src;$(SolutionDir)\..\..\src\bullet;$(FlexIncludes);$(BtPhysIncludes);%(AdditionalIncludeDirectories) $(GlIncludes);$(SdlIncludes);$(D3d9Includes);$(XinputIncludes);%(AdditionalIncludeDirectories) $(GlIncludes);$(SdlIncludes);$(D3d9Includes);$(XinputIncludes);%(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 /* for placement new */ #include /* for std::swap */ #include -#if 0 // disabled: Visual Studio 2012 doesn't have this #include -#endif namespace lol { @@ -49,7 +47,6 @@ public: { } -#if 0 inline ArrayBase(std::initializer_list 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 @@ + 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 @@ image\codec + + image\codec + image\codec 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 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 a;