diff --git a/.github/workflows/switch.yml b/.github/workflows/switch.yml index f745e236e4..f83b1711a5 100644 --- a/.github/workflows/switch.yml +++ b/.github/workflows/switch.yml @@ -25,7 +25,9 @@ jobs: wget https://github.com/devkitPro/pacman-packages/raw/master/switch/glu/LICENSE dkp-pacman -S dkp-meson-scripts --noconfirm --needed sudo -E -u builduser bash -c 'sudo chmod 777 . -R && dkp-makepkg -o --noconfirm' - sed -i "/value : 'glvnd'/c\ value : 'egl'," src/glu-9.0.3/meson_options.txt + sed -i "/value : 'glvnd'/c\ value : 'SDL2'," src/glu-9.0.3/meson_options.txt + sed -i "/choices : ['glvnd'/choices : ['SDL2'" src/glu-9.0.3/meson_options.txt + cat src/glu-9.0.3/meson_options.txt sudo -E -u builduser bash -c 'dkp-makepkg -s -i --noconfirm' rsync -a ./pkg/switch-glu/opt/devkitpro/ /opt/devkitpro/ - name: Checkout repo diff --git a/Makefile b/Makefile index 765e23177e..f3bc411744 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,7 @@ REQUIRED_LIBS = glu libcurl sdl2 SDL2_mixer zlib libpng glapi SDL2_gfx egl CFLAGS += $(shell $(PKGCONFIG) --cflags $(REQUIRED_LIBS)) LIBS += $(shell $(PKGCONFIG) --libs $(REQUIRED_LIBS)) INCLUDES += -I$(LIBNX)/include -I$(PORTLIBS)/include -I$(PORTLIBS)/include/SDL2 -I$(PORTLIBS)/include/GLAD -I$(PORTLIBS)/include/GLFW -I$(PORTLIBS)/include/GL -LDFLAGS += -lnx -lnxd -lSDL2 +LDFLAGS += -lnx -lnxd ifeq ($(STATIC),1) CFLAGS += -static