| 1 |
mr_bones_ 10/05/03 23:56:21 |
| 2 |
|
| 3 |
Added: powder-113-make.patch |
| 4 |
Log: |
| 5 |
initial commit - ebuild and patch submitted by Sergey Zasenko via bug #256768 with additional help from Anton Romanov |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 games-roguelike/powder/files/powder-113-make.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-roguelike/powder/files/powder-113-make.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-roguelike/powder/files/powder-113-make.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: powder-113-make.patch |
| 15 |
=================================================================== |
| 16 |
--- powder110_src/make/makerules.origin 2009-01-29 00:32:32.141421840 +0200 |
| 17 |
+++ powder110_src/make/makerules 2009-01-29 00:27:37.128428046 +0200 |
| 18 |
@@ -1,11 +1,11 @@ |
| 19 |
.cpp.o: |
| 20 |
- g++ -O3 -I . -DLINUX -c $< -o $@ $(CXXFLAGS) |
| 21 |
+ $(CXX) -I . -DLINUX -c $< -o $@ $(CXXFLAGS) |
| 22 |
|
| 23 |
all: $(TARGET) |
| 24 |
|
| 25 |
$(TARGET): $(OFILES) |
| 26 |
- g++ -O3 -o $(TARGET) $(OFILES) $(CXXFLAGS) |
| 27 |
+ $(CXX) -o $(TARGET) $(OFILES) $(CXXFLAGS) |
| 28 |
|
| 29 |
clean: |
| 30 |
- rm -f *.o |
| 31 |
- rm -f $(TARGET) |
| 32 |
+ $(RM) *.o |
| 33 |
+ $(RM) $(TARGET) |
| 34 |
--- powder110_src/make/makerules.LINUX.origin 2009-01-28 21:59:57.499759608 +0200 |
| 35 |
+++ powder110_src/make/makerules.LINUX 2009-01-29 00:27:34.747275321 +0200 |
| 36 |
@@ -1,5 +1,5 @@ |
| 37 |
.cpp.o: |
| 38 |
- g++ -O3 -DLINUX -I ../../port/sdl `sdl-config --cflags` -c $< -o $@ $(CXXFLAGS) |
| 39 |
+ $(CXX) -DLINUX -I ../../port/sdl `sdl-config --cflags` -c $< -o $@ $(CXXFLAGS) |
| 40 |
|
| 41 |
all: $(TARGET) |
| 42 |
|
| 43 |
@@ -8,10 +8,10 @@ |
| 44 |
# http://www.trilithium.com/johan/2005/06/static-libstdc/ |
| 45 |
# and is to try and ensure we end up with a static link |
| 46 |
# of stdc++. |
| 47 |
- rm -f libstdc++.a |
| 48 |
+ $(RM) libstdc++.a |
| 49 |
ln -s `g++ -print-file-name=libstdc++.a` |
| 50 |
- g++ -O3 -static-libgcc -L. -o $(TARGET) $(OFILES) `sdl-config --libs` $(CXXFLAGS) |
| 51 |
+ $(CXX) -static-libgcc -L. -o $(TARGET) $(OFILES) `sdl-config --libs` $(CXXFLAGS) |
| 52 |
|
| 53 |
clean: |
| 54 |
- rm -f *.o |
| 55 |
- rm -f $(TARGET) |
| 56 |
+ $(RM) *.o |
| 57 |
+ $(RM) $(TARGET) |
| 58 |
--- powder110_src/port/linux/Makefile.orig 2008-01-14 04:28:15.000000000 +0200 |
| 59 |
+++ powder110_src/port/linux/Makefile 2009-01-29 02:19:52.018078431 +0200 |
| 60 |
@@ -38,19 +38,54 @@ |
| 61 |
../../gfx/all_bitmaps.o \ |
| 62 |
../../rooms/allrooms.o |
| 63 |
|
| 64 |
-include ../../make/makerules.LINUX |
| 65 |
+PREMAKE_TRG = ../../support/map2c/map2c \ |
| 66 |
+ ../../support/tile2c/tile2c \ |
| 67 |
+ ../../support/bmp2c/bmp2c \ |
| 68 |
+ ../../support/encyclopedia2c/encyclopedia2c \ |
| 69 |
+ ../../support/enummaker/enummaker\ |
| 70 |
+ ../../support/txt2c/txt2c |
| 71 |
|
| 72 |
-clean: |
| 73 |
- cd ../.. ; rm -f *.o |
| 74 |
- cd ../../gfx ; rm -f *.o |
| 75 |
- rm -f *.o |
| 76 |
- cd ../sdl ; rm -f *.o |
| 77 |
- rm -f $(TARGET) |
| 78 |
+all: $(TARGET) |
| 79 |
+ |
| 80 |
+ |
| 81 |
+$(PREMAKE_TRG): |
| 82 |
+ $(MAKE) -C `dirname $@` |
| 83 |
|
| 84 |
-premake: |
| 85 |
+premake: $(PREMAKE_TRG) |
| 86 |
cd ../../rooms ; ./buildrooms.bash |
| 87 |
cd ../../gfx ; ./rebuild.sh |
| 88 |
cd ../.. ; support/enummaker/enummaker source.txt |
| 89 |
cd ../.. ; support/txt2c/txt2c LICENSE.TXT license.cpp |
| 90 |
cd ../.. ; support/txt2c/txt2c CREDITS.TXT credits.cpp |
| 91 |
cd ../.. ; support/encyclopedia2c/encyclopedia2c encyclopedia.txt |
| 92 |
+ |
| 93 |
+$(OFILES): premake |
| 94 |
+ $(CXX) -DLINUX -I ../../port/sdl `sdl-config --cflags` -c $(patsubst %.o,%.cpp,$@) -o $@ $(CXXFLAGS) |
| 95 |
+ |
| 96 |
+$(TARGET): $(OFILES) |
| 97 |
+ $(CXX) -o $@ $(OFILES) `sdl-config --libs` $(CXXFLAGS) |
| 98 |
+ |
| 99 |
+$(TARGET)-static: $(OFILES) |
| 100 |
+ # This extra step is from: |
| 101 |
+ # http://www.trilithium.com/johan/2005/06/static-libstdc/ |
| 102 |
+ # and is to try and ensure we end up with a static link |
| 103 |
+ # of stdc++. |
| 104 |
+ $(RM) libstdc++.a |
| 105 |
+ ln -s `g++ -print-file-name=libstdc++.a` |
| 106 |
+ $(CXX) -static-libgcc -L. -o $@ $(OFILES) `sdl-config --libs` $(CXXFLAGS) |
| 107 |
+ |
| 108 |
+clean: |
| 109 |
+ $(RM) *.o $(TARGET) libstdc++.a |
| 110 |
+ cd ../../; $(RM) credits.cpp encyclopedia.cpp encyclopedia.h glbdef.cpp glbdef.h license.cpp |
| 111 |
+ cd ../../gfx; $(RM) |
| 112 |
+ cd ../../gfx; $(RM) icon_sdl.bmp.c slug_and_blood.bmp.c slug_and_blood_hires.bmp.c classic/*.c adambolt/*.c nethack/*.c ascii/*.c akoimeexx/*.c |
| 113 |
+ cd ../../rooms/; $(RM) *.cpp allrooms.h allrooms.o |
| 114 |
+ $(RM) |
| 115 |
+ $(RM) ../../*.o |
| 116 |
+ $(RM) ../../gfx/*.o |
| 117 |
+ $(RM) ../sdl/*.o |
| 118 |
+ @for trgt in $$( echo "$(PREMAKE_TRG)" | tr -s ' ' '\n' ); do \ |
| 119 |
+ $(MAKE) clean -C `dirname $$trgt` ; \ |
| 120 |
+ done; |
| 121 |
+ |
| 122 |
+.PHONY: all clean premake |
Archives