mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some additional fixes. Build in libxml2 for shader support.

Browse Source
This commit is contained in:
Themaister 2011-01-07 18:26:19 +01:00
parent 35124dc288
commit 5ecc622524
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile.win32
View File

@ -6,10 +6,11 @@ CXX = g++
HAVE_SRC = 1 HAVE_SRC = 1
HAVE_SDL = 1 HAVE_SDL = 1
HAVE_XML = 1
libsnes ?= -lsnes libsnes ?= -lsnes
LIBS = LIBS =
DEFINES = -I. -DHAVE_SRC -DHAVE_SDL DEFINES = -I.
LDFLAGS = -L. LDFLAGS = -L.
SRC_LIBS = -lsamplerate-0 SRC_LIBS = -lsamplerate-0
@ -18,13 +19,19 @@ SDL_CFLAGS = -ISDL
ifeq ($(HAVE_SRC), 1) ifeq ($(HAVE_SRC), 1)
LIBS += $(SRC_LIBS) LIBS += $(SRC_LIBS)
DEFINES += $(SRC_CFLAGS) DEFINES += $(SRC_CFLAGS) -DHAVE_SRC
endif endif
ifeq ($(HAVE_SDL), 1) ifeq ($(HAVE_SDL), 1)
OBJ += gfx/gl.o input/sdl.o audio/sdl.o audio/buffer.o OBJ += gfx/gl.o input/sdl.o audio/sdl.o audio/buffer.o
LIBS += $(SDL_LIBS) -lopengl32 LIBS += $(SDL_LIBS) -lopengl32
DEFINES += $(SDL_CFLAGS) DEFINES += $(SDL_CFLAGS) -DHAVE_SDL
endif
ifeq ($(HAVE_XML), 1)
OBJ += gfx/shader_glsl.o
DEFINES += $(XML_CFLAGS) -DHAVE_XML
LIBS += -lxml2
endif endif
LIBS += $(libsnes) LIBS += $(libsnes)

1
gfx/shader_glsl.c
View File

@ -30,6 +30,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <libxml/parser.h> #include <libxml/parser.h>
#include <libxml/tree.h> #include <libxml/tree.h>
#include <GL/glext.h>
static PFNGLCREATEPROGRAMPROC glCreateProgram = NULL; static PFNGLCREATEPROGRAMPROC glCreateProgram = NULL;
static PFNGLUSEPROGRAMPROC glUseProgram = NULL; static PFNGLUSEPROGRAMPROC glUseProgram = NULL;