strips/padlab
2
0
Fork 0
mirror of https://github.com/GayPizzaSpecifications/padlab.git synced 2026-05-07 12:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

complete SDL3 transition

Browse Source
This commit is contained in:
a dinosaur
2024-12-18 21:56:18 +11:00
parent ed0cfcc895
commit f0c2b5660d
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/MetalHelper.cmake
View File

@@ -1,4 +1,4 @@
include(CMakeParseArguments) # 3.4 and lower compatibility
include(CMakeParseArguments) # 3.4 and lower compatibility
function (_xrun_find_program OUTPUT NAME)
find_program(XCRUN_EXECUTABLE xcrun REQUIRED)

2
src/CMakeLists.txt
View File

@@ -21,7 +21,7 @@ function (common_setup _TARGET)
if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
get_property(SDL3_IMPORTED_LOCATION TARGET SDL3::SDL3 PROPERTY IMPORTED_LOCATION)
if (SDL3_IMPORTED_LOCATION MATCHES "^/Library/Frameworks/")
target_link_options(${_TARGET} PRIVATE -Wl,-rpath,/Library/Frameworks)
set_property(TARGET ${_TARGET} PROPERTY BUILD_RPATH "/Library/Frameworks")
endif()
endif()
endfunction()

2
src/analogue.c
View File

@@ -144,7 +144,7 @@ int SDL_AppEvent(const SDL_Event* event)
return 0;
case (SDL_EVENT_MOUSE_BUTTON_DOWN):
if (SDL_BUTTON(event->button.button) & (SDL_BUTTON_LMASK | SDL_BUTTON_RMASK))
if (SDL_BUTTON_MASK(event->button.button) & (SDL_BUTTON_LMASK | SDL_BUTTON_RMASK))
side = (event->button.x > winw / 2) ? 1 : 0;
return 0;

6
src/draw.c
View File

@@ -1,6 +1,6 @@
#include "draw.h"
#include "maths.h"
#include <SDL_render.h>
#include <SDL3/SDL_render.h>
#include <stdlib.h>
@@ -10,8 +10,8 @@ void DrawWindowHints(void) {}
int InitDraw(SDL_Window* window)
{
const int rendflags = SDL_RENDERER_PRESENTVSYNC;
rend = SDL_CreateRenderer(window, NULL, rendflags);
rend = SDL_CreateRenderer(window, NULL);
SDL_SetRenderVSync(rend, 1);
return (rend == NULL) ? -1 : 0;
}

8
src/gl/draw_opengl.c
View File

@@ -1,12 +1,12 @@
#include "draw.h"
#include "maths.h"
#include <SDL_video.h>
#include <SDL_opengl.h>
#include <SDL3/SDL_video.h>
#include <SDL3/SDL_opengl.h>
#include <stdlib.h>
#include <stdbool.h>
static SDL_GLContext* ctx = NULL;
static SDL_GLContext ctx = NULL;
static SDL_Window* window = NULL;
static uint32_t colour = 0x00000000;
static uint32_t clrColour = 0x00000000;
@@ -62,7 +62,7 @@ int InitDraw(SDL_Window* w)
void QuitDraw(void)
{
SDL_GL_DeleteContext(ctx);
SDL_GL_DestroyContext(ctx);
ctx = NULL;
window = NULL;
}

8
src/glcore/draw_opengl_core.c
View File

@@ -2,7 +2,7 @@
#include "glslShaders.h"
#include "maths.h"
#include <GL/gl3w.h>
#include <SDL_video.h>
#include <SDL3/SDL_video.h>
#include <stdbool.h>
#include <stdlib.h>
#include <stdio.h>
@@ -20,7 +20,7 @@ static const char* const attribNames[] =
#define OPENGL_VERSION_MAJOR 3
#define OPENGL_VERSION_MINOR 3
static SDL_GLContext* ctx = NULL;
static SDL_GLContext ctx = NULL;
static SDL_Window* window = NULL;
static uint32_t
colour = 0x00000000,
@@ -133,7 +133,7 @@ int InitDraw(SDL_Window* _window)
{
window = _window;
ctx = SDL_GL_CreateContext(window);
if (ctx == NULL || window == NULL || SDL_GL_MakeCurrent(window, ctx))
if (ctx == NULL || window == NULL || !SDL_GL_MakeCurrent(window, ctx))
{
fprintf(stderr, "%s\n", SDL_GetError());
return -1;
@@ -259,7 +259,7 @@ void QuitDraw(void)
}
SDL_GL_MakeCurrent(window, NULL);
SDL_GL_DeleteContext(ctx);
SDL_GL_DestroyContext(ctx);
ctx = NULL;
window = NULL;
}