Skip to content

Commit

Permalink
Squash of a few libretro makeile fixes
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
webgeek1234 committed Oct 31, 2018
1 parent 8a18686 commit 9ee6203
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
4 changes: 2 additions & 2 deletions libretro/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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),)
Expand Down
5 changes: 4 additions & 1 deletion libretro/Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 9ee6203

Please sign in to comment.