From 00406feed91e4a6b2b398093fee937ee5f5bdfdc Mon Sep 17 00:00:00 2001
From: jdgleaver
Date: Fri, 23 Oct 2020 15:22:56 +0100
Subject: Add build-time option to run the emulator in a thread instead of
 libco (fixes OpenDingux target)

---
 Makefile | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index dd5454b..62554cb 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ FRONTEND_SUPPORTS_RGB565=1
 FORCE_32BIT_ARCH=0
 HAVE_MMAP=0
 HAVE_MMAP_WIN32=0
+USE_LIBCO=1
 
 UNAME=$(shell uname -a)
 
@@ -405,8 +406,8 @@ else ifeq ($(platform), gcw0)
 	AR ?= /opt/gcw0-toolchain/usr/bin/mipsel-linux-ar
 	SHARED := -shared -nostdlib -Wl,--version-script=link.T
 	fpic := -fPIC
-	CFLAGS += $(PTHREAD_FLAGS) -DHAVE_MKDIR
-	CFLAGS += -ffast-math -march=mips32 -mtune=mips32r2 -mhard-float
+	CFLAGS += -fomit-frame-pointer -ffast-math -march=mips32 -mtune=mips32r2 -mhard-float
+	USE_LIBCO = 0
 
 # Windows
 else
@@ -445,6 +446,12 @@ OBJECTS := $(SOURCES_C:.c=.o) $(SOURCES_ASM:.S=.o)
 
 DEFINES := -DHAVE_STRINGS_H -DHAVE_STDINT_H -DHAVE_INTTYPES_H -D__LIBRETRO__ -DINLINE=inline -Wall
 
+ifeq ($(USE_LIBCO), 1)
+DEFINES += -DUSE_LIBCO
+else
+LDFLAGS += -lpthread
+endif
+
 ifeq ($(HAVE_DYNAREC), 1)
 DEFINES += -DHAVE_DYNAREC
 endif
-- 
cgit v1.2.3


From 2b189fe810bc97baf3aa46999bfb731a558de580 Mon Sep 17 00:00:00 2001
From: jdgleaver
Date: Fri, 23 Oct 2020 16:06:15 +0100
Subject: OpenDingux: Fix makefile target

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 62554cb..cad71fa 100644
--- a/Makefile
+++ b/Makefile
@@ -401,9 +401,9 @@ else ifeq ($(platform), emscripten)
 # GCW0
 else ifeq ($(platform), gcw0)
 	TARGET := $(TARGET_NAME)_libretro.so
-	CC ?= /opt/gcw0-toolchain/usr/bin/mipsel-linux-gcc
-	CXX ?= /opt/gcw0-toolchain/usr/bin/mipsel-linux-g++
-	AR ?= /opt/gcw0-toolchain/usr/bin/mipsel-linux-ar
+	CC = /opt/gcw0-toolchain/usr/bin/mipsel-linux-gcc
+	CXX = /opt/gcw0-toolchain/usr/bin/mipsel-linux-g++
+	AR = /opt/gcw0-toolchain/usr/bin/mipsel-linux-ar
 	SHARED := -shared -nostdlib -Wl,--version-script=link.T
 	fpic := -fPIC
 	CFLAGS += -fomit-frame-pointer -ffast-math -march=mips32 -mtune=mips32r2 -mhard-float
-- 
cgit v1.2.3