From 9ee6203545a04daa0f49f55aa580883a75aad065 Mon Sep 17 00:00:00 2001 From: Aaron Kling Date: Mon, 29 Oct 2018 21:38:21 -0500 Subject: [PATCH] Squash of a few libretro makeile fixes Fix https://github.com/libretro/ppsspp/issues/5#issuecomment-383238875 Add missing file Bump this, in case you are building without .git/ folder Libretro: remove override directive. (#4) --- libretro/Makefile | 4 ++-- libretro/Makefile.common | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libretro/Makefile b/libretro/Makefile index 4fdb2ea929..8970ddc036 100644 --- a/libretro/Makefile +++ b/libretro/Makefile @@ -15,9 +15,9 @@ ifeq (,$(TARGET_ARCH)) endif ifneq (,$(findstring 64,$(TARGET_ARCH))) - override TARGET_ARCH := x86_64 + TARGET_ARCH := x86_64 else ifneq (,$(findstring 86,$(TARGET_ARCH))) - override TARGET_ARCH := x86 + TARGET_ARCH := x86 endif ifeq ($(platform),) diff --git a/libretro/Makefile.common b/libretro/Makefile.common index 3bc9ab9726..f127fab167 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -216,6 +216,7 @@ SOURCES_CXX += \ $(EXTDIR)/glslang/glslang/MachineIndependent/preprocessor/PpContext.cpp \ $(EXTDIR)/glslang/glslang/MachineIndependent/preprocessor/PpScanner.cpp \ $(EXTDIR)/glslang/glslang/MachineIndependent/preprocessor/PpTokens.cpp \ + $(EXTDIR)/glslang/glslang/MachineIndependent/attribute.cpp \ $(EXTDIR)/glslang/glslang/MachineIndependent/Constant.cpp \ $(EXTDIR)/glslang/glslang/MachineIndependent/InfoSink.cpp \ $(EXTDIR)/glslang/glslang/MachineIndependent/Initialize.cpp \ @@ -409,6 +410,7 @@ SOURCES_CXX += $(NATIVEDIR)/math/dataconv.cpp \ $(COREDIR)/HLE/sceSsl.cpp \ $(COREDIR)/HLE/sceUmd.cpp \ $(COREDIR)/HLE/sceUsb.cpp \ + $(COREDIR)/HLE/sceUsbAcc.cpp \ $(COREDIR)/HLE/sceUsbCam.cpp \ $(COREDIR)/HLE/sceUtility.cpp \ $(COREDIR)/HLE/sceVaudio.cpp \ @@ -454,6 +456,7 @@ SOURCES_CXX += $(NATIVEDIR)/math/dataconv.cpp \ $(COREDIR)/MemMap.cpp \ $(COREDIR)/MemMapFunctions.cpp \ $(COREDIR)/PSPLoaders.cpp \ + $(COREDIR)/Replay.cpp \ $(COREDIR)/Reporting.cpp \ $(COREDIR)/SaveState.cpp \ $(COREDIR)/Screenshot.cpp \ @@ -675,7 +678,7 @@ SOURCES_C += \ endif GIT_VERSION_SRC = $(CORE_DIR)/git-version.cpp -GIT_VERSION := $(shell git describe --always || echo v1.4.2-git) +GIT_VERSION := $(shell git describe --always || echo v1.7.0-git) GIT_VERSION_NO_UPDATE = $(findstring 1,$(shell grep -s PPSSPP_GIT_VERSION_NO_UPDATE $(GIT_VERSION_SRC))) ifneq (,$(findstring $(GIT_VERSION),$(shell grep -s char $(GIT_VERSION_SRC)))) GIT_VERSION_NO_UPDATE = 1