From f687fec62431ba70313bc1da22734a3cb5eda5a7 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 4 Mar 2016 04:24:47 +0100
Subject: [PATCH] Makefile.win - cleanups

---
 Makefile.win | 37 +++----------------------------------
 1 file changed, 3 insertions(+), 34 deletions(-)

diff --git a/Makefile.win b/Makefile.win
index 4312df9b9a..ae2d252593 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -1,5 +1,4 @@
 TARGET = retroarch.exe
-JTARGET = tools/retroarch-joyconfig.exe
 
 HAVE_DINPUT = 1
 HAVE_XAUDIO = 1
@@ -84,9 +83,7 @@ OBJDIR           := obj-w32
 
 OS               := Win32
 OBJ              :=
-JOYCONFIG_OBJ    :=
 LIBS             := -lm
-JOYCONFIG_LIBS   :=
 DEFINES          := -I. -Ilibretro-common/include -DRARCH_INTERNAL -DHAVE_OVERLAY
 LDFLAGS          := -L. -static-libgcc
 
@@ -137,11 +134,10 @@ else
 endif
 
 RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
-RARCH_JOYCONFIG_OBJ := $(addprefix $(OBJDIR)/,$(JOYCONFIG_OBJ))
 
-all: $(TARGET) $(JTARGET)
+all: $(TARGET)
 
--include $(RARCH_OBJ:.o=.d) $(RARCH_JOYCONFIG_OBJ:.o=.d)
+-include $(RARCH_OBJ:.o=.d)
 
 $(TARGET): $(RARCH_OBJ)
 	@$(if $(Q), $(shell echo echo LD $@),)
@@ -170,37 +166,10 @@ $(OBJDIR)/%.o: %.rc $(HEADERS)
 	@$(if $(Q), $(shell echo echo WINDRES $<),)
 	$(Q)$(WINDRES) -o $@ $<
 
-$(JTARGET): $(RARCH_JOYCONFIG_OBJ)
-	@$(if $(Q), $(shell echo echo LD $@),)
-ifeq ($(CXX_BUILD), 1)
-	$(Q)$(CXX) -o $@ $(RARCH_JOYCONFIG_OBJ) -ldxguid -ldinput8 -lole32 $(LDFLAGS) $(JOYCONFIG_LIBS)
-else
-	$(Q)$(CC) -o $@ $(RARCH_JOYCONFIG_OBJ) -ldxguid -ldinput8 -lole32 $(LDFLAGS) $(JOYCONFIG_LIBS)
-endif
-
 clean:
 	rm -rf $(OBJDIR)
 	rm -f $(TARGET)
 	rm -f *.d
-	rm -f tools/retroarch-joyconfig.exe
 
-dist_x86: all
-	zip -r retroarch-win32-1.0.zip $(TARGET) $(JTARGET) retroarch.cfg
-
-dist_x86_64: all
-	zip -r retroarch-win64-1.0.zip $(TARGET) $(JTARGET) retroarch.cfg
-
-libs_x86:
-	wget http://themaister.net/retroarch-dl/RetroArch-win32-libs.zip
-	unzip RetroArch-win32-libs.zip
-	wget http://themaister.net/retroarch-dl/RetroArch-win32-headers.zip
-	unzip RetroArch-win32-headers.zip
-
-libs_x86_64:
-	wget http://themaister.net/retroarch-dl/RetroArch-win64-libs.zip
-	unzip RetroArch-win64-libs.zip
-	wget http://themaister.net/retroarch-dl/RetroArch-win64-headers.zip
-	unzip RetroArch-win64-headers.zip
-
-.PHONY: all install uninstall clean dist_x86 dist_x86_64 libs_x86 libs_x86_64
+.PHONY: all install uninstall clean