diff options
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/3rdParty/SDL2/SDL2.vcxproj | 224 | ||||
| -rw-r--r-- | Build/3rdParty/SDL2/SDL2.vcxproj.filters | 176 | ||||
| -rw-r--r-- | Build/3rdParty/SDL2main/SDL2main.vcxproj | 17 | ||||
| -rw-r--r-- | Build/Asura.Engine/Asura.Engine.vcxproj | 20 | ||||
| -rw-r--r-- | Build/Asura.sln | 22 | ||||
| -rw-r--r-- | Build/Samples/CursorTest/CursorTest.vcxproj | 12 | ||||
| -rw-r--r-- | Build/x64/Debug/CursorTest.exe | bin | 0 -> 57344 bytes |
7 files changed, 124 insertions, 347 deletions
diff --git a/Build/3rdParty/SDL2/SDL2.vcxproj b/Build/3rdParty/SDL2/SDL2.vcxproj index 9a61b1c..55b5382 100644 --- a/Build/3rdParty/SDL2/SDL2.vcxproj +++ b/Build/3rdParty/SDL2/SDL2.vcxproj @@ -26,30 +26,30 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> + <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <PlatformToolset>v141</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> + <ConfigurationType>DynamicLibrary</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> + <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <PlatformToolset>v141</PlatformToolset> - <CharacterSet>MultiByte</CharacterSet> + <CharacterSet>NotSet</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> + <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <PlatformToolset>v141</PlatformToolset> <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>MultiByte</CharacterSet> + <CharacterSet>NotSet</CharacterSet> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -69,15 +69,32 @@ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> - <PropertyGroup /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <OutDir>$(SolutionDir)..\Bin\win64</OutDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <OutDir>$(SolutionDir)..\Bin\win64</OutDir> + </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <SDLCheck>true</SDLCheck> - <ConformanceMode>true</ConformanceMode> + <SDLCheck>false</SDLCheck> + <ConformanceMode>false</ConformanceMode> <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <BufferSecurityCheck>false</BufferSecurityCheck> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet> + <OmitDefaultLibName>true</OmitDefaultLibName> + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> + <BasicRuntimeChecks>Default</BasicRuntimeChecks> </ClCompile> + <Link> + <AdditionalDependencies>setupapi.lib;winmm.lib;imm32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies> + <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> + <SubSystem>Windows</SubSystem> + </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -109,186 +126,33 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> - <ConformanceMode>true</ConformanceMode> + <SDLCheck>false</SDLCheck> + <ConformanceMode>false</ConformanceMode> <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <BufferSecurityCheck>false</BufferSecurityCheck> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet> + <OmitDefaultLibName>true</OmitDefaultLibName> + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> </ClCompile> <Link> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> + <AdditionalDependencies>setupapi.lib;winmm.lib;imm32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies> + <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> + <SubSystem>Windows</SubSystem> </Link> </ItemDefinitionGroup> <ItemGroup> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\begin_code.h" /> <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\close_code.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_assert.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_atomic.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_audio.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_bits.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_blendmode.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_clipboard.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_config.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_config_android.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_config_iphoneos.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_config_macosx.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_config_minimal.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_config_pandora.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_config_psp.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_config_windows.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_config_winrt.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_config_wiz.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_copying.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_cpuinfo.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_egl.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_endian.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_error.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_events.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_filesystem.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_gamecontroller.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_gesture.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_haptic.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_hints.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_joystick.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_keyboard.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_keycode.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_loadso.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_log.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_main.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_messagebox.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_mouse.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_mutex.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_name.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_opengl.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_opengles.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_opengles2.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_opengles2_gl2.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_opengles2_gl2ext.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_opengles2_gl2platform.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_opengles2_khrplatform.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_opengl_glext.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_pixels.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_platform.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_power.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_quit.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_rect.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_render.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_revision.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_rwops.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_scancode.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_shape.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_stdinc.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_surface.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_system.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_syswm.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_test.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_test_assert.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_test_common.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_test_compare.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_test_crc32.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_test_font.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_test_fuzzer.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_test_harness.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_test_images.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_test_log.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_test_md5.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_test_memory.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_test_random.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_thread.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_timer.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_touch.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_types.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_version.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_video.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_vulkan.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\audio\directsound\SDL_directsound.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\audio\disk\SDL_diskaudio.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\audio\dummy\SDL_dummyaudio.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\audio\SDL_audio_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\audio\SDL_audiodev_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\audio\SDL_sysaudio.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\audio\SDL_wave.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\audio\wasapi\SDL_wasapi.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\audio\winmm\SDL_winmm.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\SDL2\src\audio\SDL_audiodev_c.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\SDL2\src\audio\SDL_audio_c.h" /> <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\core\windows\SDL_directx.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\core\windows\SDL_windows.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\core\windows\SDL_xinput.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\dynapi\SDL_dynapi.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\dynapi\SDL_dynapi_overrides.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\dynapi\SDL_dynapi_procs.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\events\SDL_clipboardevents_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_dropevents_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_events_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_gesture_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_keyboard_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_mouse_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_sysevents.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_touch_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_windowevents_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\haptic\SDL_syshaptic.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\haptic\windows\SDL_dinputhaptic_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\haptic\windows\SDL_windowshaptic_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\haptic\windows\SDL_xinputhaptic_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\joystick\SDL_joystick_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\joystick\SDL_sysjoystick.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\joystick\windows\SDL_dinputjoystick_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\joystick\windows\SDL_windowsjoystick_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\joystick\windows\SDL_xinputjoystick_c.h" /> <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\libm\math_libm.h" /> <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\libm\math_private.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\direct3d11\SDL_shaders_d3d11.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\direct3d\SDL_shaders_d3d.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\opengl\SDL_glfuncs.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\opengl\SDL_shaders_gl.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\opengles\SDL_glesfuncs.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\SDL_d3dmath.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\SDL_sysrender.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\SDL_yuv_sw_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_blendfillrect.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_blendline.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_blendpoint.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_draw.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_drawline.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_drawpoint.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_render_sw_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_rotate.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\SDL_dataqueue.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\SDL_error_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\thread\SDL_systhread.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\thread\SDL_thread_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\thread\windows\SDL_systhread_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\timer\SDL_timer_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\dummy\SDL_nullevents_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\dummy\SDL_nullframebuffer_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\dummy\SDL_nullvideo.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_blit.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_blit_auto.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_blit_copy.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_blit_slow.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_pixels_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_rect_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_RLEaccel_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_shape_internals.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_sysvideo.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_vulkan_internal.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_yuv_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_vkeys.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsclipboard.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsevents.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsframebuffer.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowskeyboard.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsmessagebox.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsmodes.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsmouse.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsopengl.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsshape.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsvideo.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsvulkan.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowswindow.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\wmmsg.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\yuv2rgb\yuv_rgb.h" /> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\..\Source\3rdparty\SDL2\src\atomic\SDL_atomic.c" /> @@ -310,6 +174,7 @@ <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_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" /> @@ -324,6 +189,12 @@ <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\hidapi\windows\hid.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\SDL2\src\joystick\hidapi\SDL_hidapijoystick.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\SDL2\src\joystick\hidapi\SDL_hidapi_ps4.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\SDL2\src\joystick\hidapi\SDL_hidapi_switch.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\SDL2\src\joystick\hidapi\SDL_hidapi_xbox360.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\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" /> @@ -331,6 +202,7 @@ <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_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" /> @@ -376,6 +248,8 @@ <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\sensor\dummy\SDL_dummysensor.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\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" /> diff --git a/Build/3rdParty/SDL2/SDL2.vcxproj.filters b/Build/3rdParty/SDL2/SDL2.vcxproj.filters index 2b0eb8a..7af9b49 100644 --- a/Build/3rdParty/SDL2/SDL2.vcxproj.filters +++ b/Build/3rdParty/SDL2/SDL2.vcxproj.filters @@ -138,177 +138,25 @@ <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\3rdParty\SDL2\src\libm\e_exp.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\SDL2\src\hidapi\windows\hid.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\SDL2\src\events\SDL_displayevents.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\SDL2\src\sensor\dummy\SDL_dummysensor.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\SDL2\src\joystick\hidapi\SDL_hidapi_ps4.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\SDL2\src\joystick\hidapi\SDL_hidapi_switch.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\SDL2\src\joystick\hidapi\SDL_hidapi_xbox360.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\SDL2\src\joystick\hidapi\SDL_hidapi_xboxone.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\SDL2\src\joystick\hidapi\SDL_hidapijoystick.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\SDL2\src\sensor\SDL_sensor.c" /> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\begin_code.h" /> <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\close_code.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_assert.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_atomic.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_audio.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_bits.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_blendmode.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_clipboard.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_config.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_config_android.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_config_iphoneos.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_config_macosx.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_config_minimal.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_config_pandora.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_config_psp.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_config_windows.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_config_winrt.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_config_wiz.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_copying.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_cpuinfo.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_egl.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_endian.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_error.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_events.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_filesystem.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_gamecontroller.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_gesture.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_haptic.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_hints.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_joystick.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_keyboard.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_keycode.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_loadso.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_log.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_main.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_messagebox.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_mouse.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_mutex.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_name.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_opengl.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_opengles.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_opengles2.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_opengles2_gl2.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_opengles2_gl2ext.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_opengles2_gl2platform.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_opengles2_khrplatform.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_opengl_glext.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_pixels.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_platform.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_power.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_quit.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_rect.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_render.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_revision.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_rwops.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_scancode.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_shape.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_stdinc.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_surface.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_system.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_syswm.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_test.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_test_assert.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_test_common.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_test_compare.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_test_crc32.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_test_font.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_test_fuzzer.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_test_harness.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_test_images.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_test_log.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_test_md5.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_test_memory.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_test_random.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_thread.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_timer.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_touch.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_types.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_version.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_video.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\include\SDL_vulkan.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\audio\directsound\SDL_directsound.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\audio\disk\SDL_diskaudio.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\audio\dummy\SDL_dummyaudio.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\audio\SDL_audio_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\audio\SDL_audiodev_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\audio\SDL_sysaudio.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\audio\SDL_wave.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\audio\wasapi\SDL_wasapi.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\audio\winmm\SDL_winmm.h" /> <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\core\windows\SDL_directx.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\core\windows\SDL_windows.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\core\windows\SDL_xinput.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\dynapi\SDL_dynapi.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\dynapi\SDL_dynapi_overrides.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\dynapi\SDL_dynapi_procs.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\events\SDL_clipboardevents_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_dropevents_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_events_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_gesture_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_keyboard_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_mouse_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_sysevents.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_touch_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\events\SDL_windowevents_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\haptic\SDL_syshaptic.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\haptic\windows\SDL_dinputhaptic_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\haptic\windows\SDL_windowshaptic_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\haptic\windows\SDL_xinputhaptic_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\joystick\SDL_joystick_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\joystick\SDL_sysjoystick.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\joystick\windows\SDL_dinputjoystick_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\joystick\windows\SDL_windowsjoystick_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\joystick\windows\SDL_xinputjoystick_c.h" /> <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\libm\math_libm.h" /> <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\libm\math_private.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\direct3d11\SDL_shaders_d3d11.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\direct3d\SDL_shaders_d3d.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\opengl\SDL_glfuncs.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\opengl\SDL_shaders_gl.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\opengles\SDL_glesfuncs.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\SDL_d3dmath.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\SDL_sysrender.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\SDL_yuv_sw_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_blendfillrect.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_blendline.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_blendpoint.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_draw.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_drawline.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_drawpoint.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_render_sw_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\render\software\SDL_rotate.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\SDL_dataqueue.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\SDL_error_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\thread\SDL_systhread.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\thread\SDL_thread_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\thread\windows\SDL_systhread_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\timer\SDL_timer_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\dummy\SDL_nullevents_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\dummy\SDL_nullframebuffer_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\dummy\SDL_nullvideo.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_blit.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_blit_auto.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_blit_copy.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_blit_slow.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_pixels_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_rect_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_RLEaccel_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_shape_internals.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_sysvideo.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_vulkan_internal.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\SDL_yuv_c.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_vkeys.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsclipboard.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsevents.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsframebuffer.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowskeyboard.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsmessagebox.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsmodes.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsmouse.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsopengl.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsshape.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsvideo.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowsvulkan.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\SDL_windowswindow.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\windows\wmmsg.h" /> - <ClInclude Include="..\..\..\Source\3rdparty\SDL2\src\video\yuv2rgb\yuv_rgb.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\SDL2\src\audio\SDL_audio_c.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\SDL2\src\audio\SDL_audiodev_c.h" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/Build/3rdParty/SDL2main/SDL2main.vcxproj b/Build/3rdParty/SDL2main/SDL2main.vcxproj index 042c535..2c07aae 100644 --- a/Build/3rdParty/SDL2main/SDL2main.vcxproj +++ b/Build/3rdParty/SDL2main/SDL2main.vcxproj @@ -26,26 +26,26 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <PlatformToolset>v141</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> + <ConfigurationType>StaticLibrary</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> + <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <PlatformToolset>v141</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <PlatformToolset>v141</PlatformToolset> <WholeProgramOptimization>true</WholeProgramOptimization> @@ -69,7 +69,12 @@ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> - <PropertyGroup /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <OutDir>$(SolutionDir)..\Bin\win64</OutDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <OutDir>$(SolutionDir)..\Bin\win64</OutDir> + </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <WarningLevel>Level3</WarningLevel> @@ -77,6 +82,7 @@ <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -112,6 +118,7 @@ <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <EnableCOMDATFolding>true</EnableCOMDATFolding> diff --git a/Build/Asura.Engine/Asura.Engine.vcxproj b/Build/Asura.Engine/Asura.Engine.vcxproj index fd62ab6..007d1bc 100644 --- a/Build/Asura.Engine/Asura.Engine.vcxproj +++ b/Build/Asura.Engine/Asura.Engine.vcxproj @@ -39,13 +39,13 @@ <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <PlatformToolset>v141</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <PlatformToolset>v141</PlatformToolset> <WholeProgramOptimization>true</WholeProgramOptimization> @@ -75,6 +75,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <TargetName>libasura</TargetName> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <OutDir>$(SolutionDir)..\Bin\win64</OutDir> + <TargetName>asuraengine</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <OutDir>$(SolutionDir)..\Bin\win64</OutDir> + <TargetName>asuraengine</TargetName> + </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <WarningLevel>Level3</WarningLevel> @@ -192,6 +200,14 @@ <ClCompile Include="..\..\Source\Asura.Engine\StringMap.cpp" /> <ClCompile Include="..\..\Source\Asura.Engine\Time\Timer.cpp" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\3rdParty\SDL2main\SDL2main.vcxproj"> + <Project>{e34eaf11-27f4-41e9-bbc6-9ce5de3359ba}</Project> + </ProjectReference> + <ProjectReference Include="..\3rdParty\SDL2\SDL2.vcxproj"> + <Project>{208b9cb8-2101-42a9-9502-0cf54912bc57}</Project> + </ProjectReference> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> diff --git a/Build/Asura.sln b/Build/Asura.sln index 74e6090..0055f3c 100644 --- a/Build/Asura.sln +++ b/Build/Asura.sln @@ -47,6 +47,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Box2D", "3rdParty\Box2D\Box EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CursorTest", "Samples\CursorTest\CursorTest.vcxproj", "{7B6707E6-EBB7-44CF-B850-DA606F09B26E}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vorbis", "3rdParty\vorbis\vorbis.vcxproj", "{3CD80326-A2FE-4073-8B1A-73E166C9A2AE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "3rdParty\freetype\freetype.vcxproj", "{4B970273-A352-433B-98B2-B4BF6DF72F71}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -215,6 +219,22 @@ Global {7B6707E6-EBB7-44CF-B850-DA606F09B26E}.Release|x64.Build.0 = Release|x64 {7B6707E6-EBB7-44CF-B850-DA606F09B26E}.Release|x86.ActiveCfg = Release|Win32 {7B6707E6-EBB7-44CF-B850-DA606F09B26E}.Release|x86.Build.0 = Release|Win32 + {3CD80326-A2FE-4073-8B1A-73E166C9A2AE}.Debug|x64.ActiveCfg = Debug|x64 + {3CD80326-A2FE-4073-8B1A-73E166C9A2AE}.Debug|x64.Build.0 = Debug|x64 + {3CD80326-A2FE-4073-8B1A-73E166C9A2AE}.Debug|x86.ActiveCfg = Debug|Win32 + {3CD80326-A2FE-4073-8B1A-73E166C9A2AE}.Debug|x86.Build.0 = Debug|Win32 + {3CD80326-A2FE-4073-8B1A-73E166C9A2AE}.Release|x64.ActiveCfg = Release|x64 + {3CD80326-A2FE-4073-8B1A-73E166C9A2AE}.Release|x64.Build.0 = Release|x64 + {3CD80326-A2FE-4073-8B1A-73E166C9A2AE}.Release|x86.ActiveCfg = Release|Win32 + {3CD80326-A2FE-4073-8B1A-73E166C9A2AE}.Release|x86.Build.0 = Release|Win32 + {4B970273-A352-433B-98B2-B4BF6DF72F71}.Debug|x64.ActiveCfg = Debug|x64 + {4B970273-A352-433B-98B2-B4BF6DF72F71}.Debug|x64.Build.0 = Debug|x64 + {4B970273-A352-433B-98B2-B4BF6DF72F71}.Debug|x86.ActiveCfg = Debug|Win32 + {4B970273-A352-433B-98B2-B4BF6DF72F71}.Debug|x86.Build.0 = Debug|Win32 + {4B970273-A352-433B-98B2-B4BF6DF72F71}.Release|x64.ActiveCfg = Release|x64 + {4B970273-A352-433B-98B2-B4BF6DF72F71}.Release|x64.Build.0 = Release|x64 + {4B970273-A352-433B-98B2-B4BF6DF72F71}.Release|x86.ActiveCfg = Release|Win32 + {4B970273-A352-433B-98B2-B4BF6DF72F71}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -232,6 +252,8 @@ Global {83E0897A-E2F4-4057-8077-59C4A0C38E56} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} {4122CC44-1E4C-4A08-B16F-1A650585EBD4} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} {7B6707E6-EBB7-44CF-B850-DA606F09B26E} = {E068D138-C824-4365-B5A3-27C65E8FD0B5} + {3CD80326-A2FE-4073-8B1A-73E166C9A2AE} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} + {4B970273-A352-433B-98B2-B4BF6DF72F71} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {331032D8-F7CC-43E3-A03B-67108767F96B} diff --git a/Build/Samples/CursorTest/CursorTest.vcxproj b/Build/Samples/CursorTest/CursorTest.vcxproj index affd66d..f9793f7 100644 --- a/Build/Samples/CursorTest/CursorTest.vcxproj +++ b/Build/Samples/CursorTest/CursorTest.vcxproj @@ -69,7 +69,12 @@ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> - <PropertyGroup /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <OutDir>$(SolutionDir)..\Bin\win64</OutDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <OutDir>$(SolutionDir)..\Bin\win64</OutDir> + </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <WarningLevel>Level3</WarningLevel> @@ -117,6 +122,11 @@ <ItemGroup> <ClCompile Include="..\..\..\Source\Samples\CursorTest\main.cpp" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\Asura.Engine\Asura.Engine.vcxproj"> + <Project>{c402199a-49c2-4568-ae79-b56cb3b510d3}</Project> + </ProjectReference> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> diff --git a/Build/x64/Debug/CursorTest.exe b/Build/x64/Debug/CursorTest.exe Binary files differnew file mode 100644 index 0000000..451b445 --- /dev/null +++ b/Build/x64/Debug/CursorTest.exe |