mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-30 06:58:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

GDK build: fix project settings and API changes

Browse Source
This commit is contained in:
Daniel Ludwig
2024-07-24 10:19:55 +02:00
committed by Ozkan Sezer
parent ba8495c214
commit 0a678a654e
5 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VisualC-GDK/SDL/SDL.vcxproj
View File

@@ -503,7 +503,7 @@
<ClCompile Include="..\..\src\dialog\SDL_dialog_utils.c" /> <ClCompile Include="..\..\src\dialog\SDL_dialog_utils.c" />
<ClCompile Include="..\..\src\filesystem\SDL_filesystem.c" /> <ClCompile Include="..\..\src\filesystem\SDL_filesystem.c" />
<ClCompile Include="..\..\src\filesystem\windows\SDL_sysfsops.c" /> <ClCompile Include="..\..\src\filesystem\windows\SDL_sysfsops.c" />
<ClCompile Include="..\..\src\main\gdk\SDL_sysmain_runapp.cpp"> <ClCompile Include="..\..\src\main\gdk\SDL_sysmain_runapp.cpp" />
<ClCompile Include="..\..\src\main\generic\SDL_sysmain_callbacks.c" /> <ClCompile Include="..\..\src\main\generic\SDL_sysmain_callbacks.c" />
<ClCompile Include="..\..\src\main\SDL_main_callbacks.c" /> <ClCompile Include="..\..\src\main\SDL_main_callbacks.c" />
<ClCompile Include="..\..\src\main\SDL_runapp.c" /> <ClCompile Include="..\..\src\main\SDL_runapp.c" />

2
VisualC-GDK/tests/testgdk/src/testgdk.cpp
View File

@@ -309,7 +309,7 @@ loop()
/* Check for events */ /* Check for events */
while (SDL_PollEvent(&event)) { while (SDL_PollEvent(&event)) {
if (event.type == SDL_EVENT_KEY_DOWN && !event.key.repeat) { if (event.type == SDL_EVENT_KEY_DOWN && !event.key.repeat) {
SDL_Log("Initial SDL_EVENT_KEY_DOWN: %s", SDL_GetScancodeName(event.key.keysym.scancode)); SDL_Log("Initial SDL_EVENT_KEY_DOWN: %s", SDL_GetScancodeName(event.key.scancode));
} }
#if defined(SDL_PLATFORM_XBOXONE) || defined(SDL_PLATFORM_XBOXSERIES) #if defined(SDL_PLATFORM_XBOXONE) || defined(SDL_PLATFORM_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 */

10
src/core/SDL_core_unsupported.c
View File

@@ -227,13 +227,3 @@ Sint32 JNI_OnLoad(void *vm, void *reserved)
return -1; /* JNI_ERR */ return -1; /* JNI_ERR */
} }
#endif #endif
// !!! FIXME: this probably belongs in src/filesystem/gdk
#if defined(SDL_PLATFORM_XBOXONE) || defined(SDL_PLATFORM_XBOXSERIES)
const char *SDL_GetUserFolder(SDL_Folder folder)
{
(void)folder;
SDL_Unsupported();
return NULL;
}
#endif

8
src/filesystem/gdk/SDL_sysfilesystem.cpp
View File

@@ -23,7 +23,9 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* System dependent filesystem routines */ /* System dependent filesystem routines */
extern "C" {
#include "../SDL_sysfilesystem.h" #include "../SDL_sysfilesystem.h"
}
#include "../../core/windows/SDL_windows.h" #include "../../core/windows/SDL_windows.h"
#include <SDL3/SDL_hints.h> #include <SDL3/SDL_hints.h>
@@ -133,5 +135,11 @@ char *SDL_SYS_GetPrefPath(const char *org, const char *app)
return folderPath; return folderPath;
} }
/* TODO */
char *SDL_SYS_GetUserFolder(SDL_Folder folder)
{
SDL_Unsupported();
return NULL;
}
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

2
src/video/windows/SDL_windowsvideo.c
View File

@@ -306,7 +306,7 @@ static SDL_VideoDevice *WIN_CreateDevice(void)
device->StartTextInput = GDK_StartTextInput; device->StartTextInput = GDK_StartTextInput;
device->StopTextInput = GDK_StopTextInput; device->StopTextInput = GDK_StopTextInput;
device->SetTextInputArea = GDK_SetTextInputArea; device->UpdateTextInputArea = GDK_UpdateTextInputArea;
device->ClearComposition = GDK_ClearComposition; device->ClearComposition = GDK_ClearComposition;
device->HasScreenKeyboardSupport = GDK_HasScreenKeyboardSupport; device->HasScreenKeyboardSupport = GDK_HasScreenKeyboardSupport;