Permalink
Browse files

Squash of a few libretro makeile fixes

Fix libretro#5 (comment)

Add missing file

Bump this, in case you are building without .git/ folder

Libretro: remove override directive. (#4)
  • Loading branch information...
webgeek1234 committed Oct 30, 2018
1 parent 8a18686 commit 9ee6203545a04daa0f49f55aa580883a75aad065
Showing with 6 additions and 3 deletions.
  1. +2 −2 libretro/Makefile
  2. +4 −1 libretro/Makefile.common
@@ -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),)
@@ -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

0 comments on commit 9ee6203

Please sign in to comment.