eden-emu/SDL
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gdk: Fix the project

Browse source
This commit is contained in:
Nikita Krapivin 2023-05-27 01:56:01 +05:00 • committed by Sam Lantinga
parent 128ca70160
commit 97a927b44e
4 changed files with 60 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

17
VisualC-GDK/SDL/SDL.vcxproj
View file

@ -121,7 +121,7 @@
</Midl> </Midl>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories> <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>DLL_EXPORT;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>DLL_EXPORT;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BufferSecurityCheck>false</BufferSecurityCheck> <BufferSecurityCheck>false</BufferSecurityCheck>
@ -151,7 +151,7 @@
</Midl> </Midl>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories> <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>DLL_EXPORT;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>DLL_EXPORT;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BufferSecurityCheck>false</BufferSecurityCheck> <BufferSecurityCheck>false</BufferSecurityCheck>
@ -179,7 +179,7 @@
</Midl> </Midl>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories> <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>DLL_EXPORT;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>DLL_EXPORT;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BufferSecurityCheck>false</BufferSecurityCheck> <BufferSecurityCheck>false</BufferSecurityCheck>
@ -206,7 +206,7 @@
<TypeLibraryName>.\Release/SDL.tlb</TypeLibraryName> <TypeLibraryName>.\Release/SDL.tlb</TypeLibraryName>
</Midl> </Midl>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories> <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>DLL_EXPORT;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>DLL_EXPORT;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BufferSecurityCheck>false</BufferSecurityCheck> <BufferSecurityCheck>false</BufferSecurityCheck>
@ -237,7 +237,7 @@
<TypeLibraryName>.\Release/SDL.tlb</TypeLibraryName> <TypeLibraryName>.\Release/SDL.tlb</TypeLibraryName>
</Midl> </Midl>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories> <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>DLL_EXPORT;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>DLL_EXPORT;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BufferSecurityCheck>false</BufferSecurityCheck> <BufferSecurityCheck>false</BufferSecurityCheck>
@ -266,7 +266,7 @@
<TypeLibraryName>.\Release/SDL.tlb</TypeLibraryName> <TypeLibraryName>.\Release/SDL.tlb</TypeLibraryName>
</Midl> </Midl>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories> <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>DLL_EXPORT;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>DLL_EXPORT;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BufferSecurityCheck>false</BufferSecurityCheck> <BufferSecurityCheck>false</BufferSecurityCheck>
@ -475,6 +475,7 @@
<ClInclude Include="..\..\src\sensor\SDL_sensor_c.h" /> <ClInclude Include="..\..\src\sensor\SDL_sensor_c.h" />
<ClInclude Include="..\..\src\sensor\SDL_syssensor.h" /> <ClInclude Include="..\..\src\sensor\SDL_syssensor.h" />
<ClInclude Include="..\..\src\sensor\windows\SDL_windowssensor.h" /> <ClInclude Include="..\..\src\sensor\windows\SDL_windowssensor.h" />
<ClInclude Include="..\..\src\thread\generic\SDL_sysrwlock_c.h" />
<ClInclude Include="..\..\src\thread\SDL_systhread.h" /> <ClInclude Include="..\..\src\thread\SDL_systhread.h" />
<ClInclude Include="..\..\src\thread\SDL_thread_c.h" /> <ClInclude Include="..\..\src\thread\SDL_thread_c.h" />
<ClInclude Include="..\..\src\thread\generic\SDL_syscond_c.h" /> <ClInclude Include="..\..\src\thread\generic\SDL_syscond_c.h" />
@ -724,9 +725,11 @@
<ClCompile Include="..\..\src\stdlib\SDL_string.c" /> <ClCompile Include="..\..\src\stdlib\SDL_string.c" />
<ClCompile Include="..\..\src\stdlib\SDL_strtokr.c" /> <ClCompile Include="..\..\src\stdlib\SDL_strtokr.c" />
<ClCompile Include="..\..\src\thread\generic\SDL_syscond.c" /> <ClCompile Include="..\..\src\thread\generic\SDL_syscond.c" />
<ClCompile Include="..\..\src\thread\generic\SDL_sysrwlock.c" />
<ClCompile Include="..\..\src\thread\SDL_thread.c" /> <ClCompile Include="..\..\src\thread\SDL_thread.c" />
<ClCompile Include="..\..\src\thread\windows\SDL_syscond_cv.c" /> <ClCompile Include="..\..\src\thread\windows\SDL_syscond_cv.c" />
<ClCompile Include="..\..\src\thread\windows\SDL_sysmutex.c" /> <ClCompile Include="..\..\src\thread\windows\SDL_sysmutex.c" />
<ClCompile Include="..\..\src\thread\windows\SDL_sysrwlock_srw.c" />
<ClCompile Include="..\..\src\thread\windows\SDL_syssem.c" /> <ClCompile Include="..\..\src\thread\windows\SDL_syssem.c" />
<ClCompile Include="..\..\src\thread\windows\SDL_systhread.c" /> <ClCompile Include="..\..\src\thread\windows\SDL_systhread.c" />
<ClCompile Include="..\..\src\thread\windows\SDL_systls.c" /> <ClCompile Include="..\..\src\thread\windows\SDL_systls.c" />
@ -777,4 +780,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>

