Commit f6678475 authored by Libretro-Admin's avatar Libretro-Admin
Browse files

Fix Android build:

- Two input source files cannot both have the same name (lutro window.c,
vorbis window.c) - therefore rename lutro window.c to lutro_window.c
- VORBIS_SOURCES_C was not being added to LOCAL_SRC_FILES for Android
parent b6a32d4d
......@@ -24,7 +24,7 @@ SOURCES_C := $(CORE_DIR)/libretro.c \
$(CORE_DIR)/lutro_math.c \
$(CORE_DIR)/joystick.c \
$(CORE_DIR)/mouse.c \
$(CORE_DIR)/window.c \
$(CORE_DIR)/lutro_window.c \
$(CORE_DIR)/painter.c
ifeq ($(WANT_LUALIB),1)
......@@ -183,7 +183,7 @@ endif
# windows msbuild scripts. Notably, msbuild doesn't like window.c because it conflicts with window.c
# in lutro -- such things can only be resolved in msbuld by using project encapsulation.
VORBIS_SOURCES_C += \
VORBIS_SOURCES_C := \
$(CORE_DIR)/deps/ogg/bitwise.c \
$(CORE_DIR)/deps/ogg/framing.c \
$(CORE_DIR)/deps/vorbis/analysis.c \
......
......@@ -15,7 +15,7 @@ endif
include $(CLEAR_VARS)
LOCAL_MODULE := retro
LOCAL_SRC_FILES := $(SOURCES_C)
LOCAL_SRC_FILES := $(SOURCES_C) $(VORBIS_SOURCES_C)
LOCAL_CFLAGS := $(COREFLAGS) -std=gnu99
LOCAL_CXXFLAGS := $(COREFLAGS)
LOCAL_LDFLAGS := -Wl,-version-script=$(CORE_DIR)/link.T
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment