Update Makefiles

This commit is contained in:
twinaphex 2014-09-14 03:58:49 +02:00
parent dd5ebd974e
commit 2ce5f9318f
3 changed files with 10 additions and 9 deletions

View File

@ -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)

View File

@ -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)

View File

@ -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)