packages: stratagus/stratagus-flags.patch - don't drop original libs

lisu lisu at pld-linux.org
Fri Dec 10 16:32:03 CET 2010


Author: lisu                         Date: Fri Dec 10 15:32:03 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't drop original libs

---- Files affected:
packages/stratagus:
   stratagus-flags.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/stratagus/stratagus-flags.patch
diff -u packages/stratagus/stratagus-flags.patch:1.2 packages/stratagus/stratagus-flags.patch:1.3
--- packages/stratagus/stratagus-flags.patch:1.2	Fri Dec 10 16:21:16 2010
+++ packages/stratagus/stratagus-flags.patch	Fri Dec 10 16:31:58 2010
@@ -1,6 +1,15 @@
 --- stratagus-2.2.5.5/Makefile~	2010-11-20 12:24:07.000000000 +0100
-+++ stratagus-2.2.5.5/Makefile	2010-12-10 16:14:51.353532334 +0100
-@@ -73,7 +73,7 @@
++++ stratagus-2.2.5.5/Makefile	2010-12-10 16:29:17.486865668 +0100
+@@ -63,6 +63,8 @@
+ SRC_ALL = $(SRC)
+ OBJ_ALL = $(OBJ)
+ 
++LIBS=$(LDFLAGS)
++
+ .SUFFIXES: .cpp .o
+ 
+ .PHONY:	make-objdir all-src
+@@ -73,7 +75,7 @@
  	@mkdir -p $(dir $(OBJ))
  
  %.o: $(@D)../%.cpp $(RULESFILE)
@@ -9,12 +18,12 @@
  
  help:
  	@-echo "make cycle			clean,depend,tags,all"
-@@ -102,14 +102,14 @@
+@@ -102,14 +104,14 @@
  all-src: make-objdir $(OBJ)
  
  stratagus: $(OBJ) 
 -	$(CXX) -o $(OUTFILE) $^ $(CXXFLAGS) $(LDFLAGS)
-+	$(CXX) $(OPTFLAGS) $(CXXFLAGS) -o $(OUTFILE) $^ $(LDFLAGS)
++	$(CXX) $(OPTFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $(OUTFILE) $^ $(LIBS)
  
  strip:
  	@if [ -f $(OUTFILE) ]; then $(STRIP) $(OUTFILE); fi
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/stratagus/stratagus-flags.patch?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list