Skip to content

Commit

Permalink
Revert "(3DS/Emscripten/Vita/Wiiu) Add HAVE_CHD support"
Browse files Browse the repository at this point in the history
This reverts commit d4c6915.
  • Loading branch information
inactive123 committed Apr 22, 2018
1 parent d4c6915 commit ca9dd89
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 7 deletions.
2 changes: 0 additions & 2 deletions Makefile.ctr
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion Makefile.emscripten
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions Makefile.vita
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions Makefile.wiiu
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ca9dd89

Please sign in to comment.