From 7aabc3c3c173cbf67ac82523622ed0287f45bef8 Mon Sep 17 00:00:00 2001 From: laurentgom Date: Wed, 11 Nov 2009 09:55:11 +0000 Subject: [PATCH] Fixed the Shader sample on Linux git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1272 4e206d99-4929-0410-ac5d-dfc041789085 --- samples/Makefile | 2 +- samples/shader/Makefile | 2 +- samples/shader/Shader.cpp | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/samples/Makefile b/samples/Makefile index f3824ba33..3fe0cfd0c 100644 --- a/samples/Makefile +++ b/samples/Makefile @@ -10,7 +10,7 @@ export CFLAGS = -W -Wall -ansi -I../../include $(DEBUGFLAGS) export LDFLAGS = export EXECPATH = ../bin -all: ftp-sample opengl-sample pong-sample shader-sample qt-sample sockets-sample sound-sample sound_capture-sample voip-sample window-sample wxwidgets-sample X11-sample +all: ftp-sample opengl-sample pong-sample qt-sample shader-sample sockets-sample sound-sample sound_capture-sample voip-sample window-sample wxwidgets-sample X11-sample ftp-sample: @(mkdir -p bin) diff --git a/samples/shader/Makefile b/samples/shader/Makefile index 3ff6b5d29..9b3f7f79a 100644 --- a/samples/shader/Makefile +++ b/samples/shader/Makefile @@ -3,7 +3,7 @@ OBJ = Shader.o all: $(EXEC) -post-fx: $(OBJ) +shader: $(OBJ) $(CC) $(LDFLAGS) -o $(EXECPATH)/$@ $(OBJ) -lsfml-graphics -lsfml-window -lsfml-system %.o: %.cpp diff --git a/samples/shader/Shader.cpp b/samples/shader/Shader.cpp index 2b7d9c760..a6427a86b 100644 --- a/samples/shader/Shader.cpp +++ b/samples/shader/Shader.cpp @@ -187,7 +187,8 @@ int main() case sf::Key::Numpad2 : entityShader.GotoPrevious(); break; case sf::Key::Numpad5 : entityShader.GotoNext(); break; case sf::Key::Numpad3 : globalShader.GotoPrevious(); break; - case sf::Key::Numpad6 : globalShader.GotoNext(); break; + case sf::Key::Numpad6 : globalShader.GotoNext(); break; + default : break; } // Update the text