morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10594 from akallabeth/sdl3-fix

Browse Source 
Sdl3 fix
This commit is contained in:
akallabeth
2024-09-11 22:39:08 +02:00
committed by GitHub
parent 1f917ca46f 2175428df5
commit 0de5430578
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
client/SDL/SDL3/sdl_pointer.cpp
View File

@@ -186,10 +186,24 @@ static BOOL sdl_Pointer_SetPosition(rdpContext* context, UINT32 x, UINT32 y)
BOOL sdl_register_pointer(rdpGraphics* graphics)
{
const rdpPointer pointer = {
sizeof(sdlPointer), sdl_Pointer_New, sdl_Pointer_Free, sdl_Pointer_Set, sdl_Pointer_SetNull,
sdl_Pointer_SetDefault, sdl_Pointer_SetPosition, {}, 0, 0, 0, 0, 0, 0, 0, nullptr, nullptr,
{};
const rdpPointer pointer = { sizeof(sdlPointer),
sdl_Pointer_New,
sdl_Pointer_Free,
sdl_Pointer_Set,
sdl_Pointer_SetNull,
sdl_Pointer_SetDefault,
sdl_Pointer_SetPosition,
{},
0,
0,
0,
0,
0,
0,
0,
nullptr,
nullptr,
{} };
graphics_register_pointer(graphics, &pointer);
return TRUE;
}

3
client/SDL/common/aad/CMakeLists.txt
View File

@@ -16,9 +16,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
set(WITH_WEBVIEW_DEFAULT OFF)
if (UNIX AND NOT APPLE)
set(WITH_WEBVIEW_DEFAULT ON)
endif()
option(WITH_WEBVIEW "Build with WebView support for AAD login popup browser" ${WITH_WEBVIEW_DEFAULT})
if (WITH_WEBVIEW)

4
libfreerdp/primitives/test/prim_test.c
View File

@@ -80,9 +80,9 @@ void prim_test_setup(BOOL performance)
}
BOOL speed_test(const char* name, const char* dsc, UINT32 iterations, speed_test_fkt generic,
speed_test_fkt optimised, ...)
speed_test_fkt optimized, ...)
{
if (!name || !generic || !optimised || (iterations == 0))
if (!name || !generic || !optimized || (iterations == 0))
return FALSE;
for (UINT32 i = 0; i < iterations; i++)