summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2019-01-21 20:26:33 +0800
committerchai <chaifix@163.com>2019-01-21 20:26:33 +0800
commit14c54b13021b8512f784fa9d943d7567f6ebf2f5 (patch)
tree5ac4ac7ce584c0db32daf53ea92f3800376952e2 /Build
parentde619ff34b3e82f10908c2e62e1fef948fbf8601 (diff)
*packer
Diffstat (limited to 'Build')
-rw-r--r--Build/3rdParty/lua51c/lua51c.vcxproj122
-rw-r--r--Build/3rdParty/lua51c/lua51c.vcxproj.filters2
-rw-r--r--Build/3rdParty/lua51c/lua51c.vcxproj.user4
-rw-r--r--Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj123
-rw-r--r--Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj.filters6
-rw-r--r--Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj.user4
-rw-r--r--Build/Asura.Editor/Asura.Editor.vcxproj8
-rw-r--r--Build/Asura.Editor/Asura.Editor.vcxproj.filters11
-rw-r--r--Build/Asura.Engine/Asura.Engine.vcxproj9
-rw-r--r--Build/Asura.Engine/Asura.Engine.vcxproj.filters6
-rw-r--r--Build/Asura.Framework/Asura.Framework.vcxproj9
-rw-r--r--Build/Asura.Framework/Asura.Framework.vcxproj.filters7
-rw-r--r--Build/Asura.Runner/Asura.Runner.vcxproj7
-rw-r--r--Build/Asura.sln21
14 files changed, 327 insertions, 12 deletions
diff --git a/Build/3rdParty/lua51c/lua51c.vcxproj b/Build/3rdParty/lua51c/lua51c.vcxproj
new file mode 100644
index 0000000..86cadd0
--- /dev/null
+++ b/Build/3rdParty/lua51c/lua51c.vcxproj
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <VCProjectVersion>15.0</VCProjectVersion>
+ <ProjectGuid>{B8F9616D-5393-4B34-B191-D200D1985439}</ProjectGuid>
+ <RootNamespace>lua51c</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v141</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v141</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v141</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v141</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="Shared">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup />
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ </ClCompile>
+ <Link>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ </ClCompile>
+ <Link>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project> \ No newline at end of file
diff --git a/Build/3rdParty/lua51c/lua51c.vcxproj.filters b/Build/3rdParty/lua51c/lua51c.vcxproj.filters
new file mode 100644
index 0000000..9cd8510
--- /dev/null
+++ b/Build/3rdParty/lua51c/lua51c.vcxproj.filters
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" /> \ No newline at end of file
diff --git a/Build/3rdParty/lua51c/lua51c.vcxproj.user b/Build/3rdParty/lua51c/lua51c.vcxproj.user
new file mode 100644
index 0000000..be25078
--- /dev/null
+++ b/Build/3rdParty/lua51c/lua51c.vcxproj.user
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup />
+</Project> \ No newline at end of file
diff --git a/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj b/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj
new file mode 100644
index 0000000..a1869e3
--- /dev/null
+++ b/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <VCProjectVersion>15.0</VCProjectVersion>
+ <ProjectGuid>{6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07}</ProjectGuid>
+ <RootNamespace>AsuraPacker</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v141</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v141</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v141</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v141</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="Shared">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup />
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ </ClCompile>
+ <Link>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ </ClCompile>
+ <Link>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\Source\Asura.Packer\main.cpp" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project> \ No newline at end of file
diff --git a/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj.filters b/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj.filters
new file mode 100644
index 0000000..2c4b403
--- /dev/null
+++ b/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj.filters
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <ClCompile Include="..\..\..\Source\Asura.Packer\main.cpp" />
+ </ItemGroup>
+</Project> \ No newline at end of file
diff --git a/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj.user b/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj.user
new file mode 100644
index 0000000..be25078
--- /dev/null
+++ b/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj.user
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup />
+</Project> \ No newline at end of file
diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj b/Build/Asura.Editor/Asura.Editor.vcxproj
index b08b448..7549f5b 100644
--- a/Build/Asura.Editor/Asura.Editor.vcxproj
+++ b/Build/Asura.Editor/Asura.Editor.vcxproj
@@ -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|Win32'">
+ <TargetName>Asura Editor</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <TargetName>Asura Editor</TargetName>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
@@ -115,6 +120,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
+ <None Include="..\..\Source\Asura.Editor\Scripts\main.lua" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj.filters b/Build/Asura.Editor/Asura.Editor.vcxproj.filters
index 289ae9c..16a2274 100644
--- a/Build/Asura.Editor/Asura.Editor.vcxproj.filters
+++ b/Build/Asura.Editor/Asura.Editor.vcxproj.filters
@@ -4,5 +4,16 @@
<Filter Include="Plugins">
<UniqueIdentifier>{99018b81-eb4c-423f-87ac-fe6ef75debb3}</UniqueIdentifier>
</Filter>
+ <Filter Include="Source">
+ <UniqueIdentifier>{df219ecb-2a99-443c-9313-5a6dc80a3255}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Scripts">
+ <UniqueIdentifier>{d9c4718f-cf20-4282-acc4-9bc96e02907c}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="..\..\Source\Asura.Editor\Scripts\main.lua">
+ <Filter>Scripts</Filter>
+ </None>
</ItemGroup>
</Project> \ No newline at end of file
diff --git a/Build/Asura.Engine/Asura.Engine.vcxproj b/Build/Asura.Engine/Asura.Engine.vcxproj
index 8941533..d19cd79 100644
--- a/Build/Asura.Engine/Asura.Engine.vcxproj
+++ b/Build/Asura.Engine/Asura.Engine.vcxproj
@@ -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|Win32'">
+ <TargetName>libasura</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <TargetName>libasura</TargetName>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
@@ -145,7 +150,6 @@
<ClInclude Include="..\..\Source\Asura.Engine\AI\BehaviorTree.h" />
<ClInclude Include="..\..\Source\Asura.Engine\AI\StateMachine.h" />
<ClInclude Include="..\..\Source\Asura.Engine\Audio\Sound.h" />
- <ClInclude Include="..\..\Source\Asura.Engine\Audio\Source.h" />
<ClInclude Include="..\..\Source\Asura.Engine\Containers\Map.h" />
<ClInclude Include="..\..\Source\Asura.Engine\Containers\Stack.h" />
<ClInclude Include="..\..\Source\Asura.Engine\Containers\String.h" />
@@ -190,7 +194,6 @@
<ClCompile Include="..\..\Source\Asura.Engine\AI\BehaviorTree.cpp" />
<ClCompile Include="..\..\Source\Asura.Engine\AI\StateMachine.cpp" />
<ClCompile Include="..\..\Source\Asura.Engine\Audio\Sound.cpp" />
- <ClCompile Include="..\..\Source\Asura.Engine\Audio\Source.cpp" />
<ClCompile Include="..\..\Source\Asura.Engine\Containers\Map.cpp" />
<ClCompile Include="..\..\Source\Asura.Engine\Containers\Stack.cpp" />
<ClCompile Include="..\..\Source\Asura.Engine\Containers\String.cpp" />
diff --git a/Build/Asura.Engine/Asura.Engine.vcxproj.filters b/Build/Asura.Engine/Asura.Engine.vcxproj.filters
index 75b031c..179127c 100644
--- a/Build/Asura.Engine/Asura.Engine.vcxproj.filters
+++ b/Build/Asura.Engine/Asura.Engine.vcxproj.filters
@@ -51,9 +51,6 @@
<ClInclude Include="..\..\Source\Asura.Engine\Audio\Sound.h">
<Filter>Audio</Filter>
</ClInclude>
- <ClInclude Include="..\..\Source\Asura.Engine\Audio\Source.h">
- <Filter>Audio</Filter>
- </ClInclude>
<ClInclude Include="..\..\Source\Asura.Engine\Containers\Map.h">
<Filter>Containers</Filter>
</ClInclude>
@@ -175,9 +172,6 @@
<ClCompile Include="..\..\Source\Asura.Engine\Audio\Sound.cpp">
<Filter>Audio</Filter>
</ClCompile>
- <ClCompile Include="..\..\Source\Asura.Engine\Audio\Source.cpp">
- <Filter>Audio</Filter>
- </ClCompile>
<ClCompile Include="..\..\Source\Asura.Engine\Containers\Map.cpp">
<Filter>Containers</Filter>
</ClCompile>
diff --git a/Build/Asura.Framework/Asura.Framework.vcxproj b/Build/Asura.Framework/Asura.Framework.vcxproj
index dce695a..a0da8ad 100644
--- a/Build/Asura.Framework/Asura.Framework.vcxproj
+++ b/Build/Asura.Framework/Asura.Framework.vcxproj
@@ -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|Win32'">
+ <TargetName>asura_framework</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <TargetName>asura_framework</TargetName>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
@@ -116,6 +121,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<None Include="..\..\Source\Asura.Framework\AI\StateMachine.lua" />
+ <None Include="..\..\Source\Asura.Framework\Audio\SoundPlayer.lua" />
<None Include="..\..\Source\Asura.Framework\Class.lua" />
<None Include="..\..\Source\Asura.Framework\Component.lua" />
<None Include="..\..\Source\Asura.Framework\Filesystem\AnimationLoader.lua" />
@@ -125,6 +131,7 @@
<None Include="..\..\Source\Asura.Framework\Filesystem\PathLoader.lua" />
<None Include="..\..\Source\Asura.Framework\Filesystem\PrefabLoader.lua" />
<None Include="..\..\Source\Asura.Framework\Filesystem\SceneLoader.lua" />
+ <None Include="..\..\Source\Asura.Framework\Framework.lua" />
<None Include="..\..\Source\Asura.Framework\GameObject.lua" />
<None Include="..\..\Source\Asura.Framework\Graphics\Animation.lua" />
<None Include="..\..\Source\Asura.Framework\Graphics\Animator.lua" />
diff --git a/Build/Asura.Framework/Asura.Framework.vcxproj.filters b/Build/Asura.Framework/Asura.Framework.vcxproj.filters
index b669674..7d312e4 100644
--- a/Build/Asura.Framework/Asura.Framework.vcxproj.filters
+++ b/Build/Asura.Framework/Asura.Framework.vcxproj.filters
@@ -22,6 +22,9 @@
<Filter Include="Math">
<UniqueIdentifier>{4ffc0215-40d8-49a9-ac4a-4ab4a920cf4b}</UniqueIdentifier>
</Filter>
+ <Filter Include="Audio">
+ <UniqueIdentifier>{9d892f8d-718b-4e11-a2ca-9f8448bb6a6a}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<None Include="..\..\Source\Asura.Framework\Graphics\Renderer.lua">
@@ -114,5 +117,9 @@
<None Include="..\..\Source\Asura.Framework\Math\Curve.lua">
<Filter>Math</Filter>
</None>
+ <None Include="..\..\Source\Asura.Framework\Framework.lua" />
+ <None Include="..\..\Source\Asura.Framework\Audio\SoundPlayer.lua">
+ <Filter>Audio</Filter>
+ </None>
</ItemGroup>
</Project> \ No newline at end of file
diff --git a/Build/Asura.Runner/Asura.Runner.vcxproj b/Build/Asura.Runner/Asura.Runner.vcxproj
index 7f858a8..dfd4255 100644
--- a/Build/Asura.Runner/Asura.Runner.vcxproj
+++ b/Build/Asura.Runner/Asura.Runner.vcxproj
@@ -68,7 +68,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|Win32'">
+ <TargetName>Runner</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <TargetName>Runner</TargetName>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
diff --git a/Build/Asura.sln b/Build/Asura.sln
index 626b6d0..fda449d 100644
--- a/Build/Asura.sln
+++ b/Build/Asura.sln
@@ -27,6 +27,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cembed", "cembed\cembed.vcx
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LuaJIT", "3rdParty\LuaJIT\LuaJIT.vcxproj", "{6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua51c", "3rdParty\lua51c\lua51c.vcxproj", "{B8F9616D-5393-4B34-B191-D200D1985439}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Asura.Packer", "Asura.Compiler\Asura.Packer\Asura.Packer.vcxproj", "{6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
@@ -123,6 +127,22 @@ Global
{6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}.Release|x64.Build.0 = Release|x64
{6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}.Release|x86.ActiveCfg = Release|Win32
{6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}.Release|x86.Build.0 = Release|Win32
+ {B8F9616D-5393-4B34-B191-D200D1985439}.Debug|x64.ActiveCfg = Debug|x64
+ {B8F9616D-5393-4B34-B191-D200D1985439}.Debug|x64.Build.0 = Debug|x64
+ {B8F9616D-5393-4B34-B191-D200D1985439}.Debug|x86.ActiveCfg = Debug|Win32
+ {B8F9616D-5393-4B34-B191-D200D1985439}.Debug|x86.Build.0 = Debug|Win32
+ {B8F9616D-5393-4B34-B191-D200D1985439}.Release|x64.ActiveCfg = Release|x64
+ {B8F9616D-5393-4B34-B191-D200D1985439}.Release|x64.Build.0 = Release|x64
+ {B8F9616D-5393-4B34-B191-D200D1985439}.Release|x86.ActiveCfg = Release|Win32
+ {B8F9616D-5393-4B34-B191-D200D1985439}.Release|x86.Build.0 = Release|Win32
+ {6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07}.Debug|x64.ActiveCfg = Debug|x64
+ {6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07}.Debug|x64.Build.0 = Debug|x64
+ {6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07}.Debug|x86.ActiveCfg = Debug|Win32
+ {6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07}.Debug|x86.Build.0 = Debug|Win32
+ {6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07}.Release|x64.ActiveCfg = Release|x64
+ {6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07}.Release|x64.Build.0 = Release|x64
+ {6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07}.Release|x86.ActiveCfg = Release|Win32
+ {6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -132,6 +152,7 @@ Global
{C0ED7D78-570B-454A-B3B6-576FDCB43D69} = {64D4E4B2-4A60-46F4-A500-370EFED4524F}
{8B8FCA14-FC8A-45B4-BF3C-9340CB586076} = {64D4E4B2-4A60-46F4-A500-370EFED4524F}
{6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4} = {64D4E4B2-4A60-46F4-A500-370EFED4524F}
+ {B8F9616D-5393-4B34-B191-D200D1985439} = {64D4E4B2-4A60-46F4-A500-370EFED4524F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {331032D8-F7CC-43E3-A03B-67108767F96B}