summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
Diffstat (limited to 'build')
-rw-r--r--build/3rd-party/Luax/Luax.vcxproj.user2
-rw-r--r--build/3rd-party/Plotscript/Plotscript.vcxproj123
-rw-r--r--build/3rd-party/Plotscript/Plotscript.vcxproj.filters6
-rw-r--r--build/3rd-party/Plotscript/Plotscript.vcxproj.user6
-rw-r--r--build/Asura.sln13
-rw-r--r--build/libs/asura-lib-utils/asura-lib-utils.vcxproj5
-rw-r--r--build/libs/asura-lib-utils/asura-lib-utils.vcxproj.filters15
7 files changed, 161 insertions, 9 deletions
diff --git a/build/3rd-party/Luax/Luax.vcxproj.user b/build/3rd-party/Luax/Luax.vcxproj.user
index 0b0f24d..baf2417 100644
--- a/build/3rd-party/Luax/Luax.vcxproj.user
+++ b/build/3rd-party/Luax/Luax.vcxproj.user
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <ShowAllFiles>true</ShowAllFiles>
+ <ShowAllFiles>false</ShowAllFiles>
</PropertyGroup>
</Project> \ No newline at end of file
diff --git a/build/3rd-party/Plotscript/Plotscript.vcxproj b/build/3rd-party/Plotscript/Plotscript.vcxproj
new file mode 100644
index 0000000..a0efb92
--- /dev/null
+++ b/build/3rd-party/Plotscript/Plotscript.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>{2822F737-EEFA-4C74-872C-1EE0793E2221}</ProjectGuid>
+ <RootNamespace>Plotscript</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|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <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)'=='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\3rd-party\Plotscript\plot.c" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project> \ No newline at end of file
diff --git a/build/3rd-party/Plotscript/Plotscript.vcxproj.filters b/build/3rd-party/Plotscript/Plotscript.vcxproj.filters
new file mode 100644
index 0000000..edc3d49
--- /dev/null
+++ b/build/3rd-party/Plotscript/Plotscript.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\3rd-party\Plotscript\plot.c" />
+ </ItemGroup>
+</Project> \ No newline at end of file
diff --git a/build/3rd-party/Plotscript/Plotscript.vcxproj.user b/build/3rd-party/Plotscript/Plotscript.vcxproj.user
new file mode 100644
index 0000000..baf2417
--- /dev/null
+++ b/build/3rd-party/Plotscript/Plotscript.vcxproj.user
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ShowAllFiles>false</ShowAllFiles>
+ </PropertyGroup>
+</Project> \ No newline at end of file
diff --git a/build/Asura.sln b/build/Asura.sln
index 4b8f502..9c0e875 100644
--- a/build/Asura.sln
+++ b/build/Asura.sln
@@ -97,6 +97,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-network", "libs\a
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LuaSocket", "3rd-party\LuaSocket\LuaSocket.vcxproj", "{E15D111A-9E02-4E0D-86FE-62BFCD3C211E}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plotscript", "3rd-party\Plotscript\Plotscript.vcxproj", "{2822F737-EEFA-4C74-872C-1EE0793E2221}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -539,6 +541,16 @@ Global
{E15D111A-9E02-4E0D-86FE-62BFCD3C211E}.Release|x64.Build.0 = Release|x64
{E15D111A-9E02-4E0D-86FE-62BFCD3C211E}.Release|x86.ActiveCfg = Release|Win32
{E15D111A-9E02-4E0D-86FE-62BFCD3C211E}.Release|x86.Build.0 = Release|Win32
+ {2822F737-EEFA-4C74-872C-1EE0793E2221}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {2822F737-EEFA-4C74-872C-1EE0793E2221}.Debug|x64.ActiveCfg = Debug|x64
+ {2822F737-EEFA-4C74-872C-1EE0793E2221}.Debug|x64.Build.0 = Debug|x64
+ {2822F737-EEFA-4C74-872C-1EE0793E2221}.Debug|x86.ActiveCfg = Debug|Win32
+ {2822F737-EEFA-4C74-872C-1EE0793E2221}.Debug|x86.Build.0 = Debug|Win32
+ {2822F737-EEFA-4C74-872C-1EE0793E2221}.Release|Any CPU.ActiveCfg = Release|Win32
+ {2822F737-EEFA-4C74-872C-1EE0793E2221}.Release|x64.ActiveCfg = Release|x64
+ {2822F737-EEFA-4C74-872C-1EE0793E2221}.Release|x64.Build.0 = Release|x64
+ {2822F737-EEFA-4C74-872C-1EE0793E2221}.Release|x86.ActiveCfg = Release|Win32
+ {2822F737-EEFA-4C74-872C-1EE0793E2221}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -581,6 +593,7 @@ Global
{C3CD1252-3C8D-45E2-B784-D0016E7F0BD3} = {E068D138-C824-4365-B5A3-27C65E8FD0B5}
{6361701E-BD43-4AE9-8AE2-5C8F87D436BA} = {CD115016-E377-4AC1-8595-DB2836CEFE7E}
{E15D111A-9E02-4E0D-86FE-62BFCD3C211E} = {64D4E4B2-4A60-46F4-A500-370EFED4524F}
+ {2822F737-EEFA-4C74-872C-1EE0793E2221} = {64D4E4B2-4A60-46F4-A500-370EFED4524F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {331032D8-F7CC-43E3-A03B-67108767F96B}
diff --git a/build/libs/asura-lib-utils/asura-lib-utils.vcxproj b/build/libs/asura-lib-utils/asura-lib-utils.vcxproj
index 54bd60a..e520659 100644
--- a/build/libs/asura-lib-utils/asura-lib-utils.vcxproj
+++ b/build/libs/asura-lib-utils/asura-lib-utils.vcxproj
@@ -152,7 +152,7 @@
<ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_sdl.cpp" />
<ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_std.cpp" />
<ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_win32.cpp" />
- <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread_task.cpp" />
+ <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\task.cpp" />
<ClCompile Include="..\..\..\source\libs\asura-lib-utils\utils_module.cpp" />
</ItemGroup>
<ItemGroup>
@@ -177,6 +177,7 @@
<ClInclude Include="..\..\..\source\libs\asura-lib-utils\math\vector3.hpp" />
<ClInclude Include="..\..\..\source\libs\asura-lib-utils\math\vector4.h" />
<ClInclude Include="..\..\..\source\libs\asura-lib-utils\module.h" />
+ <ClInclude Include="..\..\..\source\libs\asura-lib-utils\scripting\lua_env.h" />
<ClInclude Include="..\..\..\source\libs\asura-lib-utils\scripting\portable.hpp" />
<ClInclude Include="..\..\..\source\libs\asura-lib-utils\singleton.hpp" />
<ClInclude Include="..\..\..\source\libs\asura-lib-utils\stringmap.hpp" />
@@ -187,7 +188,7 @@
<ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_sdl.h" />
<ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_std.h" />
<ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_win32.h" />
- <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread_task.h" />
+ <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\task.h" />
<ClInclude Include="..\..\..\source\libs\asura-lib-utils\type.h" />
<ClInclude Include="..\..\..\source\libs\asura-lib-utils\utils.h" />
<ClInclude Include="..\..\..\source\libs\asura-lib-utils\utils_config.h" />
diff --git a/build/libs/asura-lib-utils/asura-lib-utils.vcxproj.filters b/build/libs/asura-lib-utils/asura-lib-utils.vcxproj.filters
index ec034b9..5d8b40f 100644
--- a/build/libs/asura-lib-utils/asura-lib-utils.vcxproj.filters
+++ b/build/libs/asura-lib-utils/asura-lib-utils.vcxproj.filters
@@ -95,9 +95,6 @@
<ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_win32.cpp">
<Filter>threading</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread_task.cpp">
- <Filter>threading</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\io_task.cpp">
<Filter>io</Filter>
</ClCompile>
@@ -116,6 +113,9 @@
<ClCompile Include="..\..\..\source\libs\asura-lib-utils\math\quaternion.cpp">
<Filter>math</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\task.cpp">
+ <Filter>threading</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\libs\asura-lib-utils\exceptions\exception.h">
@@ -198,9 +198,6 @@
<ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_win32.h">
<Filter>threading</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread_task.h">
- <Filter>threading</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\source\libs\asura-lib-utils\io\io_task.h">
<Filter>io</Filter>
</ClInclude>
@@ -210,6 +207,12 @@
<ClInclude Include="..\..\..\source\libs\asura-lib-utils\math\quaternion.h">
<Filter>math</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\source\libs\asura-lib-utils\scripting\lua_env.h">
+ <Filter>scripting</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\task.h">
+ <Filter>threading</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\source\libs\asura-lib-utils\math\rect.inl">