17
VisualC-GDK/SDL/SDL.vcxproj.filters
View file

@ -821,6 +821,9 @@
<ClInclude Include="..\..\src\render\direct3d12\SDL_render_d3d12_xbox.h"> <ClInclude Include="..\..\src\render\direct3d12\SDL_render_d3d12_xbox.h">
<Filter>render\direct3d12</Filter> <Filter>render\direct3d12</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\thread\generic\SDL_sysrwlock_c.h">
<Filter>thread\generic</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi.c" /> <ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi.c" />
@ -1225,9 +1228,6 @@
<ClCompile Include="..\..\src\thread\windows\SDL_sysmutex.c"> <ClCompile Include="..\..\src\thread\windows\SDL_sysmutex.c">
<Filter>thread\windows</Filter> <Filter>thread\windows</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\thread\windows\SDL_sysrwlock_srw.c">
<Filter>thread\windows</Filter>
</ClCompile>
<ClCompile Include="..\..\src\thread\windows\SDL_syssem.c"> <ClCompile Include="..\..\src\thread\windows\SDL_syssem.c">
<Filter>thread\windows</Filter> <Filter>thread\windows</Filter>
</ClCompile> </ClCompile>
@ -1240,9 +1240,6 @@
<ClCompile Include="..\..\src\thread\generic\SDL_syscond.c"> <ClCompile Include="..\..\src\thread\generic\SDL_syscond.c">
<Filter>thread\generic</Filter> <Filter>thread\generic</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\thread\generic\SDL_sysrwlock.c">
<Filter>thread\generic</Filter>
</ClCompile>
<ClCompile Include="..\..\src\stdlib\SDL_crc16.c"> <ClCompile Include="..\..\src\stdlib\SDL_crc16.c">
<Filter>stdlib</Filter> <Filter>stdlib</Filter>
</ClCompile> </ClCompile>
@ -1370,8 +1367,14 @@
<ClCompile Include="..\..\src\core\windows\pch_cpp.cpp"> <ClCompile Include="..\..\src\core\windows\pch_cpp.cpp">
<Filter>core\windows</Filter> <Filter>core\windows</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\thread\windows\SDL_sysrwlock_srw.c">
<Filter>thread\windows</Filter>
</ClCompile>
<ClCompile Include="..\..\src\thread\generic\SDL_sysrwlock.c">
<Filter>thread\generic</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="..\..\src\core\windows\version.rc" /> <ResourceCompile Include="..\..\src\core\windows\version.rc" />
</ItemGroup> </ItemGroup>
</Project> </Project>

77
VisualC-GDK/tests/testgdk/src/testgdk.cpp
View file

