Allow using custom bannertool and makerom for 3ds, for wav format not…

… found error You can compile the latest version of bannertool for your system and have retroarch build with that instead of the builtin one that fails on windows.
ramccor · Jan 4, 2018 · 2e0eb4d · 2e0eb4d
1 parent c04b555
commit 2e0eb4d
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 16 deletions.
diff --git a/Makefile.ctr b/Makefile.ctr
@@ -176,15 +176,28 @@ STRIP   := $(PREFIX)strip
 NM      := $(PREFIX)nm
 LD      := $(CXX)
 
-ifneq ($(findstring Linux,$(shell uname -a)),)
-	MAKEROM    = pkg/ctr/tools/makerom-linux
-	BANNERTOOL = pkg/ctr/tools/bannertool-linux
-else ifneq ($(findstring Darwin,$(shell uname -a)),)
-	MAKEROM    = pkg/ctr/tools/makerom-mac
-	BANNERTOOL = pkg/ctr/tools/bannertool-mac
+ifeq ($(strip $(CTRBANNERTOOL)),)
+	ifneq ($(findstring Linux,$(shell uname -a)),)
+		BANNERTOOL = pkg/ctr/tools/bannertool-linux
+	else ifneq ($(findstring Darwin,$(shell uname -a)),)
+		BANNERTOOL = pkg/ctr/tools/bannertool-mac
+	else
+		BANNERTOOL = pkg/ctr/tools/bannertool.exe
+	endif
 else
-	MAKEROM    = pkg/ctr/tools/makerom.exe
-	BANNERTOOL = pkg/ctr/tools/bannertool.exe
+	BANNERTOOL = $(CTRBANNERTOOL)
+endif
+
+ifeq ($(strip $(CTRMAKEROM)),)
+	ifneq ($(findstring Linux,$(shell uname -a)),)
+		MAKEROM    = pkg/ctr/tools/makerom-linux
+	else ifneq ($(findstring Darwin,$(shell uname -a)),)
+		MAKEROM    = pkg/ctr/tools/makerom-mac
+	else
+		MAKEROM    = pkg/ctr/tools/makerom.exe
+	endif
+else
+	MAKEROM = $(CTRMAKEROM)
 endif
 
 %.o: %.vsh %.gsh

diff --git a/Makefile.ctr.salamander b/Makefile.ctr.salamander
@@ -122,15 +122,28 @@ STRIP   := $(PREFIX)strip
 NM      := $(PREFIX)nm
 LD      := $(CXX)
 
-ifneq ($(findstring Linux,$(shell uname -a)),)
-	MAKEROM    = pkg/ctr/tools/makerom-linux
-	BANNERTOOL = pkg/ctr/tools/bannertool-linux
-else ifneq ($(findstring Darwin,$(shell uname -a)),)
-	MAKEROM    = pkg/ctr/tools/makerom-mac
-	BANNERTOOL = pkg/ctr/tools/bannertool-mac
+ifeq ($(strip $(CTRBANNERTOOL)),)
+	ifneq ($(findstring Linux,$(shell uname -a)),)
+		BANNERTOOL = pkg/ctr/tools/bannertool-linux
+	else ifneq ($(findstring Darwin,$(shell uname -a)),)
+		BANNERTOOL = pkg/ctr/tools/bannertool-mac
+	else
+		BANNERTOOL = pkg/ctr/tools/bannertool.exe
+	endif
 else
-	MAKEROM    = pkg/ctr/tools/makerom.exe
-	BANNERTOOL = pkg/ctr/tools/bannertool.exe
+	BANNERTOOL = $(CTRBANNERTOOL)
+endif
+
+ifeq ($(strip $(CTRMAKEROM)),)
+	ifneq ($(findstring Linux,$(shell uname -a)),)
+		MAKEROM    = pkg/ctr/tools/makerom-linux
+	else ifneq ($(findstring Darwin,$(shell uname -a)),)
+		MAKEROM    = pkg/ctr/tools/makerom-mac
+	else
+		MAKEROM    = pkg/ctr/tools/makerom.exe
+	endif
+else
+	MAKEROM = $(CTRMAKEROM)
 endif
 
 %.o: %.vsh %.gsh

diff --git a/pkg/ctr/assets/silent.cwav b/pkg/ctr/assets/silent.cwav
diff --git a/retroarch_3ds.3ds b/retroarch_3ds.3ds
diff --git a/retroarch_3ds.bnr b/retroarch_3ds.bnr
diff --git a/retroarch_3ds.cia b/retroarch_3ds.cia
diff --git a/retroarch_3ds.core b/retroarch_3ds.core
@@ -0,0 +1 @@
+0xBAC03
diff --git a/retroarch_3ds.icn b/retroarch_3ds.icn