diff --git a/core/Base/Renderer.cpp b/core/Base/Renderer.cpp index fe7ae2b4..4787a78b 100644 --- a/core/Base/Renderer.cpp +++ b/core/Base/Renderer.cpp @@ -201,7 +201,7 @@ void e2d::Renderer::__render() TRUE, D2D1::ColorF(D2D1::ColorF::Black, 0.4f), 1.5f, - D2D1_LINE_JOIN::D2D1_LINE_JOIN_ROUND + D2D1_LINE_JOIN_ROUND ); pTextLayout->Draw(NULL, s_pTextRenderer, 10, 0); diff --git a/core/Custom/CustomTextRenderer.cpp b/core/Custom/CustomTextRenderer.cpp index 053729ba..e85e302c 100644 --- a/core/Custom/CustomTextRenderer.cpp +++ b/core/Custom/CustomTextRenderer.cpp @@ -16,7 +16,7 @@ CustomTextRenderer::CustomTextRenderer( , sOutlineColor_() , fOutlineWidth(1) , bShowOutline_(TRUE) - , nOutlineJoin_(D2D1_LINE_JOIN::D2D1_LINE_JOIN_MITER) + , nOutlineJoin_(D2D1_LINE_JOIN_MITER) { pD2DFactory_->AddRef(); pRT_->AddRef(); diff --git a/core/e2dmacros.h b/core/e2dmacros.h index 8d282cf0..67f8cea5 100644 --- a/core/e2dmacros.h +++ b/core/e2dmacros.h @@ -62,7 +62,7 @@ #if HIGHER_THAN_VS2010 #include #pragma comment(lib, "xaudio2.lib") -#elif +#else #define MUSIC_CLASS_NAME L"Easy2DMusicCallbackWnd" #endif diff --git a/project/vs2010/Easy2D.vcxproj b/project/vs2010/Easy2D.vcxproj index 4b328bde..babf7272 100644 --- a/project/vs2010/Easy2D.vcxproj +++ b/project/vs2010/Easy2D.vcxproj @@ -44,13 +44,16 @@ - + + + + @@ -83,17 +86,18 @@ - + + + + + + + + + + + - - - - - - - - - {47AF11E1-8725-4ECA-B8CF-951ABC397B31} @@ -169,6 +173,7 @@ false + true Windows @@ -185,6 +190,7 @@ false + true Windows @@ -202,6 +208,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true Windows @@ -221,6 +228,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true Windows diff --git a/project/vs2010/Easy2D.vcxproj.filters b/project/vs2010/Easy2D.vcxproj.filters index dbd324ef..70a6f68f 100644 --- a/project/vs2010/Easy2D.vcxproj.filters +++ b/project/vs2010/Easy2D.vcxproj.filters @@ -31,6 +31,9 @@ {72484ebf-d464-4f37-ad9b-340b378f9701} + + {6f1847d1-aa22-4b3a-aeed-990b7645081f} + @@ -96,27 +99,6 @@ Base - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - Manager @@ -219,18 +201,49 @@ Tool\Listener + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Custom + - + + + + + + + + + + + - - - - - - - - - \ No newline at end of file diff --git a/project/vs2012/Easy2D.vcxproj b/project/vs2012/Easy2D.vcxproj index 962fd904..98cf1130 100644 --- a/project/vs2012/Easy2D.vcxproj +++ b/project/vs2012/Easy2D.vcxproj @@ -44,13 +44,16 @@ - + + + + @@ -83,17 +86,18 @@ - + + + + + + + + + + + - - - - - - - - - {722EA245-ADD5-4296-8C85-8FF42C0335D3} @@ -169,9 +173,10 @@ Level3 Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true + false None false + true Windows @@ -184,9 +189,10 @@ Level3 Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true + false None false + true Windows @@ -203,8 +209,9 @@ true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true + false None + true Windows @@ -223,8 +230,9 @@ true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true + false None + true Windows diff --git a/project/vs2012/Easy2D.vcxproj.filters b/project/vs2012/Easy2D.vcxproj.filters index f127fd92..26a0f207 100644 --- a/project/vs2012/Easy2D.vcxproj.filters +++ b/project/vs2012/Easy2D.vcxproj.filters @@ -31,6 +31,9 @@ {836e9902-e58c-4cfa-9c23-26632ae737ba} + + {8ef0d8e2-1138-40c0-a1a8-0eb681721f4e} + @@ -93,21 +96,6 @@ Base - - Common - - - Common - - - Common - - - Common - - - Common - Manager @@ -150,12 +138,6 @@ Manager - - Common - - - Common - Tool @@ -219,18 +201,49 @@ Tool\Listener + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Custom + - + + + + + + + + + + + - - - - - - - - - \ No newline at end of file diff --git a/project/vs2013/Easy2D.vcxproj b/project/vs2013/Easy2D.vcxproj index 88dac2bb..01d966c3 100644 --- a/project/vs2013/Easy2D.vcxproj +++ b/project/vs2013/Easy2D.vcxproj @@ -92,9 +92,10 @@ Level3 Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true + false None false + true Windows @@ -107,9 +108,10 @@ Level3 Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true + false None false + true Windows @@ -126,8 +128,9 @@ true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true + false None + true Windows @@ -146,8 +149,9 @@ true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true + false None + true Windows @@ -182,13 +186,16 @@ - + + + + @@ -221,17 +228,18 @@ - + + + + + + + + + + + - - - - - - - - - diff --git a/project/vs2013/Easy2D.vcxproj.filters b/project/vs2013/Easy2D.vcxproj.filters index ff40cc2f..e35e84b2 100644 --- a/project/vs2013/Easy2D.vcxproj.filters +++ b/project/vs2013/Easy2D.vcxproj.filters @@ -31,6 +31,9 @@ {8c3a8c7b-5406-400f-9ec1-db294632e449} + + {7660a3fa-36f9-4b1b-8942-e38e02c0c95b} + @@ -93,9 +96,6 @@ Base - - Common - Common @@ -219,18 +219,31 @@ Tool\Listener + + Common + + + Common + + + Common + + + Custom + - + + + + + + + + + + + - - - - - - - - - \ No newline at end of file diff --git a/project/vs2017/Easy2D.vcxproj b/project/vs2017/Easy2D.vcxproj index 9de76ccf..ff901163 100644 --- a/project/vs2017/Easy2D.vcxproj +++ b/project/vs2017/Easy2D.vcxproj @@ -100,9 +100,10 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true + false None false + true Console @@ -126,9 +127,10 @@ Level3 Disabled _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true + false None false + true Console @@ -148,8 +150,10 @@ MaxSpeed true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true + false None + true + true Console @@ -173,8 +177,10 @@ MaxSpeed true NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true + false None + true + true Console