From 730dfd9e61aba109720c5618936c74c9e45a917a Mon Sep 17 00:00:00 2001
From: ChestnutYueyue <952134128@qq.com>
Date: Mon, 9 Feb 2026 12:54:20 +0800
Subject: [PATCH] =?UTF-8?q?refactor(xmake.lua):=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=BA=93=E9=93=BE=E6=8E=A5=E9=A1=BA=E5=BA=8F=E4=BB=A5=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E5=A4=84=E7=90=86=E4=BE=9D=E8=B5=96=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

根据库之间的依赖链重新排列链接顺序，确保被依赖的库放在后面。主要调整了 GLESv2、EGL、glapi 和 drm_nouveau 的位置，使其符合 SDL2 -> EGL -> drm_nouveau 和 GLESv2 -> glapi -> drm_nouveau 的依赖关系
---
 xmake.lua | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/xmake.lua b/xmake.lua
index b87840c..6ce899f 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -95,11 +95,16 @@ target("extra2d")
     -- 使用系统 GLES3.2 头文件 (位于 devkitPro/portlibs/switch/include)
 
     -- 链接 EGL、OpenGL ES 3.0（mesa）和 SDL2 音频
-    -- 注意：链接顺序很重要！SDL2 必须在 SDL2_mixer 之后
-    add_syslinks("GLESv2", "EGL", "glapi", "drm_nouveau", 
-                 "SDL2_mixer", "SDL2",
+    -- 注意：链接顺序很重要！被依赖的库必须放在后面
+    -- 依赖链：SDL2 -> EGL -> drm_nouveau
+    --          GLESv2 -> glapi -> drm_nouveau
+    add_syslinks("SDL2_mixer", "SDL2",
                  "opusfile", "opus", "vorbisidec", "ogg",
                  "modplug", "mpg123", "FLAC",
+                 "GLESv2",
+                 "EGL",
+                 "glapi",
+                 "drm_nouveau",
                  {public = true})
 
     -- 注意：pfd (portable-file-dialogs) 暂时禁用，需要进一步修复
@@ -154,11 +159,16 @@ target("switch_audio_demo")
     set_targetdir("$(builddir)/switch")
     
     -- 链接 EGL、OpenGL ES 3.0 和 SDL2 音频库
-    -- 注意：链接顺序很重要！SDL2 必须在 SDL2_mixer 之后
-    add_syslinks("GLESv2", "EGL", "glapi", "drm_nouveau", 
-                 "SDL2_mixer", "SDL2",
+    -- 注意：链接顺序很重要！被依赖的库必须放在后面
+    -- 依赖链：SDL2 -> EGL -> drm_nouveau
+    --          GLESv2 -> glapi -> drm_nouveau
+    add_syslinks("SDL2_mixer", "SDL2",
                  "opusfile", "opus", "vorbisidec", "ogg",
-                 "modplug", "mpg123", "FLAC")
+                 "modplug", "mpg123", "FLAC",
+                 "GLESv2",
+                 "EGL",
+                 "glapi",
+                 "drm_nouveau")
 
     local appTitle = "Extra2D Switch Audio Demo"
     local appAuthor = "Extra2D Switch Audio Demo"