diff options
| author | notaz | 2012-08-02 01:33:02 +0300 |
|---|---|---|
| committer | notaz | 2012-08-02 01:43:04 +0300 |
| commit | 4ea086f6049c3f2c286f1a4e1e23b5763629067a (patch) | |
| tree | 45bf94324383bb5900262bed6fe37225c8888ebd /plugins | |
| parent | 9ed4ca47610027e8a0448d61389df5a583bd659b (diff) | |
| download | pcsx_rearmed-4ea086f6049c3f2c286f1a4e1e23b5763629067a.tar.gz pcsx_rearmed-4ea086f6049c3f2c286f1a4e1e23b5763629067a.tar.bz2 pcsx_rearmed-4ea086f6049c3f2c286f1a4e1e23b5763629067a.zip | |
release r15
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/gpu-gles/Makefile | 1 | ||||
| -rw-r--r-- | plugins/gpu-gles/gpulib_if.c | 12 |
2 files changed, 9 insertions, 4 deletions
diff --git a/plugins/gpu-gles/Makefile b/plugins/gpu-gles/Makefile index 894daec..421a6e7 100644 --- a/plugins/gpu-gles/Makefile +++ b/plugins/gpu-gles/Makefile @@ -6,6 +6,7 @@ SRC_STANDALONE += gpuDraw.c gpuFps.c gpuPlugin.c gpuPrim.c gpuTexture.c SRC_GPULIB += gpulib_if.c
CFLAGS += -I$(PREFIX)include
+LDFLAGS += -Wl,--allow-multiple-definition
LDLIBS += -L$(PREFIX)lib
ifeq "$(PLATFORM)" "caanoo"
CFLAGS += -DFAKE_WINDOW
diff --git a/plugins/gpu-gles/gpulib_if.c b/plugins/gpu-gles/gpulib_if.c index ce7f00d..c25ad8b 100644 --- a/plugins/gpu-gles/gpulib_if.c +++ b/plugins/gpu-gles/gpulib_if.c @@ -640,6 +640,14 @@ void vout_update(void) } } +void vout_blank(void) +{ +} + +void vout_set_config(const struct rearmed_cbs *cbs) +{ +} + static struct rearmed_cbs *cbs; long GPUopen(void **dpy) @@ -696,10 +704,6 @@ void renderer_set_config(const struct rearmed_cbs *cbs_) iVRamSize = cbs->gpu_peopsgl.iVRamSize; } -void vout_set_config(const struct rearmed_cbs *cbs) -{ -} - void SetAspectRatio(void) { if (cbs->pl_get_layer_pos) |