소스 검색

Updates for rpi.

Brucey 5 년 전
부모
커밋
59ef1173eb
4개의 변경된 파일30개의 추가작업 그리고 13개의 파일을 삭제
  1. 18 13
      sdl.mod/include/raspberrypi/SDL_config.h
  2. 10 0
      sdl.mod/linux_source.bmx
  3. 1 0
      sdl.mod/sdl.bmx
  4. 1 0
      sdlgraphics.mod/sdlgraphics.bmx

+ 18 - 13
sdl.mod/include/raspberrypi/SDL_config.h

@@ -100,7 +100,10 @@
 #define HAVE_WCSLEN 1
 /* #undef HAVE_WCSLCPY */
 /* #undef HAVE_WCSLCAT */
+#define HAVE_WCSDUP 1
+#define HAVE_WCSSTR 1
 #define HAVE_WCSCMP 1
+#define HAVE_WCSNCMP 1
 #define HAVE_STRLEN 1
 /* #undef HAVE_STRLCPY */
 /* #undef HAVE_STRLCAT */
@@ -112,6 +115,7 @@
 #define HAVE_STRCHR 1
 #define HAVE_STRRCHR 1
 #define HAVE_STRSTR 1
+#define HAVE_STRTOK_R 1
 /* #undef HAVE_ITOA */
 /* #undef HAVE__LTOA */
 /* #undef HAVE__UITOA */
@@ -200,7 +204,7 @@
 
 /* #undef HAVE_ALTIVEC_H */
 #define HAVE_DBUS_DBUS_H 1
-/* #undef HAVE_FCITX_FRONTEND_H */
+#define HAVE_FCITX 1
 /* #undef HAVE_IBUS_IBUS_H */
 /* #undef HAVE_IMMINTRIN_H */
 /* #undef HAVE_LIBSAMPLERATE_H */
@@ -286,6 +290,7 @@
 /* #undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H */
 /* #undef SDL_JOYSTICK_HIDAPI */
 /* #undef SDL_JOYSTICK_EMSCRIPTEN */
+#define SDL_JOYSTICK_VIRTUAL 1
 /* #undef SDL_HAPTIC_DUMMY */
 /* #undef SDL_HAPTIC_ANDROID */
 #define SDL_HAPTIC_LINUX 1
@@ -329,9 +334,9 @@
 /* #undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON */
 #define SDL_VIDEO_DRIVER_X11 1
 /* #undef SDL_VIDEO_DRIVER_RPI */
-/* #undef SDL_VIDEO_DRIVER_KMSDRM */
-/* #undef SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC */
-/* #undef SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC_GBM */
+#define SDL_VIDEO_DRIVER_KMSDRM 1
+#define SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC "libdrm.so.2"
+#define SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC_GBM "libgbm.so.1"
 /* #undef SDL_VIDEO_DRIVER_ANDROID */
 /* #undef SDL_VIDEO_DRIVER_EMSCRIPTEN */
 #define SDL_VIDEO_DRIVER_X11_DYNAMIC "libX11.so.6"
@@ -361,20 +366,20 @@
 
 /* #undef SDL_VIDEO_RENDER_D3D */
 /* #undef SDL_VIDEO_RENDER_D3D11 */
-#define SDL_VIDEO_RENDER_OGL 1
-/* #undef SDL_VIDEO_RENDER_OGL_ES */
-/*#define SDL_VIDEO_RENDER_OGL_ES2 1*/
+/* #define SDL_VIDEO_RENDER_OGL 1 */
+#define SDL_VIDEO_RENDER_OGL_ES 1
+#define SDL_VIDEO_RENDER_OGL_ES2 1
 /* #undef SDL_VIDEO_RENDER_DIRECTFB */
 /* #undef SDL_VIDEO_RENDER_METAL */
 
 /* Enable OpenGL support */
