From a5b8483100bde6048f53dc0d638d1756e374f315 Mon Sep 17 00:00:00 2001 From: MysterD Date: Sun, 8 Aug 2021 16:50:44 -0700 Subject: [PATCH] Removed SDL2 API calls from SDL1 backend --- developer/flags.sh | 22 ++++++++++++---------- src/pc/gfx/gfx_sdl1.c | 8 ++++---- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/developer/flags.sh b/developer/flags.sh index c41dde64..3014bb3a 100644 --- a/developer/flags.sh +++ b/developer/flags.sh @@ -3,8 +3,8 @@ set -e function compiler() { make clean - make RENDER_API=$1 WINDOW_API=$2 AUDIO_API=$3 CONTROLLER_API=$4 - mv ./build ./build_$5 + make RENDER_API=$1 WINDOW_API=$2 AUDIO_API=$3 CONTROLLER_API=$4 TARGET_BITS=$5 + mv ./build ./build_$6 } function compiler_no_discord() { @@ -13,14 +13,16 @@ function compiler_no_discord() { mv ./build ./build_no_discord } -compiler GL_LEGACY SDL1 SDL1 SDL1 legacy_1 -compiler GL SDL1 SDL1 SDL1 gl_1 -compiler D3D11 DXGI SDL1 SDL1 d3d11_1 -compiler D3D12 DXGI SDL1 SDL1 d3d12_1 +compiler GL_LEGACY SDL1 SDL1 SDL1 64 legacy_1 +#compiler GL SDL1 SDL1 SDL1 64 gl_1 +#compiler D3D11 DXGI SDL1 SDL1 64 d3d11_1 +#compiler D3D12 DXGI SDL1 SDL1 64 d3d12_1 -compiler GL_LEGACY SDL2 SDL2 SDL2 legacy_2 -compiler GL SDL2 SDL2 SDL2 gl_2 -compiler D3D11 DXGI SDL2 SDL2 d3d11_2 -compiler D3D12 DXGI SDL2 SDL2 d3d12_2 +compiler GL_LEGACY SDL2 SDL2 SDL2 64 legacy_2 +compiler GL SDL2 SDL2 SDL2 64 gl_2 +compiler D3D11 DXGI SDL2 SDL2 64 d3d11_2 +compiler D3D12 DXGI SDL2 SDL2 64 d3d12_2 + +compiler GL SDL2 SDL2 SDL2 32 gl_2_32 compiler_no_discord diff --git a/src/pc/gfx/gfx_sdl1.c b/src/pc/gfx/gfx_sdl1.c index d4dbded5..436ae729 100644 --- a/src/pc/gfx/gfx_sdl1.c +++ b/src/pc/gfx/gfx_sdl1.c @@ -266,10 +266,10 @@ static void gfx_sdl_shutdown(void) { SDL_Quit(); } -static void gfx_sdl_start_text_input(void) { SDL_StartTextInput(); } -static void gfx_sdl_stop_text_input(void) { SDL_StopTextInput(); } -static char* gfx_sdl_get_clipboard_text(void) { return SDL_GetClipboardText(); } -static void gfx_sdl_set_clipboard_text(char* text) { SDL_SetClipboardText(text); } +static void gfx_sdl_start_text_input(void) { return; } +static void gfx_sdl_stop_text_input(void) { return; } +static char* gfx_sdl_get_clipboard_text(void) { return NULL; } +static void gfx_sdl_set_clipboard_text(char* text) { return; } static void gfx_sdl_set_cursor_visible(bool visible) { SDL_ShowCursor(visible ? SDL_ENABLE : SDL_DISABLE); } struct GfxWindowManagerAPI gfx_sdl = {