From 5ecc622524255cdae9af933e99eeb73d8afeeccc Mon Sep 17 00:00:00 2001 From: Themaister Date: Fri, 7 Jan 2011 18:26:19 +0100 Subject: [PATCH] Some additional fixes. Build in libxml2 for shader support. --- Makefile.win32 | 13 ++++++++++--- gfx/shader_glsl.c | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Makefile.win32 b/Makefile.win32 index cd56da6e8e..71b786d5e5 100644 --- a/Makefile.win32 +++ b/Makefile.win32 @@ -6,10 +6,11 @@ CXX = g++ HAVE_SRC = 1 HAVE_SDL = 1 +HAVE_XML = 1 libsnes ?= -lsnes LIBS = -DEFINES = -I. -DHAVE_SRC -DHAVE_SDL +DEFINES = -I. LDFLAGS = -L. SRC_LIBS = -lsamplerate-0 @@ -18,13 +19,19 @@ SDL_CFLAGS = -ISDL ifeq ($(HAVE_SRC), 1) LIBS += $(SRC_LIBS) - DEFINES += $(SRC_CFLAGS) + DEFINES += $(SRC_CFLAGS) -DHAVE_SRC endif ifeq ($(HAVE_SDL), 1) OBJ += gfx/gl.o input/sdl.o audio/sdl.o audio/buffer.o 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 LIBS += $(libsnes) diff --git a/gfx/shader_glsl.c b/gfx/shader_glsl.c index 1aeab39b92..42f39a2012 100644 --- a/gfx/shader_glsl.c +++ b/gfx/shader_glsl.c @@ -30,6 +30,7 @@ #include #include #include +#include static PFNGLCREATEPROGRAMPROC glCreateProgram = NULL; static PFNGLUSEPROGRAMPROC glUseProgram = NULL;