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

libretro, fix build conflict

Browse source
This commit is contained in:
kub 2023-06-03 21:09:05 +00:00
parent 69d69a4f63
commit ab43a4b2fd
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -74,9 +74,9 @@ endif
# revision info from repository if this not a tagged release # revision info from repository if this not a tagged release
ifeq "$(shell git describe --tags --exact-match HEAD 2>/dev/null)" "" ifeq "$(shell git describe --tags --exact-match HEAD 2>/dev/null)" ""
REVISION ?= -$(shell git rev-parse --short HEAD || echo ???) GIT_REVISION ?= -$(shell git rev-parse --short HEAD || echo ???)
endif endif
CFLAGS += -DREVISION=\"$(REVISION)\" CFLAGS += -DREVISION=\"$(GIT_REVISION)\"
# default settings # default settings
use_libchdr ?= 1 use_libchdr ?= 1

2
Makefile.libretro
View file

@ -40,7 +40,7 @@ STATIC_LINKING_LINK:= 0
LOW_MEMORY := 0 LOW_MEMORY := 0
TARGET_NAME := picodrive TARGET_NAME := picodrive
LIBM := -lm LIBM := -lm
REVISION ?= -$(shell git rev-parse --short HEAD || echo ???) GIT_REVISION ?= -$(shell git rev-parse --short HEAD || echo ???)
fpic := fpic :=