Fix build on ArchLinux/Pi.

This commit is contained in:
Themaister 2012-07-09 16:49:20 +02:00
parent 29f3543b06
commit ffbf6d7586
2 changed files with 9 additions and 5 deletions

View File

@ -125,19 +125,23 @@ ifeq ($(HAVE_SDL), 1)
DEFINES += $(SDL_CFLAGS) $(BSD_LOCAL_INC)
LIBS += $(SDL_LIBS)
ifneq ($(OSX), 1)
LIBS += -lX11
endif
ifeq ($(HAVE_OPENGL), 1)
OBJ += gfx/gl.o gfx/fonts/freetype.o
OBJ += gfx/gl.o gfx/fonts/freetype.o
ifeq ($(OSX),1)
LIBS += -framework OpenGL
LIBS += -framework OpenGL
else
LIBS += -lGL
LIBS += -lGL
endif
endif
endif
ifeq ($(HAVE_RPI), 1)
OBJ += gfx/rpi.o
LIBS += -lOpenVG -lGLESv2 -lEGL -lbcm_host
LIBS += -lOpenVG -lGLESv2 -lEGL -lbcm_host -lvcos -lvchiq_arm
endif
ifeq ($(HAVE_XVIDEO), 1)

View File

@ -11,7 +11,7 @@ add_define_make NOUNUSED "$HAVE_NOUNUSED"
if [ "$OS" = 'BSD' ]; then DYLIB=-lc; else DYLIB=-ldl; fi
[ -d /opt/vc/lib ] && add_library_dirs /opt/vc/lib
check_lib RPI -lbcm_host bcm_host_init
check_lib RPI -lbcm_host bcm_host_init "-lvcos -lvchiq_arm"
if [ "$HAVE_RPI" = 'yes' ]; then
[ -d /opt/vc/include ] && add_include_dirs /opt/vc/include