| 1 |
mr_bones_ 09/01/21 20:22:08 |
| 2 |
|
| 3 |
Added: sable-1.0-gentoo.patch |
| 4 |
Log: |
| 5 |
add use-based dep; add build patch to use the toolchain programs |
| 6 |
(Portage version: 2.1.6.4/cvs/Linux 2.6.27.8 i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 games-arcade/sable/files/sable-1.0-gentoo.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/sable/files/sable-1.0-gentoo.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/sable/files/sable-1.0-gentoo.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: sable-1.0-gentoo.patch |
| 15 |
=================================================================== |
| 16 |
diff -ru sable.orig/src/Makefile sable/src/Makefile |
| 17 |
--- sable.orig/src/Makefile 2006-03-14 00:57:31.000000000 -0500 |
| 18 |
+++ sable/src/Makefile 2009-01-21 15:15:02.000000000 -0500 |
| 19 |
@@ -1,30 +1,10 @@ |
| 20 |
-# are we on OSX? |
| 21 |
-ifeq ($(shell uname), Darwin) |
| 22 |
-OSX:=1 |
| 23 |
-endif |
| 24 |
- |
| 25 |
-# C options |
| 26 |
-CC = gcc |
| 27 |
-NOOSXFLAGS = -c `sdl-config --cflags` -O2 -Wall -DSABLE_RESOURCEDIR=\"$(INSTALL_RESDIR)/sable/\" -Iinclude $(CFLAGS) |
| 28 |
-ifdef OSX |
| 29 |
-FLAGS = $(NOOSXFLAGS) -D_SABLE_OSX_ |
| 30 |
-else |
| 31 |
-FLAGS = $(NOOSXFLAGS) |
| 32 |
-endif |
| 33 |
- |
| 34 |
-# C++ options. |
| 35 |
-CXX = g++ |
| 36 |
-CXXFLAGS = $(FLAGS) |
| 37 |
+NOOSXFLAGS = -c `sdl-config --cflags` -DSABLE_RESOURCEDIR=\"$(INSTALL_RESDIR)/sable/\" -Iinclude |
| 38 |
+ |
| 39 |
+CFLAGS += $(NOOSXFLAGS) |
| 40 |
+CXXFLAGS += $(NOOSXFLAGS) |
| 41 |
|
| 42 |
# Linker options. |
| 43 |
-LD = g++ |
| 44 |
-LDFLAGS = |
| 45 |
-NOOSXLIBS = -lSDL_image -lSDL_mixer |
| 46 |
-ifdef OSX |
| 47 |
-LIBS = `sdl-config --static-libs` $(NOOSXLIBS) |
| 48 |
-else |
| 49 |
-LIBS = `sdl-config --libs` $(NOOSXLIBS) -lGL -lGLU |
| 50 |
-endif |
| 51 |
+LIBS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lGL -lGLU |
| 52 |
|
| 53 |
COBJS = vcontrol/vcontrol.o \ |
| 54 |
bcplrandom.o \ |
| 55 |
@@ -35,7 +15,7 @@ |
| 56 |
OBJS = $(COBJS) $(CXXOBJS) |
| 57 |
|
| 58 |
sable: $(OBJS) |
| 59 |
- $(LD) $(LDFLAGS) -o sable $(OBJS) $(LIBS) |
| 60 |
+ $(CXX) $(LDFLAGS) -o sable $(OBJS) $(LIBS) |
| 61 |
|
| 62 |
clean: |
| 63 |
rm -f sable *.o vcontrol/*.o svaf/*.o |
| 64 |
@@ -44,7 +24,7 @@ |
| 65 |
find . -name \*.c\* | xargs makedepend -Y. -Iinclude >& /dev/null |
| 66 |
|
| 67 |
$(COBJS): %.o: %.c |
| 68 |
- $(CC) $(FLAGS) -o $@ $< |
| 69 |
+ $(CC) $(CFLAGS) -o $@ $< |
| 70 |
|
| 71 |
$(CXXOBJS): %.o: %.cpp |
| 72 |
$(CXX) $(CXXFLAGS) -o $@ $< |
Archives