libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-23 16:09:47 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Fix conflict

Browse Source
This commit is contained in:
GameDragon2k 2017-11-23 08:06:33 -05:00
parent cfe59bcf2a
commit 4f9119d42e
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.common
View File

@ -1474,12 +1474,9 @@ ifeq ($(HAVE_NETWORKING), 1)
ifeq ($(HAVE_CHEEVOS), 1)
DEFINES += -DHAVE_CHEEVOS
OBJ += cheevos/cheevos.o \
<<<<<<< HEAD
cheevos/var.o \
cheevos/cond.o \
=======
cheevos/badges.o \
>>>>>>> Add files to handle all cheevos badges.
cheevos/badges.o \
$(LIBRETRO_COMM_DIR)/utils/md5.o
endif