From 440f08ac28eb255c7049562c44af5f19d261a10f Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 26 Oct 2014 21:17:11 +0100 Subject: [PATCH] (Windows Mingw) Make some dependencies optional by default --- Makefile.win | 39 ++++++++++++++++++++++++++++----------- input/dinput.c | 1 + 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/Makefile.win b/Makefile.win index 3a2e4b28a5..06a73bdf1f 100644 --- a/Makefile.win +++ b/Makefile.win @@ -22,43 +22,60 @@ HAVE_WINXINPUT = 1 HAVE_LAKKA = 1 -ifeq ($(SLIM),) - HAVE_SDL = 1 - HAVE_LIBXML2 = 1 - HAVE_FREETYPE = 1 - HAVE_ZLIB = 1 - HAVE_RSOUND = 1 - HAVE_CG = 1 - HAVE_PYTHON = 1 - HAVE_FFMPEG = 1 +HAVE_SDL := 0 +HAVE_SDL2 := 0 +HAVE_RSOUND := 0 +HAVE_PYTHON := 0 + +HAVE_FREETYPE := 0 +HAVE_FFMPEG := 0 + +HAVE_CG := 0 +HAVE_LIBXML2 := 0 +HAVE_ZLIB := 1 + +ifeq ($(HAVE_CG), 1) +CG_LIBS := -lcg -lcgGL endif -CG_LIBS := -lcg -lcgGL - +ifeq ($(HAVE_FREETYPE), 1) FREETYPE_CFLAGS := -DHAVE_FREETYPE -Ifreetype2 FREETYPE_LIBS := -lfreetype +endif +ifeq ($(HAVE_LIBXML2), 1) LIBXML2_CFLAGS := -Ilibxml2 -DHAVE_LIBXML2 -DHAVE_GLSL LIBXML2_LIBS := -lxml2 -liconv +endif +ifeq ($(HAVE_SDL), 1) SDL_LIBS := -lSDL SDL_CFLAGS := -ISDL -DHAVE_SDL BSD_LOCAL_INC := +endif +ifeq ($(HAVE_SDL2), 1) SDL2_LIBS := -lSDL2 SDL2_CFLAGS := -ISDL2 -DHAVE_SDL2 +endif +ifeq ($(HAVE_RSOUND), 1) RSOUND_CFLAGS := -DHAVE_RSOUND RSOUND_LIBS := -lrsound +endif +ifeq ($(HAVE_PYTHON), 1) PYTHON_LIBS := -lpython32 PYTHON_CFLAGS := -DHAVE_PYTHON -Ipython +endif +ifeq ($(HAVE_FFMPEG), 1) AVCODEC_LIBS := -lavcodec AVUTIL_LIBS := -lavutil SWSCALE_LIBS := -lswscale AVFORMAT_LIBS := -lavformat FFMPEG_LIBS := -lws2_32 -lz +endif OBJDIR := obj-w32 diff --git a/input/dinput.c b/input/dinput.c index 386fb040d1..f3adb6a74d 100644 --- a/input/dinput.c +++ b/input/dinput.c @@ -23,6 +23,7 @@ #include "../general.h" #include +#include "input_autodetect.h" #include "input_common.h" #include "retroarch_logger.h" #include