Update sdl-files.xml

openfl · Oct 26, 2024 · 2da8fef · 2da8fef
1 parent 9d2a6c8
commit 2da8fef
Showing 1 changed file with 12 additions and 15 deletions.
diff --git a/project/lib/sdl-files.xml b/project/lib/sdl-files.xml
@@ -101,7 +101,7 @@
         <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/src/hidapi/hidapi/" />
         <compilerflag value="-I${SDL_CONFIG_PATH}" if="SDL_CONFIG_PATH" />
 
-        <compilerflag value="-DGL_GLEXT_PROTOTYPES" if="android || linux HXCPP_ARM64 || rpi" />
+        <compilerflag value="-DGL_GLEXT_PROTOTYPES" if="android || linux" />
         <compilerflag value="-DHAVE_LIBC" />
 
         <compilerflag value="-D__IPHONEOS__" if="ios || tvos" />
@@ -289,7 +289,7 @@
 
         </section>
 
-        <section if="android || ios || tvos || HXCPP_ARM64">
+        <section if="android || ios || linux || windows || mac || tvos">
 
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/opengles/SDL_render_gles.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/opengles2/SDL_render_gles2.c" />
@@ -298,7 +298,7 @@
 
         </section>
 
-        <section if="windows || mac || android || rpi">
+        <section if="LIBSDL_HIDAPI">
 
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_gamecube.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_luna.c" />
@@ -352,15 +352,6 @@
 
         </section>
 
-        <section if="LIBSDL_RPI || rpi">
-
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/raspberry/SDL_rpievents.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/raspberry/SDL_rpimouse.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/raspberry/SDL_rpiopengles.c" />
-            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/raspberry/SDL_rpivideo.c" />
-
-        </section>
-
         <section if="LIBSDL_PSP">
 
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/psp/SDL_pspaudio.c" />
@@ -388,9 +379,6 @@
                 <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/kmsdrm/SDL_kmsdrmmouse.c" />
                 <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/kmsdrm/SDL_kmsdrmdyn.c" />
                 <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/kmsdrm/SDL_kmsdrmvideo.c" />
-
-                <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/linux/SDL_fcitx.c" if="rpi" />
-                <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/x11/SDL_x11xfixes.c" if="rpi" />
             </section>
 
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/alsa/SDL_alsa_audio.c" />
@@ -618,6 +606,15 @@
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/emscripten/SDL_emscriptenopengles.c" />
             <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/emscripten/SDL_emscriptenvideo.c" />
         </section>
+
+        <section if="rpi">
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/raspberry/SDL_rpievents.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/raspberry/SDL_rpimouse.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/raspberry/SDL_rpiopengles.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/raspberry/SDL_rpivideo.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/linux/SDL_fcitx.c" />
+            <file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/x11/SDL_x11xfixes.c" />
+        </section>
 
     </files>