diff options
Diffstat (limited to 'build/modules/asura-core')
-rw-r--r-- | build/modules/asura-core/asura-core.vcxproj | 69 | ||||
-rw-r--r-- | build/modules/asura-core/asura-core.vcxproj.filters | 149 |
2 files changed, 123 insertions, 95 deletions
diff --git a/build/modules/asura-core/asura-core.vcxproj b/build/modules/asura-core/asura-core.vcxproj index e539e72..e9b1c06 100644 --- a/build/modules/asura-core/asura-core.vcxproj +++ b/build/modules/asura-core/asura-core.vcxproj @@ -39,13 +39,13 @@ <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <PlatformToolset>v141</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <PlatformToolset>v141</PlatformToolset> <WholeProgramOptimization>true</WholeProgramOptimization> @@ -69,7 +69,12 @@ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> - <PropertyGroup /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <OutDir>$(SolutionDir)..\Bin\win64</OutDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <OutDir>$(SolutionDir)..\Bin\win64</OutDir> + </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <WarningLevel>Level3</WarningLevel> @@ -126,8 +131,6 @@ <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_color.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_color32.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_image.cpp" /> - <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_image_data.cpp" /> - <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_image_decode_task.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_mesh2d.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_shader.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_sprite_batch.cpp" /> @@ -138,33 +141,35 @@ <ClCompile Include="..\..\..\source\modules\asura-core\graphics\gif.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\graphics\gl.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\graphics\image.cpp" /> - <ClCompile Include="..\..\..\source\modules\asura-core\graphics\image_data.cpp" /> - <ClCompile Include="..\..\..\source\modules\asura-core\graphics\image_decode_task.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\graphics\mesh2d.cpp" /> - <ClCompile Include="..\..\..\source\modules\asura-core\graphics\mesh2d_data.cpp" /> - <ClCompile Include="..\..\..\source\modules\asura-core\graphics\png_decoder.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\graphics\quad.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\graphics\render_target.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\graphics\shader.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\graphics\shape.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\graphics\sprite_batch.cpp" /> - <ClCompile Include="..\..\..\source\modules\asura-core\graphics\stb_decoder.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\graphics\texture.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-core\image\binding\_image_data.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-core\image\binding\_image_decode_task.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-core\image\image_data.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-core\image\image_decode_task.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-core\image\png_decoder.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-core\image\stb_decoder.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\input\clipboard.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\input\cursor.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\input\cursor_impl_sdl.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\input\equeue.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\input\keyboard.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\input\mouse.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-core\mesh\mesh2d_data.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\profiler\stats.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\threading\channel.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\threading\thread_ex.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\time\timer.cpp" /> - <ClCompile Include="..\..\..\source\modules\asura-core\wnd\binding\_window.cpp" /> - <ClCompile Include="..\..\..\source\modules\asura-core\wnd\window.cpp" /> - <ClCompile Include="..\..\..\source\modules\asura-core\wnd\window_impl_glew.cpp" /> - <ClCompile Include="..\..\..\source\modules\asura-core\wnd\window_impl_glut.cpp" /> - <ClCompile Include="..\..\..\source\modules\asura-core\wnd\window_impl_sdl.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-core\window\binding\_window.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-core\window\window.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-core\window\window_impl_glew.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-core\window\window_impl_glut.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-core\window\window_impl_sdl.cpp" /> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\source\modules\asura-core\application.h" /> @@ -182,12 +187,7 @@ <ClInclude Include="..\..\..\source\modules\asura-core\graphics\gif.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\graphics\gl.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\graphics\image.h" /> - <ClInclude Include="..\..\..\source\modules\asura-core\graphics\image_data.h" /> - <ClInclude Include="..\..\..\source\modules\asura-core\graphics\image_decoder.h" /> - <ClInclude Include="..\..\..\source\modules\asura-core\graphics\image_decode_task.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\graphics\mesh2d.h" /> - <ClInclude Include="..\..\..\source\modules\asura-core\graphics\mesh2d_data.h" /> - <ClInclude Include="..\..\..\source\modules\asura-core\graphics\png_decoder.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\graphics\quad.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\graphics\render_state.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\graphics\render_target.h" /> @@ -195,8 +195,12 @@ <ClInclude Include="..\..\..\source\modules\asura-core\graphics\shader_source.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\graphics\shape.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\graphics\sprite_batch.h" /> - <ClInclude Include="..\..\..\source\modules\asura-core\graphics\stb_decoder.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\graphics\texture.h" /> + <ClInclude Include="..\..\..\source\modules\asura-core\image\image_data.h" /> + <ClInclude Include="..\..\..\source\modules\asura-core\image\image_decoder.h" /> + <ClInclude Include="..\..\..\source\modules\asura-core\image\image_decode_task.h" /> + <ClInclude Include="..\..\..\source\modules\asura-core\image\png_decoder.h" /> + <ClInclude Include="..\..\..\source\modules\asura-core\image\stb_decoder.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\input\clipboard.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\input\cursor.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\input\cursor_impl_sdl.h" /> @@ -209,21 +213,36 @@ <ClInclude Include="..\..\..\source\modules\asura-core\input\keyboard.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\input\mouse.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\input\event_manager.h" /> + <ClInclude Include="..\..\..\source\modules\asura-core\mesh\mesh2d_data.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\profiler\stats.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\threading\channel.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\threading\thread_ex.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\time\timer.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\type.h" /> - <ClInclude Include="..\..\..\source\modules\asura-core\wnd\window.h" /> - <ClInclude Include="..\..\..\source\modules\asura-core\wnd\window_impl_glew.h" /> - <ClInclude Include="..\..\..\source\modules\asura-core\wnd\window_impl_glut.h" /> - <ClInclude Include="..\..\..\source\modules\asura-core\wnd\window_impl_sdl.h" /> + <ClInclude Include="..\..\..\source\modules\asura-core\window\window.h" /> + <ClInclude Include="..\..\..\source\modules\asura-core\window\window_impl_glew.h" /> + <ClInclude Include="..\..\..\source\modules\asura-core\window\window_impl_glut.h" /> + <ClInclude Include="..\..\..\source\modules\asura-core\window\window_impl_sdl.h" /> </ItemGroup> <ItemGroup> <None Include="..\..\..\source\modules\asura-core\font\string.inl" /> <None Include="..\..\..\source\modules\asura-core\font\utf.inl" /> <None Include="..\..\..\source\modules\asura-core\input\keys.h" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\3rd-party\glad\glad.vcxproj"> + <Project>{c0ed7d78-570b-454a-b3b6-576fdcb43d69}</Project> + </ProjectReference> + <ProjectReference Include="..\..\3rd-party\SDL2\SDL2.vcxproj"> + <Project>{208b9cb8-2101-42a9-9502-0cf54912bc57}</Project> + </ProjectReference> + <ProjectReference Include="..\..\3rd-party\stb\stb.vcxproj"> + <Project>{6ba52bbb-8da5-4f51-be3f-1e49f5089498}</Project> + </ProjectReference> + <ProjectReference Include="..\asura-utils\asura-utils.vcxproj"> + <Project>{7d41093f-e356-4c5b-a25f-41779bf86e54}</Project> + </ProjectReference> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> diff --git a/build/modules/asura-core/asura-core.vcxproj.filters b/build/modules/asura-core/asura-core.vcxproj.filters index eb4b20c..0482ee1 100644 --- a/build/modules/asura-core/asura-core.vcxproj.filters +++ b/build/modules/asura-core/asura-core.vcxproj.filters @@ -22,14 +22,23 @@ <Filter Include="threading"> <UniqueIdentifier>{05477a0e-f70b-4606-ae96-82ef7a7b8a1d}</UniqueIdentifier> </Filter> - <Filter Include="wnd"> + <Filter Include="input\binding"> + <UniqueIdentifier>{66e43743-1be3-414a-9f3c-473d40613892}</UniqueIdentifier> + </Filter> + <Filter Include="image"> + <UniqueIdentifier>{5061f7d5-03a9-480a-83eb-35d9806abde3}</UniqueIdentifier> + </Filter> + <Filter Include="mesh"> + <UniqueIdentifier>{0a758ae6-91a0-462a-968f-aa3412a714ae}</UniqueIdentifier> + </Filter> + <Filter Include="window"> <UniqueIdentifier>{7a73607c-8da6-4865-a992-5c7c8764bd5a}</UniqueIdentifier> </Filter> - <Filter Include="wnd\binding"> + <Filter Include="window\binding"> <UniqueIdentifier>{139aa01b-d038-4361-9edd-f81d8ba37730}</UniqueIdentifier> </Filter> - <Filter Include="input\binding"> - <UniqueIdentifier>{66e43743-1be3-414a-9f3c-473d40613892}</UniqueIdentifier> + <Filter Include="image\binding"> + <UniqueIdentifier>{43e14e72-d4cb-47b8-b55c-7327a6fc0508}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> @@ -49,12 +58,6 @@ <ClCompile Include="..\..\..\source\modules\asura-core\graphics\mesh2d.cpp"> <Filter>graphics</Filter> </ClCompile> - <ClCompile Include="..\..\..\source\modules\asura-core\graphics\mesh2d_data.cpp"> - <Filter>graphics</Filter> - </ClCompile> - <ClCompile Include="..\..\..\source\modules\asura-core\graphics\png_decoder.cpp"> - <Filter>graphics</Filter> - </ClCompile> <ClCompile Include="..\..\..\source\modules\asura-core\graphics\quad.cpp"> <Filter>graphics</Filter> </ClCompile> @@ -70,9 +73,6 @@ <ClCompile Include="..\..\..\source\modules\asura-core\graphics\sprite_batch.cpp"> <Filter>graphics</Filter> </ClCompile> - <ClCompile Include="..\..\..\source\modules\asura-core\graphics\stb_decoder.cpp"> - <Filter>graphics</Filter> - </ClCompile> <ClCompile Include="..\..\..\source\modules\asura-core\graphics\texture.cpp"> <Filter>graphics</Filter> </ClCompile> @@ -107,12 +107,6 @@ <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_image.cpp"> <Filter>graphics\binding</Filter> </ClCompile> - <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_image_data.cpp"> - <Filter>graphics\binding</Filter> - </ClCompile> - <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_image_decode_task.cpp"> - <Filter>graphics\binding</Filter> - </ClCompile> <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_mesh2d.cpp"> <Filter>graphics\binding</Filter> </ClCompile> @@ -131,30 +125,9 @@ <ClCompile Include="..\..\..\source\modules\asura-core\graphics\image.cpp"> <Filter>graphics</Filter> </ClCompile> - <ClCompile Include="..\..\..\source\modules\asura-core\graphics\image_data.cpp"> - <Filter>graphics</Filter> - </ClCompile> - <ClCompile Include="..\..\..\source\modules\asura-core\graphics\image_decode_task.cpp"> - <Filter>graphics</Filter> - </ClCompile> - <ClCompile Include="..\..\..\source\modules\asura-core\wnd\window.cpp"> - <Filter>wnd</Filter> - </ClCompile> - <ClCompile Include="..\..\..\source\modules\asura-core\wnd\window_impl_glew.cpp"> - <Filter>wnd</Filter> - </ClCompile> - <ClCompile Include="..\..\..\source\modules\asura-core\wnd\window_impl_glut.cpp"> - <Filter>wnd</Filter> - </ClCompile> - <ClCompile Include="..\..\..\source\modules\asura-core\wnd\window_impl_sdl.cpp"> - <Filter>wnd</Filter> - </ClCompile> <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_texture.cpp"> <Filter>graphics\binding</Filter> </ClCompile> - <ClCompile Include="..\..\..\source\modules\asura-core\wnd\binding\_window.cpp"> - <Filter>wnd\binding</Filter> - </ClCompile> <ClCompile Include="..\..\..\source\modules\asura-core\input\clipboard.cpp"> <Filter>input</Filter> </ClCompile> @@ -173,6 +146,42 @@ <ClCompile Include="..\..\..\source\modules\asura-core\input\equeue.cpp"> <Filter>input</Filter> </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-core\image\image_data.cpp"> + <Filter>image</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-core\image\image_decode_task.cpp"> + <Filter>image</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-core\image\png_decoder.cpp"> + <Filter>image</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-core\image\stb_decoder.cpp"> + <Filter>image</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-core\mesh\mesh2d_data.cpp"> + <Filter>mesh</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-core\window\window.cpp"> + <Filter>window</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-core\window\window_impl_glew.cpp"> + <Filter>window</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-core\window\window_impl_glut.cpp"> + <Filter>window</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-core\window\window_impl_sdl.cpp"> + <Filter>window</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-core\window\binding\_window.cpp"> + <Filter>window\binding</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-core\image\binding\_image_data.cpp"> + <Filter>image\binding</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-core\image\binding\_image_decode_task.cpp"> + <Filter>image\binding</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\source\modules\asura-core\application.h" /> @@ -197,12 +206,6 @@ <ClInclude Include="..\..\..\source\modules\asura-core\graphics\mesh2d.h"> <Filter>graphics</Filter> </ClInclude> - <ClInclude Include="..\..\..\source\modules\asura-core\graphics\mesh2d_data.h"> - <Filter>graphics</Filter> - </ClInclude> - <ClInclude Include="..\..\..\source\modules\asura-core\graphics\png_decoder.h"> - <Filter>graphics</Filter> - </ClInclude> <ClInclude Include="..\..\..\source\modules\asura-core\graphics\quad.h"> <Filter>graphics</Filter> </ClInclude> @@ -221,9 +224,6 @@ <ClInclude Include="..\..\..\source\modules\asura-core\graphics\sprite_batch.h"> <Filter>graphics</Filter> </ClInclude> - <ClInclude Include="..\..\..\source\modules\asura-core\graphics\stb_decoder.h"> - <Filter>graphics</Filter> - </ClInclude> <ClInclude Include="..\..\..\source\modules\asura-core\graphics\texture.h"> <Filter>graphics</Filter> </ClInclude> @@ -260,27 +260,6 @@ <ClInclude Include="..\..\..\source\modules\asura-core\graphics\image.h"> <Filter>graphics</Filter> </ClInclude> - <ClInclude Include="..\..\..\source\modules\asura-core\graphics\image_data.h"> - <Filter>graphics</Filter> - </ClInclude> - <ClInclude Include="..\..\..\source\modules\asura-core\graphics\image_decode_task.h"> - <Filter>graphics</Filter> - </ClInclude> - <ClInclude Include="..\..\..\source\modules\asura-core\graphics\image_decoder.h"> - <Filter>graphics</Filter> - </ClInclude> - <ClInclude Include="..\..\..\source\modules\asura-core\wnd\window.h"> - <Filter>wnd</Filter> - </ClInclude> - <ClInclude Include="..\..\..\source\modules\asura-core\wnd\window_impl_glew.h"> - <Filter>wnd</Filter> - </ClInclude> - <ClInclude Include="..\..\..\source\modules\asura-core\wnd\window_impl_glut.h"> - <Filter>wnd</Filter> - </ClInclude> - <ClInclude Include="..\..\..\source\modules\asura-core\wnd\window_impl_sdl.h"> - <Filter>wnd</Filter> - </ClInclude> <ClInclude Include="..\..\..\source\modules\asura-core\input\clipboard.h"> <Filter>input</Filter> </ClInclude> @@ -320,6 +299,36 @@ <ClInclude Include="..\..\..\source\modules\asura-core\graphics\shader_source.h"> <Filter>graphics</Filter> </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-core\image\image_decoder.h"> + <Filter>image</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-core\image\image_data.h"> + <Filter>image</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-core\image\image_decode_task.h"> + <Filter>image</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-core\image\png_decoder.h"> + <Filter>image</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-core\image\stb_decoder.h"> + <Filter>image</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-core\mesh\mesh2d_data.h"> + <Filter>mesh</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-core\window\window.h"> + <Filter>window</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-core\window\window_impl_glew.h"> + <Filter>window</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-core\window\window_impl_glut.h"> + <Filter>window</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-core\window\window_impl_sdl.h"> + <Filter>window</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <None Include="..\..\..\source\modules\asura-core\font\string.inl"> |