From 02d7a949d7c503acd8b82790686c728dc1cb9b48 Mon Sep 17 00:00:00 2001
From: barbudreadmon <barbudreadmon@gmail.com>
Date: Mon, 11 Nov 2024 13:28:23 +0100
Subject: [PATCH] (libretro) one last wip

---
 .gitlab-ci.yml                      | 22 ++++++++--------------
 src/burner/libretro/Makefile        | 14 ++++----------
 src/burner/libretro/Makefile.neogeo | 10 +++++++++-
 3 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65eecb3ef..30edbde0d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -217,20 +217,14 @@ libretro-build-tvos-arm64:
 #  variables:
 #    PLATFORM_TARGET: ctr
 
-#libretro-build-neogeo-ctr:
-#  extends:
-#    - .libretro-ctr-static-retroarch-master
-#    - .core-defs
-#  dependencies:
-#    - deps:ctr:neogeo
-#  needs:
-#    - deps:ctr:neogeo
-#    - project: libretro/RetroArch
-#      job: ${STATIC_RETROARCH_JOB_NAME}
-#      ref: ${STATIC_RETROARCH_BRANCH}
-#      artifacts: true
-#  variables:
-#    CORENAME: fbneo_neogeo
+libretro-build-neogeo-ctr:
+  extends:
+    - .libretro-ctr-static-retroarch-master
+    - .core-defs
+  variables:
+    CORENAME: fbneo_neogeo
+  script:
+    - make -C ${MAKEFILE_PATH} platform=${PLATFORM_TARGET} subset=neogeo
 
 # Nintendo WiiU
 #libretro-build-wiiu:
diff --git a/src/burner/libretro/Makefile b/src/burner/libretro/Makefile
index c08c5e8a5..481cc4aa5 100644
--- a/src/burner/libretro/Makefile
+++ b/src/burner/libretro/Makefile
@@ -619,17 +619,12 @@ CTVMAKE_EXE = ctvmake$(EXE_EXT)
 PGM_SPRITE_CREATE_EXE = pgmspritecreate$(EXE_EXT)
 EXE_PREFIX = ./
 
-.PHONY: clean generate-files generate-files-clean clean-objs
+# backward compatibility (make less than 4.4 doesn't support .WAIT)
+.WAIT:
 
-ifeq ($(platform), theos_ios)
-	COMMON_FLAGS := -DIOS -DARM $(COMMON_DEFINES) $(INCFLAGS) -I$(THEOS_INCLUDE_PATH) -Wno-error
-	$(LIBRARY_NAME)_CFLAGS += $(CFLAGS) $(COMMON_FLAGS)
-	$(LIBRARY_NAME)_CXXFLAGS += $(CXXFLAGS) $(COMMON_FLAGS)
-	${LIBRARY_NAME}_FILES = $(SOURCES_CXX) $(SOURCES_C)
-	include $(THEOS_MAKE_PATH)/library.mk
-else
-all: $(TARGET)
+.PHONY: all clean generate-files generate-files-clean clean-objs
 
+all: generate-files clean-objs .WAIT $(TARGET)
 
 generate-files-clean:
 	rm -rf $(FBNEO_GENERATED_DIR)/
@@ -759,4 +754,3 @@ endif
 	rm -f $(M68KMAKE_EXE)
 	rm -f $(PGM_SPRITE_CREATE_EXE)
 	rm -f $(CTVMAKE_EXE)
-endif
diff --git a/src/burner/libretro/Makefile.neogeo b/src/burner/libretro/Makefile.neogeo
index 75aa30e12..f192438af 100644
--- a/src/burner/libretro/Makefile.neogeo
+++ b/src/burner/libretro/Makefile.neogeo
@@ -150,10 +150,12 @@ FBNEO_SRC_DIRS := $(FBNEO_BURNER_DIR) $(FBNEO_BURN_DIRS) $(FBNEO_CPU_DIRS) $(FBN
 ifneq ($(STATIC_LINKING), 1)
 	SOURCES_C += $(LIBRETRO_COMM_DIR)/file/file_path.c \
 		$(LIBRETRO_COMM_DIR)/file/file_path_io.c \
+		$(LIBRETRO_COMM_DIR)/file/retro_dirent.c \
 		$(LIBRETRO_COMM_DIR)/encodings/encoding_utf.c \
 		$(LIBRETRO_COMM_DIR)/compat/compat_posix_string.c \
 		$(LIBRETRO_COMM_DIR)/compat/compat_strcasestr.c \
 		$(LIBRETRO_COMM_DIR)/compat/compat_strl.c \
+		$(LIBRETRO_COMM_DIR)/compat/compat_strldup.c \
 		$(LIBRETRO_COMM_DIR)/compat/fopen_utf8.c \
 		$(LIBRETRO_COMM_DIR)/string/stdstring.c \
 		$(LIBRETRO_COMM_DIR)/streams/file_stream.c \
@@ -320,9 +322,15 @@ SOURCES_CXX += $(LIBRETRO_DIR)/libretro.cpp \
 	$(LIBRETRO_DIR)/retro_cdemu.cpp \
 	$(LIBRETRO_DIR)/retro_common.cpp \
 	$(LIBRETRO_DIR)/retro_input.cpp \
-	$(LIBRETRO_DIR)/retro_memory.cpp
+	$(LIBRETRO_DIR)/retro_memory.cpp \
+	$(LIBRETRO_DIR)/retro_string.cpp \
+	$(LIBRETRO_DIR)/ips_manager.cpp \
+	$(LIBRETRO_DIR)/romdata.cpp
 
 SOURCES_C += $(UGUI_DIR)/ugui.c \
+	$(UGUI_DIR)/ugui_textbox.c \
+	$(UGUI_DIR)/font_8x8.c \
+	$(UGUI_DIR)/SourceHanSansCN_Medium_13X17.c \
 	$(LIBRETRO_DIR)/ugui_tools.c
 
 # Drivers, cpus and devices for this subset