mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-29 00:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Rasperry Pi build.

Browse Source
This commit is contained in:
Themaister 2014-01-26 11:05:36 +00:00
parent b5401d7b6a
commit 528bb2687d
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -216,7 +216,6 @@ ifeq ($(HAVE_OPENGL), 1)
ifeq ($(HAVE_VIDEOCORE), 1) ifeq ($(HAVE_VIDEOCORE), 1)
OBJ += gfx/context/vc_egl_ctx.o OBJ += gfx/context/vc_egl_ctx.o
# videocore's libs set later
endif endif
ifeq ($(HAVE_X11), 1) ifeq ($(HAVE_X11), 1)
@ -257,10 +256,6 @@ ifeq ($(HAVE_VG), 1)
LIBS += $(VG_LIBS) LIBS += $(VG_LIBS)
endif endif
ifeq ($(HAVE_VIDEOCORE), 1)
LIBS += -lbcm_host -lvcos -lvchiq_arm -lEGL
endif
ifeq ($(HAVE_XVIDEO), 1) ifeq ($(HAVE_XVIDEO), 1)
OBJ += gfx/xvideo.o OBJ += gfx/xvideo.o
LIBS += $(XVIDEO_LIBS) LIBS += $(XVIDEO_LIBS)

2
qb/config.libs.sh
View File

@ -30,7 +30,7 @@ if [ "$HAVE_VIDEOCORE" = 'yes' ]; then
[ -d /opt/vc/include/interface/vcos/pthreads ] && add_include_dirs /opt/vc/include/interface/vcos/pthreads [ -d /opt/vc/include/interface/vcos/pthreads ] && add_include_dirs /opt/vc/include/interface/vcos/pthreads
[ -d /opt/vc/include/interface/vmcs_host/linux ] && add_include_dirs /opt/vc/include/interface/vmcs_host/linux [ -d /opt/vc/include/interface/vmcs_host/linux ] && add_include_dirs /opt/vc/include/interface/vmcs_host/linux
HAVE_GLES='auto' HAVE_GLES='auto'
EXTRA_GL_LIBS="-lGLESv2 -lbcm_host -lvcos -lvchiq_arm" EXTRA_GL_LIBS="-lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm"
fi fi
if [ "$HAVE_NEON" = "yes" ]; then if [ "$HAVE_NEON" = "yes" ]; then

4
qb/qb.libs.sh
View File

@ -40,6 +40,8 @@ check_lib() #$1 = HAVE_$1 $2 = lib $3 = function in lib $4 = extralibs
echo "Forced to build with library $2, but cannot locate. Exiting ..." echo "Forced to build with library $2, but cannot locate. Exiting ..."
exit 1 exit 1
} }
/bin/true
} }
check_lib_cxx() #$1 = HAVE_$1 $2 = lib $3 = function in lib $4 = extralibs $5 = critical error message [checked only if non-empty] check_lib_cxx() #$1 = HAVE_$1 $2 = lib $3 = function in lib $4 = extralibs $5 = critical error message [checked only if non-empty]
@ -66,6 +68,8 @@ check_lib_cxx() #$1 = HAVE_$1 $2 = lib $3 = function in lib $4 = extralibs $5 =
} }
} }
/bin/true
} }
check_code_c() check_code_c()