@ -92,7 +92,7 @@ open_audio()
} }
/* Let the audio run */ /* Let the audio run */
SDL_PauseAudioDevice(device, SDL_FALSE); SDL_PlayAudioDevice(device);
} }
static void static void
@ -256,10 +256,11 @@ LoadSprite(const char *file)
void void
DrawSprites(SDL_Renderer * renderer, SDL_Texture * sprite) DrawSprites(SDL_Renderer * renderer, SDL_Texture * sprite)
{ {
SDL_Rect viewport, temp; SDL_Rect viewport;
SDL_FRect temp;
/* Query the sizes */ /* Query the sizes */
SDL_RenderGetViewport(renderer, &viewport); SDL_GetRenderViewport(renderer, &viewport);
/* Cycle the color and alpha, if desired */ /* Cycle the color and alpha, if desired */
if (cycle_color) { if (cycle_color) {
@ -294,51 +295,51 @@ DrawSprites(SDL_Renderer * renderer, SDL_Texture * sprite)
/* Test points */ /* Test points */
SDL_SetRenderDrawColor(renderer, 0xFF, 0x00, 0x00, 0xFF); SDL_SetRenderDrawColor(renderer, 0xFF, 0x00, 0x00, 0xFF);
SDL_RenderDrawPoint(renderer, 0, 0); SDL_RenderPoint(renderer, 0.0f, 0.0f);
SDL_RenderDrawPoint(renderer, viewport.w-1, 0); SDL_RenderPoint(renderer, (float)(viewport.w - 1), 0.0f);
SDL_RenderDrawPoint(renderer, 0, viewport.h-1); SDL_RenderPoint(renderer, 0.0f, (float)(viewport.h - 1));
SDL_RenderDrawPoint(renderer, viewport.w-1, viewport.h-1); SDL_RenderPoint(renderer, (float)(viewport.w - 1), (float)(viewport.h - 1));
/* Test horizontal and vertical lines */ /* Test horizontal and vertical lines */
SDL_SetRenderDrawColor(renderer, 0x00, 0xFF, 0x00, 0xFF); SDL_SetRenderDrawColor(renderer, 0x00, 0xFF, 0x00, 0xFF);
SDL_RenderDrawLine(renderer, 1, 0, viewport.w-2, 0); SDL_RenderLine(renderer, 1.0f, 0.0f, (float)(viewport.w - 2), 0.0f);
SDL_RenderDrawLine(renderer, 1, viewport.h-1, viewport.w-2, viewport.h-1); SDL_RenderLine(renderer, 1.0f, (float)(viewport.h - 1), (float)(viewport.w - 2), (float)(viewport.h - 1));
SDL_RenderDrawLine(renderer, 0, 1, 0, viewport.h-2); SDL_RenderLine(renderer, 0.0f, 1.0f, 0.0f, (float)(viewport.h - 2));
SDL_RenderDrawLine(renderer, viewport.w-1, 1, viewport.w-1, viewport.h-2); SDL_RenderLine(renderer, (float)(viewport.w - 1), 1, (float)(viewport.w - 1), (float)(viewport.h - 2));
/* Test fill and copy */ /* Test fill and copy */
SDL_SetRenderDrawColor(renderer, 0xFF, 0xFF, 0xFF, 0xFF); SDL_SetRenderDrawColor(renderer, 0xFF, 0xFF, 0xFF, 0xFF);
temp.x = 1; temp.x = 1.0f;
temp.y = 1; temp.y = 1.0f;
temp.w = sprite_w; temp.w = (float)sprite_w;
temp.h = sprite_h; temp.h = (float)sprite_h;
SDL_RenderFillRect(renderer, &temp); SDL_RenderFillRect(renderer, &temp);
SDL_RenderCopy(renderer, sprite, NULL, &temp); SDL_RenderTexture(renderer, sprite, NULL, &temp);
temp.x = viewport.w-sprite_w-1; temp.x = (float)(viewport.w-sprite_w-1);
temp.y = 1; temp.y = 1.0f;
temp.w = sprite_w; temp.w = (float)sprite_w;
temp.h = sprite_h; temp.h = (float)sprite_h;
SDL_RenderFillRect(renderer, &temp); SDL_RenderFillRect(renderer, &temp);
SDL_RenderCopy(renderer, sprite, NULL, &temp); SDL_RenderTexture(renderer, sprite, NULL, &temp);
temp.x = 1; temp.x = 1.0f;
temp.y = viewport.h-sprite_h-1; temp.y = (float)(viewport.h-sprite_h-1);
temp.w = sprite_w; temp.w = (float)sprite_w;
temp.h = sprite_h; temp.h = (float)sprite_h;
SDL_RenderFillRect(renderer, &temp); SDL_RenderFillRect(renderer, &temp);
SDL_RenderCopy(renderer, sprite, NULL, &temp); SDL_RenderTexture(renderer, sprite, NULL, &temp);
temp.x = viewport.w-sprite_w-1; temp.x = (float)(viewport.w-sprite_w-1);
temp.y = viewport.h-sprite_h-1; temp.y = (float)(viewport.h-sprite_h-1);
temp.w = sprite_w; temp.w = (float)(sprite_w);
temp.h = sprite_h; temp.h = (float)(sprite_h);
SDL_RenderFillRect(renderer, &temp); SDL_RenderFillRect(renderer, &temp);
SDL_RenderCopy(renderer, sprite, NULL, &temp); SDL_RenderTexture(renderer, sprite, NULL, &temp);
/* Test diagonal lines */ /* Test diagonal lines */
SDL_SetRenderDrawColor(renderer, 0x00, 0xFF, 0x00, 0xFF); SDL_SetRenderDrawColor(renderer, 0x00, 0xFF, 0x00, 0xFF);
SDL_RenderDrawLine(renderer, sprite_w, sprite_h, SDL_RenderLine(renderer, (float)sprite_w, (float)sprite_h,
viewport.w-sprite_w-2, viewport.h-sprite_h-2); (float)(viewport.w-sprite_w-2), (float)(viewport.h-sprite_h-2));
SDL_RenderDrawLine(renderer, viewport.w-sprite_w-2, sprite_h, SDL_RenderLine(renderer, (float)(viewport.w-sprite_w-2), (float)sprite_h,
sprite_w, viewport.h-sprite_h-2); (float)sprite_w, (float)(viewport.h-sprite_h-2));
/* Update the screen! */ /* Update the screen! */
SDL_RenderPresent(renderer); SDL_RenderPresent(renderer);
@ -352,12 +353,12 @@ loop()
/* Check for events */ /* Check for events */
while (SDL_PollEvent(&event)) { while (SDL_PollEvent(&event)) {
if (event.type == SDL_KEYDOWN && !event.key.repeat) { if (event.type == SDL_EVENT_KEY_DOWN && !event.key.repeat) {
SDL_Log("Initial SDL_KEYDOWN: %s", SDL_GetScancodeName(event.key.keysym.scancode)); SDL_Log("Initial SDL_EVENT_KEY_DOWN: %s", SDL_GetScancodeName(event.key.keysym.scancode));
} }
#if defined(__XBOXONE__) || defined(__XBOXSERIES__) #if defined(__XBOXONE__) || defined(__XBOXSERIES__)
/* On Xbox, ignore the keydown event because the features aren't supported */ /* On Xbox, ignore the keydown event because the features aren't supported */
if (event.type != SDL_KEYDOWN) { if (event.type != SDL_EVENT_KEY_DOWN) {
SDLTest_CommonEvent(state, &event, &done); SDLTest_CommonEvent(state, &event, &done);
} }
#else #else

2
include/SDL3/SDL_syswm.h
View file

@ -94,7 +94,7 @@
#endif /* !SDL_DISABLE_SYSWM_WAYLAND */ #endif /* !SDL_DISABLE_SYSWM_WAYLAND */
#ifndef SDL_DISABLE_SYSWM_WINDOWS #ifndef SDL_DISABLE_SYSWM_WINDOWS
#ifdef __WIN32__ #if defined(__WIN32__) || defined(__GDK__)
#define SDL_ENABLE_SYSWM_WINDOWS #define SDL_ENABLE_SYSWM_WINDOWS
#endif #endif
#endif /* !SDL_DISABLE_SYSWM_WINDOWS */ #endif /* !SDL_DISABLE_SYSWM_WINDOWS */