From c6c37da209b69c20d6fd0d9a461b04aa43104e01 Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Wed, 10 Jun 2015 22:29:48 +0200
Subject: [PATCH] fixed shader stuff

---
 tests/gl/Makefile |  7 +++++--
 tests/gl/main.cpp | 10 +++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/tests/gl/Makefile b/tests/gl/Makefile
index 10096a3..4bead5c 100755
--- a/tests/gl/Makefile
+++ b/tests/gl/Makefile
@@ -3,10 +3,13 @@ SRC = main.cpp glshader.cpp math.cpp camera.cpp
 OBJ = $(patsubst %.cpp, $(BUILDDIR)/%.o, $(SRC))
 DEP = $(patsubst %.cpp, $(BUILDDIR)/%.d, $(SRC))
 RWDIR=$(HOME)/src/librw
-LDLIBS=-pthread -lX11 -lXrandr -lXi -lXxf86vm -lGL -lGLEW -lm
+#LDLIBS=-pthread -lX11 -lXrandr -lXi -lXxf86vm -lGL -lGLEW -lm
+#STATICLIBS= $(RWDIR)/librw-opengl.a /usr/local/lib/libglfw3.a
+LDLIBS=-pthread -lGL -lGLEW -lglfw
+STATICLIBS=$(RWDIR)/librw-opengl.a
 CFLAGS=-g -I$(RWDIR) -Wall -Wextra
 
-rwtest: $(OBJ) $(RWDIR)/librw-opengl.a /usr/local/lib/libglfw3.a
+rwtest: $(OBJ) $(STATICLIBS)
 	$(CXX) $^ $(LDLIBS) -o $@
 
 $(BUILDDIR)/%.o: %.cpp
diff --git a/tests/gl/main.cpp b/tests/gl/main.cpp
index e06c570..15adfef 100755
--- a/tests/gl/main.cpp
+++ b/tests/gl/main.cpp
@@ -111,7 +111,6 @@ init(void)
 	glEnable(GL_ALPHA_TEST);
 	glAlphaFunc(GL_GEQUAL, 0.5f);
 	const char *shadersrc =
-		"#version 120\n"
 		"#ifdef VERTEX\n"
 		"uniform mat4 projMat;"
 		"uniform mat4 viewMat;"
@@ -144,11 +143,12 @@ init(void)
 		"	gl_FragColor = v_color*c0;"
 		"}\n"
 		"#endif\n";
-	const char *srcarr[] = { "#define VERTEX", shadersrc };
-	GLint vertshader = rw::gl::compileShader(srcarr, 2, GL_VERTEX_SHADER);
+	const char *srcarr[] = { "#version 120\n",
+		"#define VERTEX\n", shadersrc };
+	GLint vertshader = rw::gl::compileShader(srcarr, 3, GL_VERTEX_SHADER);
 	assert(vertshader != 0);
-	srcarr[0] = "#define FRAGMENT";
-	GLint fragshader = rw::gl::compileShader(srcarr, 2, GL_FRAGMENT_SHADER);
+	srcarr[1] = "#define FRAGMENT\n";
+	GLint fragshader = rw::gl::compileShader(srcarr, 3, GL_FRAGMENT_SHADER);
 	assert(fragshader != 0);
 	program = rw::gl::linkProgram(vertshader, fragshader);
 	assert(program != 0);