|
Lines 154-166
Link Here
|
| 154 |
.PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d) |
154 |
.PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d) |
| 155 |
$(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) $(VERSION_OBJECTS) |
155 |
$(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) $(VERSION_OBJECTS) |
| 156 |
$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) -o $@ $(OBJECTS) $(GEN_OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) |
156 |
$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) |
| 157 |
$(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS) |
157 |
$(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS) |
| 158 |
$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) -static -o $@ $(SDLMAIN_OBJECTS) -rpath $(libdir) |
158 |
$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -static |
| 159 |
$(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS) |
159 |
$(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS) |
| 160 |
$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) -static -o $@ $(SDLTEST_OBJECTS) -rpath $(libdir) |
160 |
$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -static |
| 161 |
install: all install-bin install-hdrs install-lib install-data |
161 |
install: all install-bin install-hdrs install-lib install-data |
| 162 |
install-bin: |
162 |
install-bin: |
| 163 |
-- a/src/video/SDL_egl.c |
163 |
++ b/src/video/SDL_egl.c |
|
Lines 45-50
Link Here
|
| 45 |
|
45 |
|
| 46 |
#if SDL_VIDEO_DRIVER_RPI |
46 |
#if SDL_VIDEO_DRIVER_RPI |
| 47 |
/* Raspbian places the OpenGL ES/EGL binaries in a non standard path */ |
47 |
/* Raspbian places the OpenGL ES/EGL binaries in a non standard path */ |
|
|
48 |
#include "raspberry/SDL_rpievents_c.h" |
| 49 |
#include "raspberry/SDL_rpiopengles.h" |
| 50 |
#include "raspberry/SDL_rpimouse.h" |
| 51 |
#include "raspberry/SDL_rpivideo.h" |
| 48 |
#define DEFAULT_EGL ( vc4 ? "libEGL.so.1" : "libbrcmEGL.so" ) |
52 |
#define DEFAULT_EGL ( vc4 ? "libEGL.so.1" : "libbrcmEGL.so" ) |
| 49 |
#define DEFAULT_OGL_ES2 ( vc4 ? "libGLESv2.so.2" : "libbrcmGLESv2.so" ) |
53 |
#define DEFAULT_OGL_ES2 ( vc4 ? "libGLESv2.so.2" : "libbrcmGLESv2.so" ) |
| 50 |
#define ALT_EGL "libEGL.so" |
54 |
#define ALT_EGL "libEGL.so" |
| 51 |
-- a/src/video/raspberry/SDL_rpivideo.h |
55 |
++ b/src/video/raspberry/SDL_rpivideo.h |
|
Lines 41-46
Link Here
|
| 41 |
DISPMANX_DISPLAY_HANDLE_T dispman_display; |
41 |
DISPMANX_DISPLAY_HANDLE_T dispman_display; |
| 42 |
} SDL_DisplayData; |
42 |
} SDL_DisplayData; |
| 43 |
|
43 |
|
|
|
44 |
|
| 45 |
typedef struct { |
| 46 |
DISPMANX_ELEMENT_HANDLE_T element; |
| 47 |
int width; |
| 48 |
int height; |
| 49 |
} EGL_DISPMANX_WINDOW_T; |
| 44 |
|
50 |
|
| 45 |
typedef struct SDL_WindowData |
51 |
typedef struct SDL_WindowData |
| 46 |
{ |
52 |
{ |
