diff options
Diffstat (limited to 'build')
-rw-r--r-- | build/modules/asura-core/asura-core.vcxproj | 4 | ||||
-rw-r--r-- | build/modules/asura-core/asura-core.vcxproj.filters | 15 | ||||
-rw-r--r-- | build/modules/asura-utils/asura-utils.vcxproj | 4 | ||||
-rw-r--r-- | build/modules/asura-utils/asura-utils.vcxproj.filters | 12 | ||||
-rw-r--r-- | build/tests/03-openal/03-openal.vcxproj | 1 | ||||
-rw-r--r-- | build/tests/03-openal/03-openal.vcxproj.filters | 13 | ||||
-rw-r--r-- | build/x64/Debug/03-openal.exe | bin | 0 -> 58368 bytes |
7 files changed, 33 insertions, 16 deletions
diff --git a/build/modules/asura-core/asura-core.vcxproj b/build/modules/asura-core/asura-core.vcxproj index c01c3db..07c9dd9 100644 --- a/build/modules/asura-core/asura-core.vcxproj +++ b/build/modules/asura-core/asura-core.vcxproj @@ -156,6 +156,8 @@ <ClCompile Include="..\..\..\source\modules\asura-core\input\keyboard.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\input\mouse.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\window\window.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-core\window\window_impl_glew.cpp" /> @@ -202,6 +204,8 @@ <ClInclude Include="..\..\..\source\modules\asura-core\input\keyboard.h" /> <ClInclude Include="..\..\..\source\modules\asura-core\input\mouse.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\window\window.h" /> diff --git a/build/modules/asura-core/asura-core.vcxproj.filters b/build/modules/asura-core/asura-core.vcxproj.filters index 5bbd204..8c3f7e1 100644 --- a/build/modules/asura-core/asura-core.vcxproj.filters +++ b/build/modules/asura-core/asura-core.vcxproj.filters @@ -22,6 +22,9 @@ <Filter Include="window"> <UniqueIdentifier>{7a73607c-8da6-4865-a992-5c7c8764bd5a}</UniqueIdentifier> </Filter> + <Filter Include="threading"> + <UniqueIdentifier>{05477a0e-f70b-4606-ae96-82ef7a7b8a1d}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\..\source\modules\asura-core\application.cpp" /> @@ -152,6 +155,12 @@ <ClCompile Include="..\..\..\source\modules\asura-core\window\window_impl_sdl.cpp"> <Filter>window</Filter> </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-core\threading\thread_ex.cpp"> + <Filter>threading</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-core\threading\channel.cpp"> + <Filter>threading</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\source\modules\asura-core\application.h" /> @@ -281,6 +290,12 @@ <ClInclude Include="..\..\..\source\modules\asura-core\window\window_impl_glut.h"> <Filter>window</Filter> </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-core\threading\thread_ex.h"> + <Filter>threading</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-core\threading\channel.h"> + <Filter>threading</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 f3227f6..cc67004 100644 --- a/build/modules/asura-utils/asura-utils.vcxproj +++ b/build/modules/asura-utils/asura-utils.vcxproj @@ -146,6 +146,7 @@ <ClCompile Include="..\..\..\source\modules\asura-utils\stringmap.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-utils\threading\binding\_coroutine.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-utils\threading\binding\_thread.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-utils\threading\conditional.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-utils\threading\coroutine.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-utils\threading\mutex.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-utils\threading\semaphore.cpp" /> @@ -181,13 +182,14 @@ <ClInclude Include="..\..\..\source\modules\asura-utils\math\vector3.hpp" /> <ClInclude Include="..\..\..\source\modules\asura-utils\math\vector4.h" /> <ClInclude Include="..\..\..\source\modules\asura-utils\module.h" /> - <ClInclude Include="..\..\..\source\modules\asura-utils\scripting\lua_env.h" /> <ClInclude Include="..\..\..\source\modules\asura-utils\scripting\portable.hpp" /> <ClInclude Include="..\..\..\source\modules\asura-utils\singleton.hpp" /> <ClInclude Include="..\..\..\source\modules\asura-utils\stringmap.hpp" /> + <ClInclude Include="..\..\..\source\modules\asura-utils\threading\conditional.h" /> <ClInclude Include="..\..\..\source\modules\asura-utils\threading\coroutine.h" /> <ClInclude Include="..\..\..\source\modules\asura-utils\threading\mutex.h" /> <ClInclude Include="..\..\..\source\modules\asura-utils\threading\semaphore.h" /> + <ClInclude Include="..\..\..\source\modules\asura-utils\threading\threadable.h" /> <ClInclude Include="..\..\..\source\modules\asura-utils\threading\thread.h" /> <ClInclude Include="..\..\..\source\modules\asura-utils\threading\thread_impl_posix.h" /> <ClInclude Include="..\..\..\source\modules\asura-utils\threading\thread_impl_sdl.h" /> diff --git a/build/modules/asura-utils/asura-utils.vcxproj.filters b/build/modules/asura-utils/asura-utils.vcxproj.filters index fd4711c..8534675 100644 --- a/build/modules/asura-utils/asura-utils.vcxproj.filters +++ b/build/modules/asura-utils/asura-utils.vcxproj.filters @@ -125,6 +125,9 @@ <ClCompile Include="..\..\..\source\modules\asura-utils\io\io_batch_task.cpp"> <Filter>io</Filter> </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-utils\threading\conditional.cpp"> + <Filter>threading</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\source\modules\asura-utils\exceptions\exception.h"> @@ -216,9 +219,6 @@ <ClInclude Include="..\..\..\source\modules\asura-utils\math\quaternion.h"> <Filter>math</Filter> </ClInclude> - <ClInclude Include="..\..\..\source\modules\asura-utils\scripting\lua_env.h"> - <Filter>scripting</Filter> - </ClInclude> <ClInclude Include="..\..\..\source\modules\asura-utils\threading\task.h"> <Filter>threading</Filter> </ClInclude> @@ -231,6 +231,12 @@ <ClInclude Include="..\..\..\source\modules\asura-utils\io\io_batch_task.h"> <Filter>io</Filter> </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-utils\threading\threadable.h"> + <Filter>threading</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-utils\threading\conditional.h"> + <Filter>threading</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <None Include="..\..\..\source\modules\asura-utils\math\rect.inl"> diff --git a/build/tests/03-openal/03-openal.vcxproj b/build/tests/03-openal/03-openal.vcxproj index 0795211..626e0ad 100644 --- a/build/tests/03-openal/03-openal.vcxproj +++ b/build/tests/03-openal/03-openal.vcxproj @@ -115,6 +115,7 @@ </Link> </ItemDefinitionGroup> <ItemGroup> + <ClCompile Include="..\..\..\source\tests\03-openal\main.cpp" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> diff --git a/build/tests/03-openal/03-openal.vcxproj.filters b/build/tests/03-openal/03-openal.vcxproj.filters index 3c6f4fd..352d4eb 100644 --- a/build/tests/03-openal/03-openal.vcxproj.filters +++ b/build/tests/03-openal/03-openal.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\tests\03-openal\main.cpp" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/build/x64/Debug/03-openal.exe b/build/x64/Debug/03-openal.exe Binary files differnew file mode 100644 index 0000000..9a535ec --- /dev/null +++ b/build/x64/Debug/03-openal.exe |