search

ricrpi / mupen64plus-video-gles2n64

Manually ported from mupen64plus-ae for use with the Raspberry PI
5 stars 10 forks source link

Don't look for OpenGL headers if USE_GLES is set #17

Closed loganmc10 closed 8 years ago

loganmc10 commented 8 years ago

This allows GLES devices to build this project without libgl headers.

gizmo98 commented 8 years ago

I don't even know if OpenGL would work. If it does not work the package check could be removed. Wouldn't it be easier do do something like vanilla rice plugin?

https://github.com/mupen64plus/mupen64plus-video-rice/blob/master/projects/unix/Makefile#L194

# search for OpenGL libraries
ifeq ($(VC), 1)
  GL_CFLAGS += -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/vmcs_host/linux
  GL_LDLIBS += -L/opt/vc/lib -lEGL -lbcm_host -lvcos -lvchiq_arm
  USE_GLES=1
endif
ifeq ($(USE_GLES), 1)
  GL_LDLIBS += -lGLESv2
endif

If you use OpenGL line 146 must be removed. https://github.com/loganmc10/mupen64plus-video-gles2rice/blob/beaf93d94f353f53791104e8dffeac9ea8e5b890/projects/unix/Makefile#L146

loganmc10 commented 8 years ago

I'm not sure if OpenGL would work either, I've only tested this on a Raspberry Pi, but the way it is now, it needs OpenGL headers in order to build, it shouldn't need that.

You could just get rid of the check all together and just let the build fail with an error if it is missing the proper headers, and just wrap the -lGLESv2 line in a "USE_GLES" ifdef, up to you

gizmo98 commented 8 years ago

I will merge your PR and add above mentioned lines as well. This should work for GL and GLES.

loganmc10 commented 8 years ago

Thanks, i submitted he same thing for gles2rice (pandora-backport)