[SCM] Simple and fast multimedia library for C++ branch, master, updated. upstream/1.2-8-g5fb5c03
Christoph Egger
Christoph.Egger at gmx.de
Thu May 22 21:04:49 UTC 2008
The following commit has been merged in the master branch:
commit cbd4100216b953bf4d670834bb62b466d4d3994b
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date: Thu May 22 21:33:20 2008 +0200
* Modifying makefiles in respect to repackage
diff --git a/src/SFML/Audio/Makefile b/src/SFML/Audio/Makefile
index cd42686..8e136d7 100755
--- a/src/SFML/Audio/Makefile
+++ b/src/SFML/Audio/Makefile
@@ -1,13 +1,13 @@
LIB = libsfml-audio.so
SRC = $(wildcard *.cpp)
-SRCVORBIS = $(wildcard ./stb_vorbis/*.c)
+#SRCVORBIS = $(wildcard ./stb_vorbis/*.c)
OBJ = $(SRC:.cpp=.o)
-OBJVORBIS = $(SRCVORBIS:.c=.o)
+#OBJVORBIS = $(SRCVORBIS:.c=.o)
all: $(LIB)
libsfml-audio.so: $(OBJ) $(OBJVORBIS)
- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ) $(OBJVORBIS) -lsndfile -lopenal
+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ) -lvorbisfile -lsndfile -lopenal
$(OBJ): %.o: %.cpp
$(CPP) -o $@ -c $< $(CFLAGS)
diff --git a/src/SFML/Graphics/Makefile b/src/SFML/Graphics/Makefile
index a74f6ca..22ee940 100755
--- a/src/SFML/Graphics/Makefile
+++ b/src/SFML/Graphics/Makefile
@@ -1,24 +1,24 @@
LIB = libsfml-graphics.so
SRC = $(wildcard *.cpp)
-SRCJPEG = $(wildcard ./libjpeg/*.c)
-SRCPNG = $(wildcard ./libpng/*.c)
+#SRCJPEG = $(wildcard ./libjpeg/*.c)
+#SRCPNG = $(wildcard ./libpng/*.c)
SRCSOIL = $(wildcard ./SOIL/*.c)
-SRCZLIB = $(wildcard ./zlib/*.c)
+#SRCZLIB = $(wildcard ./zlib/*.c)
OBJ = $(SRC:.cpp=.o)
-OBJJPEG = $(SRCJPEG:.c=.o)
-OBJPNG = $(SRCPNG:.c=.o)
+#OBJJPEG = $(SRCJPEG:.c=.o)
+#OBJPNG = $(SRCPNG:.c=.o)
OBJSOIL = $(SRCSOIL:.c=.o)
-OBJZLIB = $(SRCZLIB:.c=.o)
+#OBJZLIB = $(SRCZLIB:.c=.o)
all: $(LIB)
libsfml-graphics.so: $(OBJ) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype
+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ) -ljpeg-lpng $(OBJSOIL) -lz -lfreetype
$(OBJ): %.o: %.cpp
$(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
-$(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c
+$(OBJSOIL): %.o: %.c
$(CC) -o $@ -c $< $(CFLAGSEXT)
.PHONY: clean mrproper
diff --git a/src/SFML/Window/Makefile b/src/SFML/Window/Makefile
index e7a6bc6..f7821fd 100755
--- a/src/SFML/Window/Makefile
+++ b/src/SFML/Window/Makefile
@@ -1,24 +1,24 @@
LIB = libsfml-window.so
SRC = $(wildcard *.cpp ./Linux/*.cpp)
-SRCGLEW = $(wildcard ./glew/*.c)
+#SRCGLEW = $(wildcard ./glew/*.c)
OBJ = $(SRC:.cpp=.o)
-OBJGLEW = $(SRCGLEW:.c=.o)
+#OBJGLEW = $(SRCGLEW:.c=.o)
all: $(LIB)
libsfml-window.so: $(OBJ) $(OBJGLEW)
- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ) $(OBJGLEW) -lX11 -lXrandr -lGL
+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ) -lGLEW -lX11 -lXrandr -lGL
$(OBJ): %.o: %.cpp
$(CPP) -o $@ -c $< $(CFLAGS)
-$(OBJGLEW): %.o: %.c
- $(CC) -o $@ -c $< $(CFLAGSEXT) -DGLEW_BUILD
+#$(OBJGLEW): %.o: %.c
+# $(CC) -o $@ -c $< $(CFLAGSEXT) -DGLEW_BUILD
.PHONY: clean mrproper
clean:
- @rm -rf $(OBJ) $(OBJGLEW)
+ @rm -rf $(OBJ)# $(OBJGLEW)
mrproper: clean
@rm -rf $(LIBPATH)/$(LIB)
--
Simple and fast multimedia library for C++
More information about the Pkg-games-commits
mailing list