diff options
Diffstat (limited to 'build')
7 files changed, 62 insertions, 24 deletions
diff --git a/build/Asura.Runner/Asura.Runner.vcxproj b/build/Asura.Runner/Asura.Runner.vcxproj index 0c18dc5..d145fa3 100644 --- a/build/Asura.Runner/Asura.Runner.vcxproj +++ b/build/Asura.Runner/Asura.Runner.vcxproj @@ -76,6 +76,7 @@ <Optimization>Disabled</Optimization> <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> + <AdditionalIncludeDirectories>$(SolutionDir)..\source\external;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -108,6 +109,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> + <AdditionalIncludeDirectories>$(SolutionDir)..\source\external;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> <EnableCOMDATFolding>true</EnableCOMDATFolding> @@ -115,6 +117,7 @@ </Link> </ItemDefinitionGroup> <ItemGroup> + <ClCompile Include="..\..\source\Asura.Runner\Main.cpp" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> diff --git a/build/Asura.Runner/Asura.Runner.vcxproj.filters b/build/Asura.Runner/Asura.Runner.vcxproj.filters index 3c6f4fd..ea4223b 100644 --- a/build/Asura.Runner/Asura.Runner.vcxproj.filters +++ b/build/Asura.Runner/Asura.Runner.vcxproj.filters @@ -1,17 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <Filter Include="源文件"> - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - <Filter Include="头文件"> - <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> - <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions> - </Filter> - <Filter Include="资源文件"> - <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;mfcribbon-ms</Extensions> - </Filter> + <ClCompile Include="..\..\source\Asura.Runner\Main.cpp" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/build/modules/asura-core/asura-core.vcxproj b/build/modules/asura-core/asura-core.vcxproj index a14c816..68347b5 100644 --- a/build/modules/asura-core/asura-core.vcxproj +++ b/build/modules/asura-core/asura-core.vcxproj @@ -143,18 +143,22 @@ <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Color.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Color32.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\DrawInfo.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\DrawUtil.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\GfxDevice.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\GPUBuffer.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\GraphicsHelper.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Image.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\IndexBuffer.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\MatrixStack.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Mesh2D.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Polygon2D.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Quad.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\RenderTarget.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\SpriteBatch.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Texture.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\VBO.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\VertexBuffer.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\image\binding\_image_data.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\image\binding\_image_decode_task.cpp" /> @@ -163,7 +167,9 @@ <ClCompile Include="..\..\..\source\modules\asura-core\Image\PngDecoder.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\Image\StbDecoder.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\Input\ClipBoard.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-core\Input\InputAxis.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\Input\InputDevice.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-core\Input\InputEvent.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\Input\InputManager.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\Mesh\Am2Handler.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\Mesh\Mesh2DData.cpp" /> @@ -194,12 +200,15 @@ <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Color32.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\ColorPalette.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\DrawInfo.h" /> + <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\DrawUtil.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\GfxDevice.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\GPUBuffer.h" /> + <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\GraphicsHelper.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Image.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\IndexBuffer.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\MatrixStack.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Mesh2D.h" /> + <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Polygon2D.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Quad.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\RenderState.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\RenderTarget.h" /> @@ -207,6 +216,7 @@ <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Shape.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\SpriteBatch.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Texture.h" /> + <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\VBO.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\VertexBuffer.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\Image\ImageData.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\Image\ImageDecoder.h" /> @@ -215,11 +225,12 @@ <ClInclude Include="..\..\..\source\modules\asura-core\Image\StbDecoder.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\Input\Button.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\Input\ClipBoard.h" /> + <ClInclude Include="..\..\..\source\modules\asura-core\Input\InputAxis.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\Input\InputDevice.h" /> + <ClInclude Include="..\..\..\source\modules\asura-core\Input\InputEvent.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\Input\InputManager.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\Input\JoystickState.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\Input\KeyboardState.h" /> - <ClInclude Include="..\..\..\source\modules\asura-core\Input\Keys.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\Input\MouseState.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\Mesh\Am2Handler.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\Mesh\Mesh2DData.h" /> diff --git a/build/modules/asura-core/asura-core.vcxproj.filters b/build/modules/asura-core/asura-core.vcxproj.filters index 6c45670..6240784 100644 --- a/build/modules/asura-core/asura-core.vcxproj.filters +++ b/build/modules/asura-core/asura-core.vcxproj.filters @@ -209,6 +209,24 @@ <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\DrawInfo.cpp"> <Filter>Graphics</Filter> </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\DrawUtil.cpp"> + <Filter>Graphics</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Polygon2D.cpp"> + <Filter>Graphics</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\GraphicsHelper.cpp"> + <Filter>Graphics</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\VBO.cpp"> + <Filter>Graphics</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-core\Input\InputEvent.cpp"> + <Filter>Input</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-core\Input\InputAxis.cpp"> + <Filter>Input</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\source\modules\asura-core\Font\Glyph.h"> @@ -310,9 +328,6 @@ <ClInclude Include="..\..\..\source\modules\asura-core\Input\KeyboardState.h"> <Filter>Input</Filter> </ClInclude> - <ClInclude Include="..\..\..\source\modules\asura-core\Input\Keys.h"> - <Filter>Input</Filter> - </ClInclude> <ClInclude Include="..\..\..\source\modules\asura-core\Input\MouseState.h"> <Filter>Input</Filter> </ClInclude> @@ -365,6 +380,24 @@ <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\DrawInfo.h"> <Filter>Graphics</Filter> </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\DrawUtil.h"> + <Filter>Graphics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Polygon2D.h"> + <Filter>Graphics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\GraphicsHelper.h"> + <Filter>Graphics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\VBO.h"> + <Filter>Graphics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-core\Input\InputEvent.h"> + <Filter>Input</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-core\Input\InputAxis.h"> + <Filter>Input</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <None Include="..\..\..\source\modules\asura-core\Font\String.inc"> diff --git a/build/modules/asura-utils/asura-utils.vcxproj b/build/modules/asura-utils/asura-utils.vcxproj index f314953..40ea6b6 100644 --- a/build/modules/asura-utils/asura-utils.vcxproj +++ b/build/modules/asura-utils/asura-utils.vcxproj @@ -159,6 +159,7 @@ </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\source\modules\asura-utils\Classes.h" /> + <ClInclude Include="..\..\..\source\modules\asura-utils\dynamic_bitset.h" /> <ClInclude Include="..\..\..\source\modules\asura-utils\Exceptions\Exception.h" /> <ClInclude Include="..\..\..\source\modules\asura-utils\IO\Compressor.h" /> <ClInclude Include="..\..\..\source\modules\asura-utils\IO\DataBuffer.h" /> diff --git a/build/modules/asura-utils/asura-utils.vcxproj.filters b/build/modules/asura-utils/asura-utils.vcxproj.filters index 1305948..c0488cb 100644 --- a/build/modules/asura-utils/asura-utils.vcxproj.filters +++ b/build/modules/asura-utils/asura-utils.vcxproj.filters @@ -195,6 +195,13 @@ <ClInclude Include="..\..\..\source\modules\asura-utils\Utils.h" /> <ClInclude Include="..\..\..\source\modules\asura-utils\UtilsConfig.h" /> <ClInclude Include="..\..\..\source\modules\asura-utils\UtilsModule.h" /> + <ClInclude Include="..\..\..\source\modules\asura-utils\Math\Rand\Rand.h"> + <Filter>Math\Rand</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-utils\Type.h" /> + <ClInclude Include="..\..\..\source\modules\asura-utils\Math\Rand\Random.h"> + <Filter>Math\Rand</Filter> + </ClInclude> <ClInclude Include="..\..\..\source\modules\asura-utils\Threads\Conditional.h"> <Filter>Threads</Filter> </ClInclude> @@ -228,13 +235,7 @@ <ClInclude Include="..\..\..\source\modules\asura-utils\Threads\ThreadImplWin32.h"> <Filter>Threads</Filter> </ClInclude> - <ClInclude Include="..\..\..\source\modules\asura-utils\Math\Rand\Rand.h"> - <Filter>Math\Rand</Filter> - </ClInclude> - <ClInclude Include="..\..\..\source\modules\asura-utils\Type.h" /> - <ClInclude Include="..\..\..\source\modules\asura-utils\Math\Rand\Random.h"> - <Filter>Math\Rand</Filter> - </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-utils\dynamic_bitset.h" /> </ItemGroup> <ItemGroup> <None Include="..\..\..\source\modules\asura-utils\Math\Rect.inc"> diff --git a/build/tools/bindingGen/obj/Debug/bindingGen.csproj.CoreCompileInputs.cache b/build/tools/bindingGen/obj/Debug/bindingGen.csproj.CoreCompileInputs.cache index c1e0407..93b7e43 100644 --- a/build/tools/bindingGen/obj/Debug/bindingGen.csproj.CoreCompileInputs.cache +++ b/build/tools/bindingGen/obj/Debug/bindingGen.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -534362588ad2d4462c430a54eb5dee7ab94c0164 +76869cb9eeaafde93fc35e764d87dc7f1f272b2f |