Quellcode durchsuchen

Fixed various macOS build issues.

woollybah vor 6 Jahren
Ursprung
Commit
830c00332b
4 geänderte Dateien mit 21 neuen und 13 gelöschten Zeilen
  1. 2 0
      sdl.mod/common.bmx
  2. 10 8
      sdl.mod/glue.c
  3. 4 4
      sdl.mod/include/macos/SDL_config.h
  4. 5 1
      sdl.mod/source.bmx

+ 2 - 0
sdl.mod/common.bmx

@@ -30,6 +30,8 @@ Import "source.bmx"
 ?ios
 Import "source.bmx"
 ?osx
+Import "-framework AudioToolbox"
+Import "-framework Metal"
 Import "source.bmx"
 ?linux
 Import "source.bmx"

+ 10 - 8
sdl.mod/glue.c

@@ -33,6 +33,8 @@ int sdl_sdl__sdl_rwops_close(BBObject *);
 
 /* ----------------------------------------------------- */
 
+void bmx_SDL_FreeRW_stream(struct SDL_RWops * ops);
+
 BBString * bmx_SDL_GetError() {
 	return bbStringFromUTF8String(SDL_GetError());
 }
@@ -51,7 +53,7 @@ size_t bmx_SDL_RWops_write(struct SDL_RWops * context, const void *ptr, size_t s
 }
 
 int bmx_SDL_RWops_close(struct SDL_RWops *context) {
-	sdl_sdl__sdl_rwops_close(context->hidden.unknown.data1);
+	sdl_sdl__sdl_rwops_close((BBObject * )context->hidden.unknown.data1);
 	bmx_SDL_FreeRW_stream(context);
 	return 0;
 }
@@ -74,7 +76,7 @@ SDL_RWops * bmx_SDL_AllocRW_stream(BBObject * stream) {
 	return ops;
 }
 
