From 5d165e6ef6b5cd79c1b8b20fbdf716d73fbebd1b Mon Sep 17 00:00:00 2001
From: neonloop
Date: Tue, 10 Aug 2021 17:31:51 +0000
Subject: Renames core patch files

First numbers for upstreamable patches. Later numbers for
picoarch-specific patches.
---
 patches/gambatte/0001-trimui-build.patch | 50 --------------------------------
 patches/gambatte/1000-trimui-build.patch | 50 ++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 50 deletions(-)
 delete mode 100644 patches/gambatte/0001-trimui-build.patch
 create mode 100644 patches/gambatte/1000-trimui-build.patch

(limited to 'patches/gambatte')

diff --git a/patches/gambatte/0001-trimui-build.patch b/patches/gambatte/0001-trimui-build.patch
deleted file mode 100644
index 9beb11b..0000000
--- a/patches/gambatte/0001-trimui-build.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/Makefile.libretro b/Makefile.libretro
-index f41fcc2..50a1134 100644
---- a/Makefile.libretro
-+++ b/Makefile.libretro
-@@ -368,6 +368,21 @@ else ifeq ($(platform), gcw0)
-    CFLAGS += -fomit-frame-pointer -ffast-math -march=mips32 -mtune=mips32r2 -mhard-float
-    CXXFLAGS += $(CFLAGS)
- 
-+# Trimui
-+else ifeq ($(platform), trimui)
-+	TARGET := $(TARGET_NAME)_libretro.so
-+	CC = $(CROSS_COMPILE)gcc
-+	CXX = $(CROSS_COMPILE)g++
-+	AR = $(CROSS_COMPILE)ar
-+	SHARED := -shared -Wl,--version-script=$(version_script)
-+	LDFLAGS += -fno-PIC -flto
-+	PLATFORM_DEFINES := -DCC_RESAMPLER -DCC_RESAMPLER_NO_HIGHPASS
-+	CFLAGS += -fomit-frame-pointer -ffast-math -mcpu=arm926ej-s -mtune=arm926ej-s -fno-PIC -flto
-+	OPTIMIZE := -Ofast -DNDEBUG
-+	ifeq (,$(DEBUG))
-+		LDFLAGS += -s
-+	endif
-+
- # RETROFW
- else ifeq ($(platform), retrofw)
-    TARGET := $(TARGET_NAME)_libretro.so
-@@ -622,10 +637,23 @@ ifneq (,$(findstring msvc,$(platform)))
-    CFLAGS   += -MT
-    CXXFLAGS += -MT
- endif
-+ifneq (,$(OPTIMIZE))
-+	CFLAGS += $(OPTIMIZE)
-+	CXXFLAGS += $(OPTIMIZE)
-+else
-    CFLAGS   += -O2 -DNDEBUG
-    CXXFLAGS += -O2 -DNDEBUG
- endif
- 
-+endif
-+
-+ifeq ($(PROFILE), GENERATE)
-+	CFLAGS	+= -fprofile-generate=./profile/gambatte
-+	LDFLAGS	+= -lgcov
-+else ifeq ($(PROFILE), APPLY)
-+	CFLAGS	+= -fprofile-use -fprofile-dir=../profile/gambatte -fbranch-probabilities
-+endif
-+
- ifeq (,$(findstring msvc,$(platform)))
- CXXFLAGS += -fno-exceptions -fno-rtti
- CXXFLAGS += -std=c++98
diff --git a/patches/gambatte/1000-trimui-build.patch b/patches/gambatte/1000-trimui-build.patch
new file mode 100644
index 0000000..9beb11b
--- /dev/null
+++ b/patches/gambatte/1000-trimui-build.patch
@@ -0,0 +1,50 @@
+diff --git a/Makefile.libretro b/Makefile.libretro
+index f41fcc2..50a1134 100644
+--- a/Makefile.libretro
++++ b/Makefile.libretro
+@@ -368,6 +368,21 @@ else ifeq ($(platform), gcw0)
+    CFLAGS += -fomit-frame-pointer -ffast-math -march=mips32 -mtune=mips32r2 -mhard-float
+    CXXFLAGS += $(CFLAGS)
+ 
++# Trimui
++else ifeq ($(platform), trimui)
++	TARGET := $(TARGET_NAME)_libretro.so
++	CC = $(CROSS_COMPILE)gcc
++	CXX = $(CROSS_COMPILE)g++
++	AR = $(CROSS_COMPILE)ar
++	SHARED := -shared -Wl,--version-script=$(version_script)
++	LDFLAGS += -fno-PIC -flto
++	PLATFORM_DEFINES := -DCC_RESAMPLER -DCC_RESAMPLER_NO_HIGHPASS
++	CFLAGS += -fomit-frame-pointer -ffast-math -mcpu=arm926ej-s -mtune=arm926ej-s -fno-PIC -flto
++	OPTIMIZE := -Ofast -DNDEBUG
++	ifeq (,$(DEBUG))
++		LDFLAGS += -s
++	endif
++
+ # RETROFW
+ else ifeq ($(platform), retrofw)
+    TARGET := $(TARGET_NAME)_libretro.so
+@@ -622,10 +637,23 @@ ifneq (,$(findstring msvc,$(platform)))
+    CFLAGS   += -MT
+    CXXFLAGS += -MT
+ endif
++ifneq (,$(OPTIMIZE))
++	CFLAGS += $(OPTIMIZE)
++	CXXFLAGS += $(OPTIMIZE)
++else
+    CFLAGS   += -O2 -DNDEBUG
+    CXXFLAGS += -O2 -DNDEBUG
+ endif
+ 
++endif
++
++ifeq ($(PROFILE), GENERATE)
++	CFLAGS	+= -fprofile-generate=./profile/gambatte
++	LDFLAGS	+= -lgcov
++else ifeq ($(PROFILE), APPLY)
++	CFLAGS	+= -fprofile-use -fprofile-dir=../profile/gambatte -fbranch-probabilities
++endif
++
+ ifeq (,$(findstring msvc,$(platform)))
+ CXXFLAGS += -fno-exceptions -fno-rtti
+ CXXFLAGS += -std=c++98
-- 
cgit v1.2.3