From e7f527fbd88b4981c0c4c7820b06ca1e7548ab27 Mon Sep 17 00:00:00 2001 From: couriersud Date: Sun, 1 Feb 2015 16:11:19 +0100 Subject: [PATCH] If USE_BGFX is enabled, sdl.mak switches to ldd linking of GL libraries. (nw) --- src/osd/sdl/sdl.mak | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak index a765bb8a5ae..d68db6ae8e6 100644 --- a/src/osd/sdl/sdl.mak +++ b/src/osd/sdl/sdl.mak @@ -755,6 +755,17 @@ OSDOBJS += \ $(OSDOBJ)/modules/debugger/debugqt.o \ +#------------------------------------------------- +# BGFX +#------------------------------------------------- + +ifdef USE_BGFX +DEFS += -DUSE_BGFX +OSDOBJS += $(SDLOBJ)/drawbgfx.o +INCPATH += -I$(3RDPARTY)/bgfx/include -I$(3RDPARTY)/bx/include +USE_DISPATCH_GL = 0 +endif + #------------------------------------------------- # OPENGL #------------------------------------------------- @@ -779,15 +790,6 @@ INCPATH += -I$(MESA_INSTALL_ROOT)/include endif endif -#------------------------------------------------- -# BGFX -#------------------------------------------------- - -ifdef USE_BGFX -DEFS += -DUSE_BGFX -OSDOBJS += $(SDLOBJ)/drawbgfx.o -INCPATH += -I$(3RDPARTY)/bgfx/include -I$(3RDPARTY)/bx/include -endif #------------------------------------------------- # X11