The following commit has been merged in the master branch:
commit d02f1c74a7fa68251c42e90b32aa300ba001e84b
Merge: b6ab8a49c0b8cad01be3f047dea311f522aeb99c
a96b4da2ed67a3e8dcc8e2a0d9af9463a23bb021
Author: Christoph Egger <[EMAIL PROTECTED]>
Date: Sun Jun 22 12:00:53 2008 +0200
Merge branch 'upstream'
diff --combined samples/window/Makefile
index ed6932e,6aa0abc..6aa0abc
mode 100644,100755..100644
--- a/samples/window/Makefile
+++ b/samples/window/Makefile
@@@ -4,7 -4,7 +4,7 @@@ OBJ = Window.
all: $(EXEC)
window: $(OBJ)
- $(CC) $(LDFLAGS) -o $(EXECPATH)/$@ $(OBJ) -lsfml-window -lsfml-system
-lGLU -lGL
+ $(CC) $(LDFLAGS) -o $(EXECPATH)/$@ $(OBJ) -lsfml-window -lsfml-system
-lGLU
%.o: %.cpp
$(CC) -o $@ -c $< $(CFLAGS)
--
Simple and fast multimedia library for C++
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
