summaryrefslogtreecommitdiff
path: root/build/modules
diff options
context:
space:
mode:
Diffstat (limited to 'build/modules')
-rw-r--r--build/modules/asura-base/asura-base.vcxproj13
-rw-r--r--build/modules/asura-core/asura-core.vcxproj6
-rw-r--r--build/modules/asura-core/asura-core.vcxproj.filters6
-rw-r--r--build/modules/asura-utils/asura-utils.vcxproj2
-rw-r--r--build/modules/asura-utils/asura-utils.vcxproj.filters9
5 files changed, 19 insertions, 17 deletions
diff --git a/build/modules/asura-base/asura-base.vcxproj b/build/modules/asura-base/asura-base.vcxproj
index 62a757e..970e6b1 100644
--- a/build/modules/asura-base/asura-base.vcxproj
+++ b/build/modules/asura-base/asura-base.vcxproj
@@ -20,7 +20,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>15.0</VCProjectVersion>
- <ProjectGuid>{4C2E4AA5-9AE7-461A-9C09-27D1ED516444}</ProjectGuid>
+ <ProjectGuid>{E10B78AA-B90E-4BB7-BAAD-0E2E4C4B9BD1}</ProjectGuid>
<RootNamespace>asurabase</RootNamespace>
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
</PropertyGroup>
@@ -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>
diff --git a/build/modules/asura-core/asura-core.vcxproj b/build/modules/asura-core/asura-core.vcxproj
index 672e007..ed820fa 100644
--- a/build/modules/asura-core/asura-core.vcxproj
+++ b/build/modules/asura-core/asura-core.vcxproj
@@ -142,8 +142,8 @@
<ClCompile Include="..\..\..\source\modules\asura-core\graphics\canvas.cpp" />
<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\gfx_device.cpp" />
<ClCompile Include="..\..\..\source\modules\asura-core\graphics\gif.cpp" />
+ <ClCompile Include="..\..\..\source\modules\asura-core\graphics\gfx_device.cpp" />
<ClCompile Include="..\..\..\source\modules\asura-core\graphics\image.cpp" />
<ClCompile Include="..\..\..\source\modules\asura-core\graphics\index_buffer.cpp" />
<ClCompile Include="..\..\..\source\modules\asura-core\graphics\matrix_stack.cpp" />
@@ -172,6 +172,7 @@
<ClCompile Include="..\..\..\source\modules\asura-core\mesh\mesh2d_data.cpp" />
<ClCompile Include="..\..\..\source\modules\asura-core\mesh\mesh2d_handler.cpp" />
<ClCompile Include="..\..\..\source\modules\asura-core\mesh\obj_handler.cpp" />
+ <ClCompile Include="..\..\..\source\modules\asura-core\profiler\gpu_profiler.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" />
@@ -195,8 +196,8 @@
<ClInclude Include="..\..\..\source\modules\asura-core\graphics\color.h" />
<ClInclude Include="..\..\..\source\modules\asura-core\graphics\color32.h" />
<ClInclude Include="..\..\..\source\modules\asura-core\graphics\color_palette.h" />
- <ClInclude Include="..\..\..\source\modules\asura-core\graphics\gfx_device.h" />
<ClInclude Include="..\..\..\source\modules\asura-core\graphics\gif.h" />
+ <ClInclude Include="..\..\..\source\modules\asura-core\graphics\gfx_device.h" />
<ClInclude Include="..\..\..\source\modules\asura-core\graphics\image.h" />
<ClInclude Include="..\..\..\source\modules\asura-core\graphics\index_buffer.h" />
<ClInclude Include="..\..\..\source\modules\asura-core\graphics\matrix_stack.h" />
@@ -231,6 +232,7 @@
<ClInclude Include="..\..\..\source\modules\asura-core\mesh\mesh2d_data.h" />
<ClInclude Include="..\..\..\source\modules\asura-core\mesh\mesh2d_handler.h" />
<ClInclude Include="..\..\..\source\modules\asura-core\mesh\obj_handler.h" />
+ <ClInclude Include="..\..\..\source\modules\asura-core\profiler\gpu_profiler.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" />
diff --git a/build/modules/asura-core/asura-core.vcxproj.filters b/build/modules/asura-core/asura-core.vcxproj.filters
index 51106c7..b5cda13 100644
--- a/build/modules/asura-core/asura-core.vcxproj.filters
+++ b/build/modules/asura-core/asura-core.vcxproj.filters
@@ -215,6 +215,9 @@
<ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_gfx_device.cpp">
<Filter>graphics\binding</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\source\modules\asura-core\profiler\gpu_profiler.cpp">
+ <Filter>profiler</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\modules\asura-core\application.h" />
@@ -380,6 +383,9 @@
<ClInclude Include="..\..\..\source\modules\asura-core\graphics\gfx_device.h">
<Filter>graphics</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\source\modules\asura-core\profiler\gpu_profiler.h">
+ <Filter>profiler</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\source\modules\asura-core\font\string.inl">
diff --git a/build/modules/asura-utils/asura-utils.vcxproj b/build/modules/asura-utils/asura-utils.vcxproj
index d4dd1b9..3517962 100644
--- a/build/modules/asura-utils/asura-utils.vcxproj
+++ b/build/modules/asura-utils/asura-utils.vcxproj
@@ -122,7 +122,6 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\source\libs\asura-lib-utils\profiler\memory_leak.cpp" />
<ClCompile Include="..\..\..\source\modules\asura-utils\exceptions\exception.cpp" />
<ClCompile Include="..\..\..\source\modules\asura-utils\io\binding\_compressor.cpp" />
<ClCompile Include="..\..\..\source\modules\asura-utils\io\binding\_data_buffer.cpp" />
@@ -159,7 +158,6 @@
<ClCompile Include="..\..\..\source\modules\asura-utils\utils_module.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\..\source\libs\asura-lib-utils\profiler\memory_leak.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\data_buffer.h" />
diff --git a/build/modules/asura-utils/asura-utils.vcxproj.filters b/build/modules/asura-utils/asura-utils.vcxproj.filters
index fff909d..3c6d092 100644
--- a/build/modules/asura-utils/asura-utils.vcxproj.filters
+++ b/build/modules/asura-utils/asura-utils.vcxproj.filters
@@ -22,9 +22,6 @@
<Filter Include="threading\binding">
<UniqueIdentifier>{e63982e2-a2ca-4aa2-be11-f98659586c1f}</UniqueIdentifier>
</Filter>
- <Filter Include="profiler">
- <UniqueIdentifier>{be44a97c-e5d0-4262-8b13-a86f7df23590}</UniqueIdentifier>
- </Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\modules\asura-utils\exceptions\exception.cpp">
@@ -125,9 +122,6 @@
<ClCompile Include="..\..\..\source\modules\asura-utils\threading\conditional.cpp">
<Filter>threading</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\libs\asura-lib-utils\profiler\memory_leak.cpp">
- <Filter>profiler</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\modules\asura-utils\exceptions\exception.h">
@@ -232,9 +226,6 @@
<Filter>threading</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\modules\asura-utils\io\renewable.h" />
- <ClInclude Include="..\..\..\source\libs\asura-lib-utils\profiler\memory_leak.h">
- <Filter>profiler</Filter>
- </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\source\modules\asura-utils\math\rect.inl">