Changed the output names of SFML libraries in projects/makefiles (sfml-xxx -> sfml2-xxx)
Fixed OpenAL include path in Linux makefiles git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1555 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
parent
3ba0e73719
commit
8525a7cb92
44 changed files with 252 additions and 252 deletions
|
@ -1,17 +1,17 @@
|
|||
SRC = $(wildcard $(SRCROOT)/Audio/*.cpp)
|
||||
OBJ = $(SRC:.cpp=.o)
|
||||
LIB = libsfml-audio.so
|
||||
LIB = libsfml2-audio.so
|
||||
LIBNAME = $(LIB).$(VERSION)
|
||||
FULLLIBNAME = $(LIBPATH)/$(LIBNAME)
|
||||
LINK = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB)
|
||||
LINK = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB)
|
||||
|
||||
all: $(LIB)
|
||||
|
||||
libsfml-audio.so: $(OBJ)
|
||||
libsfml2-audio.so: $(OBJ)
|
||||
$(CPP) $(LDFLAGS) -Wl,-soname,$(LIBNAME) -o $(FULLLIBNAME) $(OBJ) -lsndfile -lopenal
|
||||
|
||||
$(OBJ): %.o: %.cpp
|
||||
$(CPP) -o $@ -c $< $(CFLAGS)
|
||||
$(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/AL
|
||||
|
||||
.PHONY: clean mrproper
|
||||
|
||||
|
@ -22,6 +22,6 @@ mrproper: clean
|
|||
rm -rf $(FULLLIBNAME)
|
||||
|
||||
install:
|
||||
objcopy --only-keep-debug $(FULLLIBNAME) $(DESTDBGDIR)/$(LIBNAME)
|
||||
objcopy --only-keep-debug $(FULLLIBNAME) $(DESTDBGDIR)/$(LIBNAME)
|
||||
objcopy --strip-unneeded $(FULLLIBNAME) $(DESTLIBDIR)/$(LIBNAME)
|
||||
$(LINK)
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
SRC = $(wildcard $(SRCROOT)/Graphics/*.cpp $(SRCROOT)/Graphics/Linux/*.cpp)
|
||||
OBJ = $(SRC:.cpp=.o)
|
||||
LIB = libsfml-graphics.so
|
||||
LIB = libsfml2-graphics.so
|
||||
LIBNAME = $(LIB).$(VERSION)
|
||||
FULLLIBNAME = $(LIBPATH)/$(LIBNAME)
|
||||
LINK = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB)
|
||||
|
||||
all: $(LIB)
|
||||
|
||||
libsfml-graphics.so: $(OBJ)
|
||||
libsfml2-graphics.so: $(OBJ)
|
||||
$(CPP) $(LDFLAGS) -Wl,-soname,$(LIBNAME) -o $(FULLLIBNAME) $(OBJ) -lGLEW -ljpeg -lfreetype -lX11 -lGL
|
||||
|
||||
$(OBJ): %.o: %.cpp
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
SRC = $(wildcard $(SRCROOT)/Network/*.cpp $(SRCROOT)/Network/Unix/*.cpp)
|
||||
OBJ = $(SRC:.cpp=.o)
|
||||
LIB = libsfml-network.so
|
||||
LIB = libsfml2-network.so
|
||||
LIBNAME = $(LIB).$(VERSION)
|
||||
FULLLIBNAME = $(LIBPATH)/$(LIBNAME)
|
||||
LINK = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB)
|
||||
LINK = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB)
|
||||
|
||||
all: $(LIB)
|
||||
|
||||
libsfml-network.so: $(OBJ)
|
||||
libsfml2-network.so: $(OBJ)
|
||||
$(CPP) $(LDFLAGS) -Wl,-soname,$(LIBNAME) -o $(FULLLIBNAME) $(OBJ)
|
||||
|
||||
$(OBJ): %.o: %.cpp
|
||||
|
@ -22,6 +22,6 @@ mrproper: clean
|
|||
rm -rf $(FULLLIBNAME)
|
||||
|
||||
install:
|
||||
objcopy --only-keep-debug $(FULLLIBNAME) $(DESTDBGDIR)/$(LIBNAME)
|
||||
objcopy --only-keep-debug $(FULLLIBNAME) $(DESTDBGDIR)/$(LIBNAME)
|
||||
objcopy --strip-unneeded $(FULLLIBNAME) $(DESTLIBDIR)/$(LIBNAME)
|
||||
$(LINK)
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
SRC = $(wildcard $(SRCROOT)/System/*.cpp $(SRCROOT)/System/Unix/*.cpp)
|
||||
OBJ = $(SRC:.cpp=.o)
|
||||
LIB = libsfml-system.so
|
||||
LIB = libsfml2-system.so
|
||||
LIBNAME = $(LIB).$(VERSION)
|
||||
FULLLIBNAME = $(LIBPATH)/$(LIBNAME)
|
||||
LINK = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB)
|
||||
LINK = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB)
|
||||
|
||||
all: $(LIB)
|
||||
|
||||
libsfml-system.so: $(OBJ)
|
||||
libsfml2-system.so: $(OBJ)
|
||||
$(CPP) $(LDFLAGS) -Wl,-soname,$(LIBNAME) -o $(FULLLIBNAME) $(OBJ) -lpthread
|
||||
|
||||
$(OBJ): %.o: %.cpp
|
||||
|
@ -22,6 +22,6 @@ mrproper: clean
|
|||
rm -rf $(FULLLIBNAME)
|
||||
|
||||
install:
|
||||
objcopy --only-keep-debug $(FULLLIBNAME) $(DESTDBGDIR)/$(LIBNAME)
|
||||
objcopy --only-keep-debug $(FULLLIBNAME) $(DESTDBGDIR)/$(LIBNAME)
|
||||
objcopy --strip-unneeded $(FULLLIBNAME) $(DESTLIBDIR)/$(LIBNAME)
|
||||
$(LINK)
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
SRC = $(wildcard $(SRCROOT)/Window/*.cpp $(SRCROOT)/Window/Linux/*.cpp)
|
||||
OBJ = $(SRC:.cpp=.o)
|
||||
LIB = libsfml-window.so
|
||||
LIB = libsfml2-window.so
|
||||
LIBNAME = $(LIB).$(VERSION)
|
||||
FULLLIBNAME = $(LIBPATH)/$(LIBNAME)
|
||||
LINK = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB)
|
||||
LINK = $(LN) $(LNFLAGS) $(LIBNAME) $(DESTLIBDIR)/$(LIB)
|
||||
|
||||
all: $(LIB)
|
||||
|
||||
libsfml-window.so: $(OBJ)
|
||||
libsfml2-window.so: $(OBJ)
|
||||
$(CPP) $(LDFLAGS) -Wl,-soname,$(LIBNAME) -o $(FULLLIBNAME) $(OBJ) -lX11 -lXrandr -lGL
|
||||
|
||||
$(OBJ): %.o: %.cpp
|
||||
|
@ -22,6 +22,6 @@ mrproper: clean
|
|||
rm -rf $(FULLLIBNAME)
|
||||
|
||||
install:
|
||||
objcopy --only-keep-debug $(FULLLIBNAME) $(DESTDBGDIR)/$(LIBNAME)
|
||||
objcopy --only-keep-debug $(FULLLIBNAME) $(DESTDBGDIR)/$(LIBNAME)
|
||||
objcopy --strip-unneeded $(FULLLIBNAME) $(DESTLIBDIR)/$(LIBNAME)
|
||||
$(LINK)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue