RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 23:37:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #85 from orbea/git

Browse source 
libretro: Allow setting GIT_VERSION.
This commit is contained in:
notaz 2018-04-05 23:58:22 +03:00 • committed by GitHub
commit 6ee3a0f98a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.libretro
View file

@ -26,7 +26,7 @@ CFLAGS ?=
STATIC_LINKING:= 0 STATIC_LINKING:= 0
TARGET_NAME := picodrive TARGET_NAME := picodrive
LIBM := -lm LIBM := -lm
GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)" GIT_VERSION ?= " $(shell git rev-parse --short HEAD || echo unknown)"
ifneq ($(GIT_VERSION)," unknown") ifneq ($(GIT_VERSION)," unknown")
CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
endif endif

2
jni/Android.mk
View file

@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)" GIT_VERSION ?= " $(shell git rev-parse --short HEAD || echo unknown)"
ifneq ($(GIT_VERSION)," unknown") ifneq ($(GIT_VERSION)," unknown")
LOCAL_CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" LOCAL_CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
endif endif