-void bmx_SDL_FreeRW_stream(SDL_RWops * ops) {
+void bmx_SDL_FreeRW_stream(struct SDL_RWops * ops) {
 	if (ops) {
 		BBRELEASE(ops->hidden.unknown.data1);
 		
@@ -86,27 +88,27 @@ BBString * bmx_SDL_GetPlatform() {
 	return bbStringFromUTF8String(SDL_GetPlatform());
 }
 
-BBLONG bmx_SDL_RWsize(SDL_RWops* context) {
+BBLONG bmx_SDL_RWsize(struct SDL_RWops* context) {
 	return SDL_RWsize(context);
 }
 
-BBLONG bmx_SDL_RWseek(SDL_RWops* context, BBLONG offset, int whence) {
+BBLONG bmx_SDL_RWseek(struct SDL_RWops* context, BBLONG offset, int whence) {
 	return SDL_RWseek(context, offset, whence);
 }
 
-BBLONG bmx_SDL_RWtell(SDL_RWops* context) {
+BBLONG bmx_SDL_RWtell(struct SDL_RWops* context) {
 	return SDL_RWtell(context);
 }
 
-BBLONG bmx_SDL_RWread(SDL_RWops* context, void * ptr, BBLONG size, BBLONG maxnum) {
+BBLONG bmx_SDL_RWread(struct SDL_RWops* context, void * ptr, BBLONG size, BBLONG maxnum) {
 	return SDL_RWread(context, ptr, size, maxnum);
 }
 
-BBLONG bmx_SDL_RWwrite(SDL_RWops* context, const void* ptr, BBLONG size, BBLONG num) {
+BBLONG bmx_SDL_RWwrite(struct SDL_RWops* context, const void* ptr, BBLONG size, BBLONG num) {
 	return SDL_RWwrite(context, ptr, size, num);
 }
 
-int bmx_SDL_RWclose(SDL_RWops* context) {
+int bmx_SDL_RWclose(struct SDL_RWops* context) {
 	return SDL_RWclose(context);
 }
 

+ 4 - 4
sdl.mod/include/macos/SDL_config.h

@@ -188,7 +188,7 @@
 #endif
 
 #ifndef SDL_VIDEO_RENDER_OGL_ES2
-#define SDL_VIDEO_RENDER_OGL_ES2 1
+#define SDL_VIDEO_RENDER_OGL_ES2 0
 #endif
 
 #ifndef SDL_VIDEO_RENDER_METAL
@@ -205,10 +205,10 @@
 #define SDL_VIDEO_OPENGL    1
 #endif
 #ifndef SDL_VIDEO_OPENGL_ES2
-#define SDL_VIDEO_OPENGL_ES2    1
+#define SDL_VIDEO_OPENGL_ES2    0
 #endif
 #ifndef SDL_VIDEO_OPENGL_EGL
-#define SDL_VIDEO_OPENGL_EGL    1
+#define SDL_VIDEO_OPENGL_EGL    0
 #endif
 #ifndef SDL_VIDEO_OPENGL_CGL
 #define SDL_VIDEO_OPENGL_CGL    1
@@ -220,7 +220,7 @@
 /* Enable Vulkan support */
 /* Metal/MoltenVK/Vulkan only supported on 64-bit architectures with 10.11+ */
 #if TARGET_CPU_X86_64 && (MAC_OS_X_VERSION_MAX_ALLOWED >= 101100)
-#define SDL_VIDEO_VULKAN 1
+#define SDL_VIDEO_VULKAN 0
 #else
 #define SDL_VIDEO_VULKAN 0
 #endif

+ 5 - 1
sdl.mod/source.bmx

@@ -270,7 +270,8 @@ Import "SDL/src/video/uikit/SDL_uikitwindow.m"
 
 ?osx
 
-Import "SDL/src/audio/coreaudio/SDL_coreaudio.c"
+Import "SDL/src/hidapi/hidapi/*.h"
+Import "SDL/src/audio/coreaudio/SDL_coreaudio.m"
 Import "SDL/src/file/cocoa/SDL_rwopsbundlesupport.m"
 Import "SDL/src/filesystem/cocoa/SDL_sysfilesystem.m"
 Import "SDL/src/haptic/darwin/SDL_syshaptic.c"
@@ -278,6 +279,7 @@ Import "SDL/src/hidapi/mac/hid.c"
 Import "SDL/src/joystick/darwin/SDL_sysjoystick.c"
 Import "SDL/src/loadso/dlopen/SDL_sysloadso.c"
 Import "SDL/src/power/macosx/SDL_syspower.c"
+Import "SDL/src/render/metal/SDL_render_metal.m"
 Import "SDL/src/render/opengl/SDL_render_gl.c"
 Import "SDL/src/render/opengl/SDL_shaders_gl.c"
 Import "SDL/src/sensor/dummy/SDL_dummysensor.c"
@@ -291,10 +293,12 @@ Import "SDL/src/video/cocoa/SDL_cocoaclipboard.m"
 Import "SDL/src/video/cocoa/SDL_cocoaevents.m"
 Import "SDL/src/video/cocoa/SDL_cocoakeyboard.m"
 Import "SDL/src/video/cocoa/SDL_cocoamessagebox.m"
+Import "SDL/src/video/cocoa/SDL_cocoametalview.m"
 Import "SDL/src/video/cocoa/SDL_cocoamodes.m"
 Import "SDL/src/video/cocoa/SDL_cocoamouse.m"
 Import "SDL/src/video/cocoa/SDL_cocoamousetap.m"
 Import "SDL/src/video/cocoa/SDL_cocoaopengl.m"
+Import "SDL/src/video/cocoa/SDL_cocoaopengles.m"
 Import "SDL/src/video/cocoa/SDL_cocoashape.m"
 Import "SDL/src/video/cocoa/SDL_cocoavideo.m"
 Import "SDL/src/video/cocoa/SDL_cocoawindow.m"