Merge pull request #72 from Chips-fr/master

Support latest raspberry GLES library name

diff --git a/Makefile b/Makefile
index 997609d..2620a70 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,13 @@ endif
 ifeq ("$(PLATFORM)",$(filter "$(PLATFORM)","rpi1" "rpi2"))
 CFLAGS += -DHAVE_GLES -DRASPBERRY
 CFLAGS += -I/opt/vc/include/ -I/opt/vc/include/interface/vcos/pthreads/ -I/opt/vc/include/interface/vmcs_host/linux/
-LDFLAGS += -ldl -lbcm_host -L/opt/vc/lib -lEGL -lGLESv2
+LDFLAGS += -ldl -lbcm_host -L/opt/vc/lib
+# Stupid renaming occured in latest raspbian...
+ifneq (,$(wildcard /opt/vc/lib/libbrcmGLESv2.so))
+LDFLAGS += -lbrcmEGL -lbrcmGLESv2
+else
+LDFLAGS += -lEGL -lGLESv2
+endif
 OBJS += platform/linux/emu.o platform/linux/blit.o # FIXME
 OBJS += platform/common/plat_sdl.o
 OBJS += platform/libpicofe/plat_sdl.o platform/libpicofe/in_sdl.o

diff --git a/README b/README
index d9c1091..af1bbfc 100644 (file)
--- a/README
+++ b/README
@@ -12,10 +12,3 @@ then taken over and expanded by notaz.
 
 PicoDrive was the first emulator ever to properly emulate Virtua Racing and
 it's SVP chip.
-
-How to compile on Raspbian Wheezy:
-
-export CC=gcc-4.8
-export CXX=g++-4.8
-./configure --platform=rpi2
-make