Kill off IS_JOYCONFIG

Makefile

@@ -17,7 +17,6 @@ ifeq ($(GLOBAL_CONFIG_DIR),)
 endif
 
 OBJ := 
-JOYCONFIG_OBJ :=
 LIBS :=
 DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -DHAVE_OVERLAY
 DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'
@@ -96,7 +95,6 @@ ifeq ($(NOUNUSED_VARIABLE), yes)
 endif
 
 RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
-RARCH_JOYCONFIG_OBJ := $(addprefix $(OBJDIR)/,$(JOYCONFIG_OBJ))
 
 ifneq ($(SANITIZER),)
     CFLAGS   := -fsanitize=$(SANITIZER) $(CFLAGS)
@@ -106,7 +104,7 @@ endif
 
 all: $(TARGET) $(JTARGET) config.mk
 
--include $(RARCH_OBJ:.o=.d) $(RARCH_JOYCONFIG_OBJ:.o=.d)
+-include $(RARCH_OBJ:.o=.d)
 config.mk: configure qb/*
 	@echo "config.mk is outdated or non-existing. Run ./configure again."
 	@exit 1
@@ -115,10 +113,6 @@ retroarch: $(RARCH_OBJ)
 	@$(if $(Q), $(shell echo echo LD $@),)
 	$(Q)$(LINK) -o $@ $(RARCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)
 
-$(JTARGET): $(RARCH_JOYCONFIG_OBJ)
-	@$(if $(Q), $(shell echo echo LD $@),)
-	$(Q)$(LINK) -o $@ $(RARCH_JOYCONFIG_OBJ) $(JOYCONFIG_LIBS) $(LDFLAGS) $(LIBRARY_DIRS)
-
 $(OBJDIR)/%.o: %.c config.h config.mk
 	@mkdir -p $(dir $@)
 	@$(if $(Q), $(shell echo echo CC $<),)
@@ -141,21 +135,6 @@ $(OBJDIR)/git_version.o: git_version.c .FORCE
 	@$(if $(Q), $(shell echo echo CC $<),)
 	$(Q)$(CC) $(CFLAGS) $(DEFINES) -MMD -c -o $@ $<
 
-$(OBJDIR)/tools/linuxraw_joypad.o: input/linuxraw_joypad.c
-	@mkdir -p $(dir $@)
-	@$(if $(Q), $(shell echo echo CC $<),)
-	$(Q)$(CC) $(CFLAGS) $(DEFINES) -MMD -DIS_JOYCONFIG -c -o $@ $<
-
-$(OBJDIR)/tools/parport_joypad.o: input/parport_joypad.c
-	@mkdir -p $(dir $@)
-	@$(if $(Q), $(shell echo echo CC $<),)
-	$(Q)$(CC) $(CFLAGS) $(DEFINES) -MMD -DIS_JOYCONFIG -c -o $@ $<
-
-$(OBJDIR)/tools/udev_joypad.o: input/udev_joypad.c
-	@mkdir -p $(dir $@)
-	@$(if $(Q), $(shell echo echo CC $<),)
-	$(Q)$(CC) $(CFLAGS) $(DEFINES) -MMD -DIS_JOYCONFIG -c -o $@ $<
-
 $(OBJDIR)/%.o: %.S config.h config.mk $(HEADERS)
 	@mkdir -p $(dir $@)
 	@$(if $(Q), $(shell echo echo AS $<),)

Makefile.common

@@ -28,7 +28,6 @@ endif
 
 ifeq ($(HAVE_DYLIB), 1)
    DEFINES += -DHAVE_DYLIB
-	JOYCONFIG_LIBS += $(DYLIB_LIB)
 endif
 
 ifeq ($(SCALER_NO_SIMD), 1)
@@ -71,14 +70,12 @@ endif
 ifneq ($(findstring Darwin,$(OS)),)
    OSX := 1
    LIBS += -framework AppKit
-   JOYCONFIG_LIBS += -framework CoreFoundation
 else
    OSX := 0
 endif
 
 ifneq ($(findstring Linux,$(OS)),)
    LIBS += -lrt
-   JOYCONFIG_LIBS += -lrt -lpthread
    OBJ += input/drivers/linuxraw_input.o \
           input/drivers_joypad/linuxraw_joypad.o \
           frontend/drivers/platform_linux.o
@@ -499,7 +496,6 @@ ifeq ($(HAVE_DINPUT), 1)
    DEFINES += -DHAVE_DINPUT
    OBJ += input/drivers/dinput.o \
           input/drivers_joypad/dinput_joypad.o
-   JOYCONFIG_LIBS += -ldinput8 -ldxguid -lole32
 endif
 
 ifeq ($(HAVE_XINPUT), 1)
@@ -526,7 +522,6 @@ endif
 ifeq ($(HAVE_UDEV), 1)
    DEFINES += $(UDEV_CFLAGS)
    LIBS += $(UDEV_LIBS)
-   JOYCONFIG_LIBS += $(UDEV_LIBS)
    OBJ += input/drivers/udev_input.o \
           input/drivers_joypad/udev_joypad.o
 endif
@@ -535,7 +530,6 @@ ifeq ($(HAVE_LIBUSB), 1)
 	DEFINES += -DHAVE_LIBUSB
 	OBJ += input/drivers_hid/libusb_hid.o
 	LIBS += -lusb-1.0
-	JOYCONFIG_LIBS += -lusb-1.0
 	HAVE_HID = 1
 endif
 
@@ -544,7 +538,6 @@ ifeq ($(HAVE_IOHIDMANAGER), 1)
 	OBJ += input/drivers_hid/iohidmanager_hid.o
 	HAVE_HID = 1
 	LIBS += -framework IOKit
-	JOYCONFIG_LIBS += -framework IOKit
 endif
 
 ifeq ($(HAVE_CORELOCATION), 1)
@@ -674,7 +667,6 @@ ifeq ($(HAVE_SDL), 1)
      OBJ += gfx/drivers_context/sdl_gl_ctx.o
    endif
 
-   JOYCONFIG_LIBS += $(SDL_LIBS)
    DEFINES += $(SDL_CFLAGS) $(BSD_LOCAL_INC)
    LIBS += $(SDL_LIBS)
 endif
@@ -689,7 +681,6 @@ ifeq ($(HAVE_SDL2), 1)
      OBJ += gfx/drivers_context/sdl_gl_ctx.o
    endif
 
-   JOYCONFIG_LIBS += $(SDL2_LIBS)
    DEFINES += $(SDL2_CFLAGS) $(BSD_LOCAL_INC)
    LIBS += $(SDL2_LIBS)
    HAVE_SDL = 0
@@ -927,7 +918,3 @@ ifeq ($(HAVE_COCOA),1)
                ui/drivers/cocoa/cocoa_common.o \
                gfx/drivers_context/cocoa_gl_ctx.o
 endif
-
-
-# Joyconfig binary
-JOYCONFIG_OBJ  += tools/retroarch-joyconfig-griffin.o

input/input_common.c

@@ -339,7 +339,6 @@ void input_config_parse_joy_axis(config_file_t *conf, const char *prefix,
    }
 }
 
-#if !defined(IS_JOYCONFIG)
 static void input_get_bind_string_joykey(char *buf, const char *prefix,
       const struct retro_keybind *bind, size_t size)
 {
@@ -434,7 +433,6 @@ void input_get_bind_string(char *buf, const struct retro_keybind *bind,
    strlcat(buf, keybuf, size);
 #endif
 }
-#endif
 
 /**
  * input_push_analog_dpad:

input/input_hid_driver.c

@@ -20,9 +20,7 @@
 
 #include "input_hid_driver.h"
 #include "../general.h"
-#ifndef IS_JOYCONFIG
 #include "../string_list_special.h"
-#endif
 
 static hid_driver_t *hid_drivers[] = {
 #if defined(__APPLE__) && defined(IOS)
@@ -71,7 +69,6 @@ const char *hid_driver_find_ident(int idx)
    return drv->ident;
 }
 
-#ifndef IS_JOYCONFIG
 /**
  * config_get_hid_driver_options:
  *
@@ -83,7 +80,6 @@ const char* config_get_hid_driver_options(void)
 {
    return char_list_new_special(STRING_LIST_INPUT_HID_DRIVERS, NULL);
 }
-#endif
 
 /**
  * input_hid_init_first:

input/input_joypad_driver.c

@@ -20,9 +20,7 @@
 
 #include "input_keymaps.h"
 #include "../general.h"
-#ifndef IS_JOYCONFIG
 #include "../string_list_special.h"
-#endif
 
 static input_device_driver_t *joypad_drivers[] = {
 #ifdef __CELLOS_LV2__
@@ -99,7 +97,6 @@ const char *joypad_driver_find_ident(int idx)
    return drv->ident;
 }
 
-#ifndef IS_JOYCONFIG
 /**
  * config_get_joypad_driver_options:
  *
@@ -111,7 +108,6 @@ const char* config_get_joypad_driver_options(void)
 {
    return char_list_new_special(STRING_LIST_INPUT_JOYPAD_DRIVERS, NULL);
 }
-#endif
 
 /**
  * input_joypad_init_driver:

libretro-common/include/retro_log.h

@@ -41,7 +41,7 @@
 #include <compat/posix_string.h>
 #include <compat/strl.h>
 
-#if defined(HAVE_FILE_LOGGER) && defined(RARCH_INTERNAL) && !defined(IS_JOYCONFIG)
+#if defined(HAVE_FILE_LOGGER) && defined(RARCH_INTERNAL)
 
 #ifdef __cplusplus
 extern "C"