From ca9dd899755eecd1830de41f9112f3c6005bc4d3 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 22 Apr 2018 12:02:40 +0200
Subject: [PATCH] Revert "(3DS/Emscripten/Vita/Wiiu) Add HAVE_CHD support"

This reverts commit d4c691527a844bcc15a166ce8077550f65448e4e.
---
 Makefile.ctr        | 2 --
 Makefile.emscripten | 1 -
 Makefile.vita       | 2 --
 Makefile.wiiu       | 2 --
 4 files changed, 7 deletions(-)

diff --git a/Makefile.ctr b/Makefile.ctr
index 40b3cf160b9..d47cc66c257 100644
--- a/Makefile.ctr
+++ b/Makefile.ctr
@@ -47,11 +47,9 @@ ifeq ($(GRIFFIN_BUILD), 1)
 	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB -DHAVE_CC_RESAMPLER
 	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB
 	DEFINES += -DHAVE_NETWORKING -DHAVE_CHEEVOS -DHAVE_SOCKET_LEGACY -DHAVE_THREADS
-	DEFINES += -DHAVE_CHD
 	#-DHAVE_SSL -DMBEDTLS_SSL_DEBUG_ALL
 	#ssl is currently incompatible with griffin due to use of the "static" flag on repeating functions that will conflict when included in one file
 else
-	HAVE_CHD = 1
 	HAVE_CC_RESAMPLER = 1
 	HAVE_MENU_COMMON = 1
 	HAVE_RTGA = 1
diff --git a/Makefile.emscripten b/Makefile.emscripten
index 0a3c785311e..ffb1f9e9fc6 100644
--- a/Makefile.emscripten
+++ b/Makefile.emscripten
@@ -18,7 +18,6 @@ HAVE_RPNG   = 1
 HAVE_EMSCRIPTEN = 1
 HAVE_RGUI = 1
 HAVE_SDL = 0
-HAVE_CHD = 1
 HAVE_SDL2 = 0
 HAVE_ZLIB = 1
 WANT_ZLIB = 1
diff --git a/Makefile.vita b/Makefile.vita
index c2ed9711536..5645c9cabd6 100644
--- a/Makefile.vita
+++ b/Makefile.vita
@@ -18,13 +18,11 @@ ifeq ($(GRIFFIN_BUILD), 1)
 	DEFINES += -DHAVE_GRIFFIN=1
 	DEFINES += -DHAVE_NEON -DHAVE_MENU -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB DEFINES -DHAVE_KEYMAPPER
 	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB -DHAVE_CC_RESAMPLER
-	DEFINES += -DHAVE_CHD
 	ifeq ($(DEBUG), 1)
 		DEFINES += -DHAVE_NETLOGGER
 	endif
 else
 
-   HAVE_CHD       := 1
 	HAVE_NEON		:= 1
 	HAVE_FILTERS_BUILTIN	:= 1
 	HAVE_LANGEXTRA		:= 1
diff --git a/Makefile.wiiu b/Makefile.wiiu
index 1ecd6c5693e..b3f57e89186 100644
--- a/Makefile.wiiu
+++ b/Makefile.wiiu
@@ -115,10 +115,8 @@ endif
    #	DEFINES += -DWANT_IFADDRS
    #	DEFINES += -DHAVE_FREETYPE
    	DEFINES += -DHAVE_XMB -DHAVE_MATERIALUI
-		DEFINES += -DHAVE_CHD
    else
    	HAVE_MENU_COMMON = 1
-   	HAVE_CHD = 1
    	HAVE_RTGA = 1
    	HAVE_RPNG = 1
    	HAVE_RJPEG = 1