diff options
| author | chai <chaifix@163.com> | 2019-04-01 08:55:57 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2019-04-01 08:55:57 +0800 |
| commit | fa2bf295fa9646a3052ab0498a4577f586eadef0 (patch) | |
| tree | 79287245fee3bc95c514af49ef395ba3c84a4104 | |
| parent | 72bad342ad75294ae85aac8b2e2e7bea54193c15 (diff) | |
*misc
| -rw-r--r-- | Build/Asura.sln | 16 | ||||
| -rw-r--r-- | build/3rd-party/Box2D/box2d.vcxproj | 8 | ||||
| -rw-r--r-- | build/3rd-party/SDL2/SDL2.vcxproj | 294 | ||||
| -rw-r--r-- | build/3rd-party/SDL2/SDL2.vcxproj.filters | 286 | ||||
| -rw-r--r-- | build/3rd-party/SDL2main/SDL2main.vcxproj | 8 | ||||
| -rw-r--r-- | build/Asura.sln | 16 | ||||
| -rw-r--r-- | build/tests/win32/01-window/01-window.vcxproj | 134 | ||||
| -rw-r--r-- | build/tests/win32/01-window/01-window.vcxproj.filters | 11 | ||||
| -rw-r--r-- | build/tests/win32/01-window/01-window.vcxproj.user | 4 | ||||
| -rw-r--r-- | build/x64/Debug/01-window.exe (renamed from build/x64/Debug/03-openal.exe) | bin | 58368 -> 64512 bytes | |||
| -rw-r--r-- | source/modules/asura-core/graphics/binding/_color.cpp | 83 | ||||
| -rw-r--r-- | source/modules/asura-core/graphics/color.h | 12 | ||||
| -rw-r--r-- | source/modules/asura-core/graphics/image.h | 14 | ||||
| -rw-r--r-- | source/tests/win32/01_menu_bar.cpp | 95 | ||||
| -rw-r--r-- | source/tests/win32/02_multi_window.cpp | 104 | ||||
| -rw-r--r-- | source/tests/win32/03_sub_menu.cpp | 146 | ||||
| -rw-r--r-- | source/tests/win32/config.h | 10 |
17 files changed, 930 insertions, 311 deletions
diff --git a/Build/Asura.sln b/Build/Asura.sln index 2e3f4f0..9513df5 100644 --- a/Build/Asura.sln +++ b/Build/Asura.sln @@ -103,6 +103,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-plot", "modules\asura EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "07-image", "tests\07-image\07-image.vcxproj", "{72119950-3542-41AD-97EB-DC4856FC16AA}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "win32", "win32", "{6096DD65-FE67-4D0F-BEF4-4D81A1554A3A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01-window", "tests\win32\01-window\01-window.vcxproj", "{B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -575,6 +579,16 @@ Global {72119950-3542-41AD-97EB-DC4856FC16AA}.Release|x64.Build.0 = Release|x64 {72119950-3542-41AD-97EB-DC4856FC16AA}.Release|x86.ActiveCfg = Release|Win32 {72119950-3542-41AD-97EB-DC4856FC16AA}.Release|x86.Build.0 = Release|Win32 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Debug|x64.ActiveCfg = Debug|x64 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Debug|x64.Build.0 = Debug|x64 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Debug|x86.ActiveCfg = Debug|Win32 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Debug|x86.Build.0 = Debug|Win32 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Release|Any CPU.ActiveCfg = Release|Win32 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Release|x64.ActiveCfg = Release|x64 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Release|x64.Build.0 = Release|x64 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Release|x86.ActiveCfg = Release|Win32 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -620,6 +634,8 @@ Global {49F7847E-219E-4A7B-8484-2A33DAC29DD0} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} {F248C936-2169-45DF-8FC4-60E56EA23ECC} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} {72119950-3542-41AD-97EB-DC4856FC16AA} = {E068D138-C824-4365-B5A3-27C65E8FD0B5} + {6096DD65-FE67-4D0F-BEF4-4D81A1554A3A} = {E068D138-C824-4365-B5A3-27C65E8FD0B5} + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA} = {6096DD65-FE67-4D0F-BEF4-4D81A1554A3A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {331032D8-F7CC-43E3-A03B-67108767F96B} diff --git a/build/3rd-party/Box2D/box2d.vcxproj b/build/3rd-party/Box2D/box2d.vcxproj index 854cd73..8e8653b 100644 --- a/build/3rd-party/Box2D/box2d.vcxproj +++ b/build/3rd-party/Box2D/box2d.vcxproj @@ -76,7 +76,7 @@ <Optimization>Disabled</Optimization> <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdparty\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rd-party\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -85,7 +85,7 @@ <Optimization>Disabled</Optimization> <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdparty\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rd-party\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -96,7 +96,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdparty\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rd-party\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> <EnableCOMDATFolding>true</EnableCOMDATFolding> @@ -111,7 +111,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdparty\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rd-party\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> <EnableCOMDATFolding>true</EnableCOMDATFolding> diff --git a/build/3rd-party/SDL2/SDL2.vcxproj b/build/3rd-party/SDL2/SDL2.vcxproj index 970966f..6c85ba5 100644 --- a/build/3rd-party/SDL2/SDL2.vcxproj +++ b/build/3rd-party/SDL2/SDL2.vcxproj @@ -81,7 +81,7 @@ <Optimization>Disabled</Optimization> <SDLCheck>false</SDLCheck> <ConformanceMode>false</ConformanceMode> - <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rd-party\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BufferSecurityCheck>false</BufferSecurityCheck> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> @@ -102,7 +102,7 @@ <Optimization>Disabled</Optimization> <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rd-party\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -113,7 +113,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rd-party\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> <EnableCOMDATFolding>true</EnableCOMDATFolding> @@ -128,7 +128,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <SDLCheck>false</SDLCheck> <ConformanceMode>false</ConformanceMode> - <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rd-party\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BufferSecurityCheck>false</BufferSecurityCheck> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> @@ -145,163 +145,163 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\close_code.h" /> + <ClInclude Include="..\..\..\Source\3rd-party\SDL2\include\close_code.h" /> <ClInclude Include="..\..\..\Source\3rd-party\SDL2\src\audio\SDL_audiodev_c.h" /> <ClInclude Include="..\..\..\Source\3rd-party\SDL2\src\audio\SDL_audio_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\core\windows\SDL_directx.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\events\blank_cursor.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\events\default_cursor.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\libm\math_libm.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\libm\math_private.h" /> + <ClInclude Include="..\..\..\Source\3rd-party\SDL2\src\core\windows\SDL_directx.h" /> + <ClInclude Include="..\..\..\Source\3rd-party\SDL2\src\events\blank_cursor.h" /> + <ClInclude Include="..\..\..\Source\3rd-party\SDL2\src\events\default_cursor.h" /> + <ClInclude Include="..\..\..\Source\3rd-party\SDL2\src\libm\math_libm.h" /> + <ClInclude Include="..\..\..\Source\3rd-party\SDL2\src\libm\math_private.h" /> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\atomic\SDL_atomic.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\atomic\SDL_spinlock.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\audio\directsound\SDL_directsound.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\audio\disk\SDL_diskaudio.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\audio\dummy\SDL_dummyaudio.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\audio\SDL_audio.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\audio\SDL_audiocvt.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\audio\SDL_audiodev.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\audio\SDL_audiotypecvt.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\audio\SDL_mixer.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\audio\SDL_wave.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\audio\winmm\SDL_winmm.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\audio\wasapi\SDL_wasapi.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\audio\wasapi\SDL_wasapi_win32.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\core\windows\SDL_windows.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\core\windows\SDL_xinput.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\cpuinfo\SDL_cpuinfo.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\dynapi\SDL_dynapi.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_clipboardevents.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\atomic\SDL_atomic.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\atomic\SDL_spinlock.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\audio\directsound\SDL_directsound.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\audio\disk\SDL_diskaudio.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\audio\dummy\SDL_dummyaudio.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\audio\SDL_audio.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\audio\SDL_audiocvt.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\audio\SDL_audiodev.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\audio\SDL_audiotypecvt.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\audio\SDL_mixer.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\audio\SDL_wave.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\audio\winmm\SDL_winmm.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\audio\wasapi\SDL_wasapi.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\audio\wasapi\SDL_wasapi_win32.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\core\windows\SDL_windows.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\core\windows\SDL_xinput.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\cpuinfo\SDL_cpuinfo.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\dynapi\SDL_dynapi.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\events\SDL_clipboardevents.c" /> <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\events\SDL_displayevents.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_dropevents.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_events.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_gesture.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_keyboard.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_mouse.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_quit.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_touch.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_windowevents.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\file\SDL_rwops.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\filesystem\windows\SDL_sysfilesystem.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\haptic\SDL_haptic.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\haptic\windows\SDL_dinputhaptic.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\haptic\windows\SDL_windowshaptic.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\haptic\windows\SDL_xinputhaptic.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\events\SDL_dropevents.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\events\SDL_events.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\events\SDL_gesture.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\events\SDL_keyboard.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\events\SDL_mouse.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\events\SDL_quit.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\events\SDL_touch.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\events\SDL_windowevents.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\file\SDL_rwops.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\filesystem\windows\SDL_sysfilesystem.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\haptic\SDL_haptic.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\haptic\windows\SDL_dinputhaptic.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\haptic\windows\SDL_windowshaptic.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\haptic\windows\SDL_xinputhaptic.c" /> <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\hidapi\windows\hid.c" /> <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\joystick\hidapi\SDL_hidapijoystick.c" /> <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\joystick\hidapi\SDL_hidapi_ps4.c" /> <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\joystick\hidapi\SDL_hidapi_switch.c" /> <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\joystick\hidapi\SDL_hidapi_xbox360.c" /> <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\joystick\hidapi\SDL_hidapi_xboxone.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\joystick\SDL_gamecontroller.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\joystick\SDL_joystick.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\joystick\windows\SDL_dinputjoystick.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\joystick\windows\SDL_mmjoystick.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\joystick\windows\SDL_windowsjoystick.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\joystick\windows\SDL_xinputjoystick.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\e_atan2.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\joystick\SDL_gamecontroller.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\joystick\SDL_joystick.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\joystick\windows\SDL_dinputjoystick.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\joystick\windows\SDL_mmjoystick.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\joystick\windows\SDL_windowsjoystick.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\joystick\windows\SDL_xinputjoystick.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\e_atan2.c" /> <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\e_exp.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\e_fmod.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\e_log.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\e_log10.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\e_pow.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\e_rem_pio2.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\e_sqrt.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\k_cos.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\k_rem_pio2.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\k_sin.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\k_tan.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\s_atan.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\s_copysign.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\s_cos.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\s_fabs.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\s_floor.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\s_scalbn.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\s_sin.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\s_tan.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\loadso\windows\SDL_sysloadso.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\power\SDL_power.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\power\windows\SDL_syspower.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\direct3d11\SDL_shaders_d3d11.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\direct3d\SDL_render_d3d.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\direct3d11\SDL_render_d3d11.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\direct3d\SDL_shaders_d3d.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\opengl\SDL_render_gl.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\opengl\SDL_shaders_gl.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\opengles2\SDL_render_gles2.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\opengles2\SDL_shaders_gles2.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\SDL_d3dmath.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\SDL_render.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\SDL_yuv_sw.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_blendfillrect.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_blendline.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_blendpoint.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_drawline.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_drawpoint.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_render_sw.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_rotate.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\SDL.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\SDL_assert.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\SDL_dataqueue.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\SDL_error.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\SDL_hints.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\SDL_log.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\e_fmod.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\e_log.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\e_log10.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\e_pow.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\e_rem_pio2.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\e_sqrt.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\k_cos.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\k_rem_pio2.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\k_sin.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\k_tan.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\s_atan.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\s_copysign.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\s_cos.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\s_fabs.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\s_floor.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\s_scalbn.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\s_sin.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\s_tan.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\loadso\windows\SDL_sysloadso.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\power\SDL_power.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\power\windows\SDL_syspower.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\direct3d11\SDL_shaders_d3d11.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\direct3d\SDL_render_d3d.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\direct3d11\SDL_render_d3d11.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\direct3d\SDL_shaders_d3d.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\opengl\SDL_render_gl.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\opengl\SDL_shaders_gl.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\opengles2\SDL_render_gles2.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\opengles2\SDL_shaders_gles2.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\SDL_d3dmath.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\SDL_render.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\SDL_yuv_sw.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\software\SDL_blendfillrect.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\software\SDL_blendline.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\software\SDL_blendpoint.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\software\SDL_drawline.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\software\SDL_drawpoint.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\software\SDL_render_sw.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\software\SDL_rotate.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\SDL.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\SDL_assert.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\SDL_dataqueue.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\SDL_error.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\SDL_hints.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\SDL_log.c" /> <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\sensor\dummy\SDL_dummysensor.c" /> <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\sensor\SDL_sensor.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\stdlib\SDL_getenv.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\stdlib\SDL_iconv.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\stdlib\SDL_malloc.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\stdlib\SDL_qsort.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\stdlib\SDL_stdlib.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\stdlib\SDL_string.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\thread\generic\SDL_syscond.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\thread\SDL_thread.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\thread\windows\SDL_sysmutex.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\thread\windows\SDL_syssem.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\thread\windows\SDL_systhread.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\thread\windows\SDL_systls.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\timer\SDL_timer.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\timer\windows\SDL_systimer.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\dummy\SDL_nullevents.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\dummy\SDL_nullframebuffer.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\dummy\SDL_nullvideo.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_blit.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_blit_0.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_blit_1.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_blit_A.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_blit_auto.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_blit_copy.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_blit_N.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_blit_slow.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_bmp.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_clipboard.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_egl.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_fillrect.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_pixels.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_rect.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_RLEaccel.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_shape.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_stretch.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_surface.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_video.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_vulkan_utils.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_yuv.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsclipboard.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsevents.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsframebuffer.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowskeyboard.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsmessagebox.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsmodes.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsmouse.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsopengl.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsopengles.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsshape.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsvideo.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsvulkan.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowswindow.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\yuv2rgb\yuv_rgb.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\stdlib\SDL_getenv.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\stdlib\SDL_iconv.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\stdlib\SDL_malloc.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\stdlib\SDL_qsort.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\stdlib\SDL_stdlib.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\stdlib\SDL_string.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\thread\generic\SDL_syscond.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\thread\SDL_thread.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\thread\windows\SDL_sysmutex.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\thread\windows\SDL_syssem.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\thread\windows\SDL_systhread.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\thread\windows\SDL_systls.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\timer\SDL_timer.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\timer\windows\SDL_systimer.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\dummy\SDL_nullevents.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\dummy\SDL_nullframebuffer.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\dummy\SDL_nullvideo.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_blit.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_blit_0.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_blit_1.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_blit_A.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_blit_auto.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_blit_copy.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_blit_N.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_blit_slow.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_bmp.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_clipboard.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_egl.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_fillrect.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_pixels.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_rect.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_RLEaccel.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_shape.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_stretch.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_surface.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_video.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_vulkan_utils.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_yuv.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\windows\SDL_windowsclipboard.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\windows\SDL_windowsevents.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\windows\SDL_windowsframebuffer.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\windows\SDL_windowskeyboard.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\windows\SDL_windowsmessagebox.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\windows\SDL_windowsmodes.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\windows\SDL_windowsmouse.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\windows\SDL_windowsopengl.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\windows\SDL_windowsopengles.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\windows\SDL_windowsshape.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\windows\SDL_windowsvideo.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\windows\SDL_windowsvulkan.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\windows\SDL_windowswindow.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\yuv2rgb\yuv_rgb.c" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> diff --git a/build/3rd-party/SDL2/SDL2.vcxproj.filters b/build/3rd-party/SDL2/SDL2.vcxproj.filters index 07c0d77..c4be66e 100644 --- a/build/3rd-party/SDL2/SDL2.vcxproj.filters +++ b/build/3rd-party/SDL2/SDL2.vcxproj.filters @@ -1,143 +1,143 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\atomic\SDL_atomic.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\atomic\SDL_spinlock.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\audio\directsound\SDL_directsound.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\audio\disk\SDL_diskaudio.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\audio\dummy\SDL_dummyaudio.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\audio\SDL_audio.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\audio\SDL_audiocvt.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\audio\SDL_audiodev.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\audio\SDL_audiotypecvt.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\audio\SDL_mixer.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\audio\SDL_wave.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\audio\winmm\SDL_winmm.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\audio\wasapi\SDL_wasapi.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\audio\wasapi\SDL_wasapi_win32.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\core\windows\SDL_windows.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\core\windows\SDL_xinput.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\cpuinfo\SDL_cpuinfo.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\dynapi\SDL_dynapi.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_clipboardevents.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_dropevents.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_events.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_gesture.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_keyboard.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_mouse.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_quit.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_touch.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_windowevents.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\file\SDL_rwops.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\filesystem\windows\SDL_sysfilesystem.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\haptic\SDL_haptic.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\haptic\windows\SDL_dinputhaptic.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\haptic\windows\SDL_windowshaptic.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\haptic\windows\SDL_xinputhaptic.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\joystick\SDL_gamecontroller.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\joystick\SDL_joystick.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\joystick\windows\SDL_dinputjoystick.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\joystick\windows\SDL_mmjoystick.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\joystick\windows\SDL_windowsjoystick.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\joystick\windows\SDL_xinputjoystick.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\e_atan2.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\e_fmod.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\e_log.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\e_log10.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\e_pow.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\e_rem_pio2.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\e_sqrt.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\k_cos.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\k_rem_pio2.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\k_sin.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\k_tan.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\s_atan.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\s_copysign.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\s_cos.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\s_fabs.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\s_floor.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\s_scalbn.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\s_sin.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\libm\s_tan.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\loadso\windows\SDL_sysloadso.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\power\SDL_power.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\power\windows\SDL_syspower.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\direct3d11\SDL_shaders_d3d11.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\direct3d\SDL_render_d3d.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\direct3d11\SDL_render_d3d11.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\direct3d\SDL_shaders_d3d.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\opengl\SDL_render_gl.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\opengl\SDL_shaders_gl.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\opengles2\SDL_render_gles2.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\opengles2\SDL_shaders_gles2.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\SDL_d3dmath.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\SDL_render.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\SDL_yuv_sw.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_blendfillrect.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_blendline.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_blendpoint.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_drawline.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_drawpoint.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_render_sw.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_rotate.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\SDL.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\SDL_assert.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\SDL_dataqueue.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\SDL_error.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\SDL_hints.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\SDL_log.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\stdlib\SDL_getenv.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\stdlib\SDL_iconv.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\stdlib\SDL_malloc.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\stdlib\SDL_qsort.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\stdlib\SDL_stdlib.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\stdlib\SDL_string.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\thread\generic\SDL_syscond.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\thread\SDL_thread.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\thread\windows\SDL_sysmutex.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\thread\windows\SDL_syssem.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\thread\windows\SDL_systhread.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\thread\windows\SDL_systls.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\timer\SDL_timer.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\timer\windows\SDL_systimer.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\dummy\SDL_nullevents.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\dummy\SDL_nullframebuffer.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\dummy\SDL_nullvideo.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_blit.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_blit_0.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_blit_1.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_blit_A.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_blit_auto.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_blit_copy.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_blit_N.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_blit_slow.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_bmp.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_clipboard.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_egl.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_fillrect.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_pixels.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_rect.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_RLEaccel.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_shape.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_stretch.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_surface.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_video.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_vulkan_utils.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_yuv.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsclipboard.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsevents.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsframebuffer.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowskeyboard.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsmessagebox.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsmodes.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsmouse.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsopengl.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsopengles.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsshape.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsvideo.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsvulkan.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowswindow.c" /> - <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\video\yuv2rgb\yuv_rgb.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\atomic\SDL_atomic.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\atomic\SDL_spinlock.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\audio\directsound\SDL_directsound.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\audio\disk\SDL_diskaudio.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\audio\dummy\SDL_dummyaudio.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\audio\SDL_audio.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\audio\SDL_audiocvt.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\audio\SDL_audiodev.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\audio\SDL_audiotypecvt.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\audio\SDL_mixer.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\audio\SDL_wave.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\audio\winmm\SDL_winmm.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\audio\wasapi\SDL_wasapi.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\audio\wasapi\SDL_wasapi_win32.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\core\windows\SDL_windows.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\core\windows\SDL_xinput.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\cpuinfo\SDL_cpuinfo.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\dynapi\SDL_dynapi.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\events\SDL_clipboardevents.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\events\SDL_dropevents.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\events\SDL_events.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\events\SDL_gesture.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\events\SDL_keyboard.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\events\SDL_mouse.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\events\SDL_quit.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\events\SDL_touch.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\events\SDL_windowevents.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\file\SDL_rwops.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\filesystem\windows\SDL_sysfilesystem.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\haptic\SDL_haptic.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\haptic\windows\SDL_dinputhaptic.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\haptic\windows\SDL_windowshaptic.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\haptic\windows\SDL_xinputhaptic.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\joystick\SDL_gamecontroller.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\joystick\SDL_joystick.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\joystick\windows\SDL_dinputjoystick.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\joystick\windows\SDL_mmjoystick.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\joystick\windows\SDL_windowsjoystick.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\joystick\windows\SDL_xinputjoystick.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\e_atan2.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\e_fmod.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\e_log.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\e_log10.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\e_pow.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\e_rem_pio2.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\e_sqrt.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\k_cos.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\k_rem_pio2.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\k_sin.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\k_tan.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\s_atan.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\s_copysign.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\s_cos.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\s_fabs.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\s_floor.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\s_scalbn.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\s_sin.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\s_tan.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\loadso\windows\SDL_sysloadso.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\power\SDL_power.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\power\windows\SDL_syspower.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\direct3d11\SDL_shaders_d3d11.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\direct3d\SDL_render_d3d.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\direct3d11\SDL_render_d3d11.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\direct3d\SDL_shaders_d3d.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\opengl\SDL_render_gl.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\opengl\SDL_shaders_gl.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\opengles2\SDL_render_gles2.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\opengles2\SDL_shaders_gles2.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\SDL_d3dmath.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\SDL_render.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\SDL_yuv_sw.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\software\SDL_blendfillrect.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\software\SDL_blendline.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\software\SDL_blendpoint.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\software\SDL_drawline.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\software\SDL_drawpoint.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\software\SDL_render_sw.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\render\software\SDL_rotate.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\SDL.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\SDL_assert.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\SDL_dataqueue.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\SDL_error.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\SDL_hints.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\SDL_log.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\stdlib\SDL_getenv.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\stdlib\SDL_iconv.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\stdlib\SDL_malloc.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\stdlib\SDL_qsort.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\stdlib\SDL_stdlib.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\stdlib\SDL_string.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\thread\generic\SDL_syscond.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\thread\SDL_thread.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\thread\windows\SDL_sysmutex.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\thread\windows\SDL_syssem.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\thread\windows\SDL_systhread.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\thread\windows\SDL_systls.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\timer\SDL_timer.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\timer\windows\SDL_systimer.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\dummy\SDL_nullevents.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\dummy\SDL_nullframebuffer.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\dummy\SDL_nullvideo.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_blit.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_blit_0.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_blit_1.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_blit_A.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_blit_auto.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_blit_copy.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_blit_N.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_blit_slow.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_bmp.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_clipboard.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_egl.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_fillrect.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_pixels.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_rect.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_RLEaccel.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_shape.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_stretch.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_surface.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_video.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_vulkan_utils.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\SDL_yuv.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\windows\SDL_windowsclipboard.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\windows\SDL_windowsevents.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\windows\SDL_windowsframebuffer.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\windows\SDL_windowskeyboard.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\windows\SDL_windowsmessagebox.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\windows\SDL_windowsmodes.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\windows\SDL_windowsmouse.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\windows\SDL_windowsopengl.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\windows\SDL_windowsopengles.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\windows\SDL_windowsshape.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\windows\SDL_windowsvideo.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\windows\SDL_windowsvulkan.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\windows\SDL_windowswindow.c" /> + <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\video\yuv2rgb\yuv_rgb.c" /> <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\libm\e_exp.c" /> <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\hidapi\windows\hid.c" /> <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\events\SDL_displayevents.c" /> @@ -150,12 +150,12 @@ <ClCompile Include="..\..\..\Source\3rd-party\SDL2\src\sensor\SDL_sensor.c" /> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\close_code.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\core\windows\SDL_directx.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\events\blank_cursor.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\events\default_cursor.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\libm\math_libm.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\libm\math_private.h" /> + <ClInclude Include="..\..\..\Source\3rd-party\SDL2\include\close_code.h" /> + <ClInclude Include="..\..\..\Source\3rd-party\SDL2\src\core\windows\SDL_directx.h" /> + <ClInclude Include="..\..\..\Source\3rd-party\SDL2\src\events\blank_cursor.h" /> + <ClInclude Include="..\..\..\Source\3rd-party\SDL2\src\events\default_cursor.h" /> + <ClInclude Include="..\..\..\Source\3rd-party\SDL2\src\libm\math_libm.h" /> + <ClInclude Include="..\..\..\Source\3rd-party\SDL2\src\libm\math_private.h" /> <ClInclude Include="..\..\..\Source\3rd-party\SDL2\src\audio\SDL_audio_c.h" /> <ClInclude Include="..\..\..\Source\3rd-party\SDL2\src\audio\SDL_audiodev_c.h" /> </ItemGroup> diff --git a/build/3rd-party/SDL2main/SDL2main.vcxproj b/build/3rd-party/SDL2main/SDL2main.vcxproj index e3ac28f..5da2151 100644 --- a/build/3rd-party/SDL2main/SDL2main.vcxproj +++ b/build/3rd-party/SDL2main/SDL2main.vcxproj @@ -81,7 +81,7 @@ <Optimization>Disabled</Optimization> <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rd-party\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> @@ -91,7 +91,7 @@ <Optimization>Disabled</Optimization> <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rd-party\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -102,7 +102,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rd-party\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> <EnableCOMDATFolding>true</EnableCOMDATFolding> @@ -117,7 +117,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rd-party\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> diff --git a/build/Asura.sln b/build/Asura.sln index 2e3f4f0..9513df5 100644 --- a/build/Asura.sln +++ b/build/Asura.sln @@ -103,6 +103,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-plot", "modules\asura EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "07-image", "tests\07-image\07-image.vcxproj", "{72119950-3542-41AD-97EB-DC4856FC16AA}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "win32", "win32", "{6096DD65-FE67-4D0F-BEF4-4D81A1554A3A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01-window", "tests\win32\01-window\01-window.vcxproj", "{B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -575,6 +579,16 @@ Global {72119950-3542-41AD-97EB-DC4856FC16AA}.Release|x64.Build.0 = Release|x64 {72119950-3542-41AD-97EB-DC4856FC16AA}.Release|x86.ActiveCfg = Release|Win32 {72119950-3542-41AD-97EB-DC4856FC16AA}.Release|x86.Build.0 = Release|Win32 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Debug|x64.ActiveCfg = Debug|x64 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Debug|x64.Build.0 = Debug|x64 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Debug|x86.ActiveCfg = Debug|Win32 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Debug|x86.Build.0 = Debug|Win32 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Release|Any CPU.ActiveCfg = Release|Win32 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Release|x64.ActiveCfg = Release|x64 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Release|x64.Build.0 = Release|x64 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Release|x86.ActiveCfg = Release|Win32 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -620,6 +634,8 @@ Global {49F7847E-219E-4A7B-8484-2A33DAC29DD0} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} {F248C936-2169-45DF-8FC4-60E56EA23ECC} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} {72119950-3542-41AD-97EB-DC4856FC16AA} = {E068D138-C824-4365-B5A3-27C65E8FD0B5} + {6096DD65-FE67-4D0F-BEF4-4D81A1554A3A} = {E068D138-C824-4365-B5A3-27C65E8FD0B5} + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA} = {6096DD65-FE67-4D0F-BEF4-4D81A1554A3A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {331032D8-F7CC-43E3-A03B-67108767F96B} diff --git a/build/tests/win32/01-window/01-window.vcxproj b/build/tests/win32/01-window/01-window.vcxproj new file mode 100644 index 0000000..88d957c --- /dev/null +++ b/build/tests/win32/01-window/01-window.vcxproj @@ -0,0 +1,134 @@ +<?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>{B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}</ProjectGuid> + <RootNamespace>My01window</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> + <Link> + <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <SubSystem>Windows</SubSystem> + </Link> + </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> + <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <SubSystem>Windows</SubSystem> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="..\..\..\..\source\tests\win32\config.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\..\..\source\tests\win32\01_menu_bar.cpp" /> + <ClCompile Include="..\..\..\..\source\tests\win32\02_multi_window.cpp" /> + <ClCompile Include="..\..\..\..\source\tests\win32\03_sub_menu.cpp" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/build/tests/win32/01-window/01-window.vcxproj.filters b/build/tests/win32/01-window/01-window.vcxproj.filters new file mode 100644 index 0000000..07cdbcd --- /dev/null +++ b/build/tests/win32/01-window/01-window.vcxproj.filters @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClInclude Include="..\..\..\..\source\tests\win32\config.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\..\..\source\tests\win32\01_menu_bar.cpp" /> + <ClCompile Include="..\..\..\..\source\tests\win32\02_multi_window.cpp" /> + <ClCompile Include="..\..\..\..\source\tests\win32\03_sub_menu.cpp" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/build/tests/win32/01-window/01-window.vcxproj.user b/build/tests/win32/01-window/01-window.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/build/tests/win32/01-window/01-window.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/x64/Debug/03-openal.exe b/build/x64/Debug/01-window.exe Binary files differindex 9a535ec..3130760 100644 --- a/build/x64/Debug/03-openal.exe +++ b/build/x64/Debug/01-window.exe diff --git a/source/modules/asura-core/graphics/binding/_color.cpp b/source/modules/asura-core/graphics/binding/_color.cpp index 11e80a1..f06622c 100644 --- a/source/modules/asura-core/graphics/binding/_color.cpp +++ b/source/modules/asura-core/graphics/binding/_color.cpp @@ -1,6 +1,7 @@ #include "../color.h" using namespace std; +using namespace Luax; namespace AsuraEngine { @@ -13,7 +14,15 @@ namespace AsuraEngine { "ToColor32", _ToColor32 }, { "SetColor", _SetColor }, { "GetColor", _GetColor }, - { "Multiply", _Multiply } + { "GetR", _GetR }, + { "GetG", _GetG }, + { "GetB", _GetB }, + { "GetA", _GetA }, + { "__eq", ___eq }, + { "__add", ___add }, + { "__sub", ___sub }, + { "__mul", ___mul }, + { "__div", ___div } ); } @@ -27,6 +36,7 @@ namespace AsuraEngine { LUAX_PREPARE(L, Color); + return 0; } // color:SetColor() @@ -34,6 +44,7 @@ namespace AsuraEngine { LUAX_PREPARE(L, Color); + return 0; } // color:GetColor() @@ -41,13 +52,79 @@ namespace AsuraEngine { LUAX_PREPARE(L, Color); + return 0; } - // color:Multiply() - LUAX_IMPL_METHOD(Color, _Multiply) + // color:GetR() + LUAX_IMPL_METHOD(Color, _GetR) { LUAX_PREPARE(L, Color); + return 0; + } + + // color:GetG() + LUAX_IMPL_METHOD(Color, _GetG) + { + LUAX_PREPARE(L, Color); + + return 0; + } + + // color:GetB() + LUAX_IMPL_METHOD(Color, _GetB) + { + LUAX_PREPARE(L, Color); + + return 0; + } + + // color:GetA() + LUAX_IMPL_METHOD(Color, _GetA) + { + LUAX_PREPARE(L, Color); + + return 0; + } + + // color:__eq() + LUAX_IMPL_METHOD(Color, ___eq) + { + LUAX_PREPARE(L, Color); + + return 0; + } + + // color:__add() + LUAX_IMPL_METHOD(Color, ___add) + { + LUAX_PREPARE(L, Color); + + return 0; + } + + // color:__sub() + LUAX_IMPL_METHOD(Color, ___sub) + { + LUAX_PREPARE(L, Color); + + return 0; + } + + // color:__mul() + LUAX_IMPL_METHOD(Color, ___mul) + { + LUAX_PREPARE(L, Color); + + return 0; + } + + // color:__div() + LUAX_IMPL_METHOD(Color, ___div) + { + LUAX_PREPARE(L, Color); + + return 0; } } diff --git a/source/modules/asura-core/graphics/color.h b/source/modules/asura-core/graphics/color.h index c4945ca..e875846 100644 --- a/source/modules/asura-core/graphics/color.h +++ b/source/modules/asura-core/graphics/color.h @@ -53,11 +53,13 @@ namespace AsuraEngine LUAX_DECL_METHOD(_GetA); // Ԫ - LUAX_DECL_METHOD(__eq); // __eq - LUAX_DECL_METHOD(__add); // __add - LUAX_DECL_METHOD(__sub); // __sub - LUAX_DECL_METHOD(__mul); // __mul - LUAX_DECL_METHOD(__div); // __div + LUAX_DECL_METHOD(___eq); // __eq + LUAX_DECL_METHOD(___add); // __add + LUAX_DECL_METHOD(___sub); // __sub + LUAX_DECL_METHOD(___mul); // __mul + LUAX_DECL_METHOD(___div); // __div + + //----------------------------------------------------------------------------// }; diff --git a/source/modules/asura-core/graphics/image.h b/source/modules/asura-core/graphics/image.h index 2424ebb..30df8c0 100644 --- a/source/modules/asura-core/graphics/image.h +++ b/source/modules/asura-core/graphics/image.h @@ -56,11 +56,7 @@ namespace AsuraEngine private: - /// - /// һͼƬһݵá - /// - ImageData* mImageData; - Luax::LuaxMemberRef mImageDataRef; + //----------------------------------------------------------------------------// LUAX_DECL_METHOD(_New); LUAX_DECL_METHOD(_Refresh); @@ -70,6 +66,14 @@ namespace AsuraEngine LUAX_DECL_METHOD(_GetPixel); LUAX_DECL_METHOD(_Render); + //----------------------------------------------------------------------------// + + /// + /// һͼƬһݵá + /// + ImageData* mImageData; + Luax::LuaxMemberRef mImageDataRef; + }; } diff --git a/source/tests/win32/01_menu_bar.cpp b/source/tests/win32/01_menu_bar.cpp new file mode 100644 index 0000000..95c95e4 --- /dev/null +++ b/source/tests/win32/01_menu_bar.cpp @@ -0,0 +1,95 @@ +#include "config.h" + +#if _run_app == _menu_bar + +#include <windows.h> + +#include <windows.h> + +LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); +void AddMenus(HWND); + +#define IDM_FILE_NEW 1 +#define IDM_FILE_OPEN 2 +#define IDM_FILE_QUIT 3 + +int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, + PWSTR lpCmdLine, int nCmdShow) { + + MSG msg; + WNDCLASSW wc = { 0 }; + wc.lpszClassName = L"Simple menu"; + wc.hInstance = hInstance; + wc.hbrBackground = GetSysColorBrush(COLOR_3DFACE); + wc.lpfnWndProc = WndProc; + wc.hCursor = LoadCursor(0, IDC_ARROW); + + RegisterClassW(&wc); + CreateWindowW(wc.lpszClassName, L"Simple menu", + WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 350, 250, 0, 0, hInstance, 0); + + while (GetMessage(&msg, NULL, 0, 0)) { + + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + return (int)msg.wParam; +} + +LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, + WPARAM wParam, LPARAM lParam) { + + switch (msg) { + + case WM_CREATE: + + AddMenus(hwnd); + break; + + case WM_COMMAND: + + switch (LOWORD(wParam)) { + + case IDM_FILE_NEW: + case IDM_FILE_OPEN: + + MessageBeep(MB_ICONINFORMATION); + break; + + case IDM_FILE_QUIT: + + SendMessage(hwnd, WM_CLOSE, 0, 0); + break; + } + + break; + + case WM_DESTROY: + + PostQuitMessage(0); + break; + } + + return DefWindowProcW(hwnd, msg, wParam, lParam); +} + +void AddMenus(HWND hwnd) { + + HMENU hMenubar; + HMENU hMenu; + + hMenubar = CreateMenu(); + hMenu = CreateMenu(); + + AppendMenuW(hMenu, MF_STRING, IDM_FILE_NEW, L"&New"); + AppendMenuW(hMenu, MF_STRING, IDM_FILE_OPEN, L"&Open"); + AppendMenuW(hMenu, MF_SEPARATOR, 0, NULL); + AppendMenuW(hMenu, MF_STRING, IDM_FILE_QUIT, L"&Quit"); + + AppendMenuW(hMenubar, MF_POPUP, (UINT_PTR)hMenu, L"&File"); + SetMenu(hwnd, hMenubar); +} + +#endif // _run_app == _menu_bar
\ No newline at end of file diff --git a/source/tests/win32/02_multi_window.cpp b/source/tests/win32/02_multi_window.cpp new file mode 100644 index 0000000..99a943f --- /dev/null +++ b/source/tests/win32/02_multi_window.cpp @@ -0,0 +1,104 @@ +#include "config.h" + +#if _run_app == _multi_window + +#include <windows.h> +#include <GL/gl.h> +#include <GL/glu.h> +#define MAX_LOADSTRING 100 +HINSTANCE hInstance; +HWND hWnd, hWnd2; + +struct WindowData { + HWND window; + HDC deviceContext; + HGLRC renderContext; +}; + +LONG WINAPI WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { + static PAINTSTRUCT ps; + int pf; + PIXELFORMATDESCRIPTOR pfd; + HDC deviceContext; + HGLRC renderContext; + struct WindowData * windowData = (struct WindowData *) GetWindowLongPtr(hWnd, 0); + switch (uMsg) { + case WM_NCCREATE: + deviceContext = GetDC(hWnd); + renderContext = wglCreateContext(deviceContext); + + memset(&pfd, 0, sizeof(pfd)); + pfd.nSize = sizeof(pfd); + pfd.nVersion = 1; + pfd.dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL; + pfd.iPixelType = PFD_TYPE_RGBA; + pfd.cColorBits = 32; + + pf = ChoosePixelFormat(deviceContext, &pfd); + SetPixelFormat(deviceContext, pf, &pfd); + DescribePixelFormat(deviceContext, pf, sizeof(PIXELFORMATDESCRIPTOR), &pfd); + ReleaseDC(hWnd, deviceContext); + renderContext = wglCreateContext(deviceContext); + wglMakeCurrent(deviceContext, renderContext); + + windowData = (struct WindowData *) malloc(sizeof(struct WindowData)); + windowData->window = hWnd; + windowData->deviceContext = deviceContext; + windowData->renderContext = renderContext; + SetWindowLongPtr(hWnd, 0, (LONG)windowData); + return TRUE; + case WM_ACTIVATE: + wglMakeCurrent(windowData->deviceContext, windowData->renderContext); + break; + case WM_PAINT: + wglMakeCurrent(windowData->deviceContext, windowData->renderContext); + glClear(GL_COLOR_BUFFER_BIT); glBegin(GL_TRIANGLES); glVertex2i(0, 1); glVertex2i(-1, -1); glVertex2i(1, -1); glEnd(); glFlush(); + wglMakeCurrent(NULL, NULL); + BeginPaint(hWnd, &ps); EndPaint(hWnd, &ps); + return 0; + case WM_SIZE: + glViewport(0, 0, LOWORD(lParam), HIWORD(lParam)); PostMessage(hWnd, WM_PAINT, 0, 0); return 0; + case WM_CHAR: + if (wParam == 27) { PostQuitMessage(0); break; } + else { return 0; } + case WM_DESTROY: + ReleaseDC(hWnd, windowData->deviceContext); + wglDeleteContext(windowData->renderContext); + return 0; + case WM_CLOSE: + PostQuitMessage(0); return 0; + } + return DefWindowProc(hWnd, uMsg, wParam, lParam); +} + + +int WinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPTSTR lpCmdLine, _In_ int nCmdShow) { + MSG msg; + WNDCLASS wc; + int pf; + PIXELFORMATDESCRIPTOR pfd; + hInstance = GetModuleHandle(NULL); + + wc.style = CS_OWNDC; + wc.lpfnWndProc = (WNDPROC)WindowProc; + wc.cbClsExtra = 0; + wc.cbWndExtra = sizeof(struct WindowData *); + wc.hInstance = hInstance; + wc.hIcon = LoadIcon(NULL, IDI_WINLOGO); + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = NULL; + wc.lpszMenuName = NULL; + wc.lpszClassName = "OpenGL2"; + + RegisterClass(&wc); + hWnd = CreateWindowEx(WS_EX_WINDOWEDGE,"OpenGL2", "Hi there", WS_VSCROLL|WS_TILEDWINDOW, 0, 0, 640, 480, NULL, NULL, hInstance, NULL); + //hWnd2 = CreateWindow("OpenGL2", "Hi there", WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 110, 110, 640, 480, NULL, NULL, hInstance, NULL); + ShowWindow(hWnd, nCmdShow); + //ShowWindow(hWnd2, nCmdShow); + while (GetMessage(&msg, NULL, 0, 0)) { TranslateMessage(&msg); DispatchMessage(&msg); } + wglMakeCurrent(NULL, NULL); + DestroyWindow(hWnd); + return msg.wParam; +} + +#endif // _run_app == _multi_window
\ No newline at end of file diff --git a/source/tests/win32/03_sub_menu.cpp b/source/tests/win32/03_sub_menu.cpp new file mode 100644 index 0000000..848c82e --- /dev/null +++ b/source/tests/win32/03_sub_menu.cpp @@ -0,0 +1,146 @@ +#include "config.h" +#if _run_app == _sub_menu + +#include <windows.h> +#include <GL/gl.h> +#include <GL/glu.h> + +LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); +void AddMenus(HWND); + +#define IDM_FILE_NEW 1 +#define IDM_FILE_IMPORT 2 + +#define IDM_IMPORT_MAIL 11 + +#define IDM_ASSET 20 + + +int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, + PWSTR lpCmdLine, int nCmdShow) { + + MSG msg; + WNDCLASSW wc = { 0 }; + wc.lpszClassName = L"Submenu"; + wc.hInstance = hInstance; + wc.hbrBackground = GetSysColorBrush(COLOR_3DFACE); + wc.lpfnWndProc = WndProc; + wc.hCursor = LoadCursor(0, IDC_ARROW); + + RegisterClassW(&wc); + CreateWindowW(wc.lpszClassName, L"The Incredible Asura", + WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 350, 250, 0, 0, hInstance, 0); + + while (GetMessage(&msg, NULL, 0, 0)) { + + TranslateMessage(&msg); + DispatchMessage(&msg); + + ::Sleep(1); + } + + return (int)msg.wParam; +} +HDC hdc; +HGLRC glc; +static PAINTSTRUCT ps; +HBRUSH hBrush; +HBRUSH hOldBrush; +HPEN hPen; +HPEN hOldPen; +PIXELFORMATDESCRIPTOR pfd; +int pf; + +LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, + WPARAM wParam, LPARAM lParam) { + + switch (msg) { + + case WM_CREATE: + AddMenus(hwnd); + + hdc = GetDC(hwnd); + glc = wglCreateContext(hdc); + + memset(&pfd, 0, sizeof(pfd)); + pfd.nSize = sizeof(pfd); + pfd.nVersion = 1; + pfd.dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL; + pfd.iPixelType = PFD_TYPE_RGBA; + pfd.cColorBits = 32; + + pf = ChoosePixelFormat(hdc, &pfd); + SetPixelFormat(hdc, pf, &pfd); + DescribePixelFormat(hdc, pf, sizeof(PIXELFORMATDESCRIPTOR), &pfd); + ReleaseDC(hwnd, hdc); + glc = wglCreateContext(hdc); + wglMakeCurrent(hdc, glc); + + break; + + case WM_COMMAND: + + switch (LOWORD(wParam)) { + + case IDM_FILE_NEW: + MessageBoxW(NULL, L"New file selected", + L"Information", MB_OK); + break; + + case IDM_IMPORT_MAIL: + MessageBoxW(NULL, L"Import mail selected", + L"Information", MB_OK); + } + + break; + + case WM_DESTROY: + + PostQuitMessage(0); + break; + + case WM_PAINT: + + //hdc = BeginPaint(hwnd, &ps); + //hPen = CreatePen(PS_SOLID, 1, RGB(255, 0, 0)); + //hOldPen = (HPEN)SelectObject(hdc, hPen); + //hBrush = CreateSolidBrush(RGB(0, 0, 255)); + //hOldBrush = (HBRUSH)SelectObject(hdc, hBrush); + //Rectangle(hdc, 100, 100, 200, 170); + //EndPaint(hwnd, &ps); + hdc = GetDC(hwnd); + glc = wglCreateContext(hdc); + wglMakeCurrent(hdc, glc); + glClearColor(0.16, 0.16, 0.16, 1); + glClear(GL_COLOR_BUFFER_BIT); + glColor4f(0.219, 0.219, 0.219, 1); + glRectf(-0.5f, -0.5f, 0.5f, 0.5f); //ƾ + glFlush(); //ִOpenGLָбеָ + wglMakeCurrent(NULL, NULL); + BeginPaint(hwnd, &ps); EndPaint(hwnd, &ps); + break; + } + + return DefWindowProcW(hwnd, msg, wParam, lParam); +} + +void AddMenus(HWND hwnd) { + + HMENU hMenubar = CreateMenu(); + HMENU hMenu = CreateMenu(); + HMENU hSubMenu = CreatePopupMenu(); + HMENU asserMenu = CreateMenu(); + + AppendMenuW(hMenu, MF_STRING, IDM_FILE_NEW, L"&New"); + + AppendMenuW(asserMenu, MF_STRING, IDM_ASSET, L"Import &mail &assets"); + AppendMenuW(hSubMenu, MF_STRING | MF_POPUP, (UINT_PTR)asserMenu, L"Import &mail"); + AppendMenuW(hMenu, MF_STRING | MF_POPUP, (UINT_PTR)hSubMenu, L"&Import"); + + AppendMenuW(hMenubar, MF_POPUP, (UINT_PTR)hMenu, L"&File"); + + SetMenu(hwnd, hMenubar); +} + +#endif // _run_app == _sub_menu
\ No newline at end of file diff --git a/source/tests/win32/config.h b/source/tests/win32/config.h new file mode 100644 index 0000000..cf7341a --- /dev/null +++ b/source/tests/win32/config.h @@ -0,0 +1,10 @@ +#ifndef __Config_H__ +#define __Config_H__ + +#define _multi_window 1 +#define _menu_bar 2 +#define _sub_menu 3 + +#define _run_app _sub_menu + +#endif
\ No newline at end of file |