From 2ce5f9318f612d259c69d072a2184411dd60c12a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 14 Sep 2014 03:58:49 +0200 Subject: [PATCH] Update Makefiles --- Makefile.common | 7 +++++++ Makefile.emscripten | 5 ----- Makefile.win | 7 +++---- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Makefile.common b/Makefile.common index 8a9d3ee476..c36f6bf9df 100644 --- a/Makefile.common +++ b/Makefile.common @@ -127,6 +127,13 @@ ifeq ($(HAVE_PYTHON), 1) OBJ += gfx/py_state/py_state.o endif +ifeq ($(HAVE_EMSCRIPTEN), 1) +OBJ += frontend/platform/platform_emscripten.o \ + input/rwebinput_input.o \ + audio/rwebaudio.o \ + camera/rwebcam.o +endif + # Audio # ifeq ($(HAVE_COREAUDIO), 1) diff --git a/Makefile.emscripten b/Makefile.emscripten index e37770e68e..4ede3fa1b3 100644 --- a/Makefile.emscripten +++ b/Makefile.emscripten @@ -26,11 +26,6 @@ LDFLAGS := -L. -s TOTAL_MEMORY=$(MEMORY) -s OUTLINING_LIMIT=50000 --js-library e include Makefile.common -OBJ += frontend/platform/platform_emscripten.o \ - input/rwebinput_input.o \ - audio/rwebaudio.o \ - camera/rwebcam.o - libretro = libretro_emscripten.bc ifeq ($(HAVE_ZLIB), 1) diff --git a/Makefile.win b/Makefile.win index 0f2dd9cc36..51a0ad9984 100644 --- a/Makefile.win +++ b/Makefile.win @@ -53,6 +53,7 @@ PYTHON_CFLAGS := -DHAVE_PYTHON -Ipython OBJDIR := obj-w32 OBJ := +JOYCONFIG_OBJ := LIBS := -lm JOYCONFIG_LIBS := DEFINES := -I. -DHAVE_BUILTIN_AUTOCONFIG -DRARCH_INTERNAL -DHAVE_CC_RESAMPLER -DHAVE_OVERLAY @@ -63,13 +64,11 @@ include Makefile.common OBJ += media/rarch.o \ gfx/context/win32_common.o -JOYCONFIG_OBJ := conf/config_file.o \ +JOYCONFIG_OBJ += conf/config_file.o \ tools/retroarch-joyconfig.o \ compat/compat.o \ file_path.o \ - tools/input_common_joyconfig.o \ - input/dinput.o \ - input/winxinput_joypad.o + tools/input_common_joyconfig.o HEADERS = $(wildcard */*/*.h) $(wildcard */*.h) $(wildcard *.h)