-#define SDL_VIDEO_OPENGL 1
-/* #undef SDL_VIDEO_OPENGL_ES */
-/*#define SDL_VIDEO_OPENGL_ES2 1*/
+/* #define SDL_VIDEO_OPENGL 1 */
+#define SDL_VIDEO_OPENGL_ES 1
+#define SDL_VIDEO_OPENGL_ES2 1
 /* #undef SDL_VIDEO_OPENGL_BGL */
 /* #undef SDL_VIDEO_OPENGL_CGL */
 #define SDL_VIDEO_OPENGL_EGL 1
-#define SDL_VIDEO_OPENGL_GLX 1
+/* #define SDL_VIDEO_OPENGL_GLX 1 */
 /* #undef SDL_VIDEO_OPENGL_WGL */
 /* #undef SDL_VIDEO_OPENGL_OSMESA */
 /* #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC */
@@ -382,7 +387,7 @@
 /* Enable Vulkan support */
 /*#define SDL_VIDEO_VULKAN 1*/
 /* Enable Metal support */
-#undef SDL_VIDEO_METAL
+/* #undef SDL_VIDEO_METAL */
 
 /* Enable system power support */
 #define SDL_POWER_LINUX 1
@@ -415,7 +420,7 @@
 /* Enable dynamic udev support */
 #define SDL_UDEV_DYNAMIC "libudev.so.1"
 /* Enable dynamic libusb support */
-#undef SDL_LIBUSB_DYNAMIC
+/* #undef SDL_LIBUSB_DYNAMIC */
 
 /* Enable dynamic libsamplerate support */
 /* #undef SDL_LIBSAMPLERATE_DYNAMIC */

+ 10 - 0
sdl.mod/linux_source.bmx

@@ -70,6 +70,16 @@ Import "SDL/src/video/x11/imKStoUCS.c"
 Import "SDL/src/audio/esd/SDL_esdaudio.c"
 Import "SDL/src/audio/pulseaudio/SDL_pulseaudio.c"
 ?raspberrypi
+Import "SDL/src/core/linux/SDL_fcitx.c"
+Import "SDL/src/core/linux/SDL_evdev_kbd.c"
+Import "SDL/src/render/opengles/SDL_render_gles.c"
+Import "SDL/src/render/opengles2/SDL_render_gles2.c"
+Import "SDL/src/render/opengles2/SDL_shaders_gles2.c"
+Import "SDL/src/video/kmsdrm/SDL_kmsdrmdyn.c"
+Import "SDL/src/video/kmsdrm/SDL_kmsdrmevents.c"
+Import "SDL/src/video/kmsdrm/SDL_kmsdrmmouse.c"
+Import "SDL/src/video/kmsdrm/SDL_kmsdrmopengles.c"
+Import "SDL/src/video/kmsdrm/SDL_kmsdrmvideo.c"
 Import "SDL/src/video/raspberry/SDL_rpievents.c"
 Import "SDL/src/video/raspberry/SDL_rpimouse.c"
 Import "SDL/src/video/raspberry/SDL_rpiopengles.c"

+ 1 - 0
sdl.mod/sdl.bmx

@@ -69,6 +69,7 @@ Import "include/linuxx64/*.h"
 ?raspberrypi
 ModuleInfo "LD_OPTS: -L%PWD%/lib/raspberrypi"
 ModuleInfo "CC_OPTS: -I/usr/include/dbus-1.0 -I/usr/lib/arm-linux-gnueabihf/dbus-1.0/include/"
+ModuleInfo "CC_OPTS: -I/usr/include/libdrm"
 
 Import "include/raspberrypi/*.h"
 ?android

+ 1 - 0
sdlgraphics.mod/sdlgraphics.bmx

@@ -27,6 +27,7 @@ Module SDL.SDLGraphics
 ModuleInfo "CC_OPTS: -D__RASPBERRYPI__"
 ModuleInfo "CC_OPTS: -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads"
 ModuleInfo "LD_OPTS: -L/opt/vc/lib"
+ModuleInfo "LD_OPTS: -L/usr/lib/arm-linux-gnueabihf"
 
 Import "-lvcos"
 Import "-lvchostif"