Root/libtcod/patches/001-pass-openwrt-CFLAGS.patch

1diff -Naur libtcod-r522/makefiles/makefile-linux libtcod-r522.mod/makefiles/makefile-linux
2--- libtcod-r522/makefiles/makefile-linux 2010-02-12 03:54:10.000000000 +0800
3+++ libtcod-r522.mod/makefiles/makefile-linux 2011-04-20 19:20:36.595075461 +0800
4@@ -6,8 +6,8 @@
5 
6 #dependencies
7 # SDL
8-SDL_FLAGS=`sdl-config --cflags`
9-SDL_LIBS=`sdl-config --libs`
10+SDL_FLAGS?=`sdl-config --cflags`
11+SDL_LIBS?=`sdl-config --libs`
12 
13 # ZLIB
14 ZLIB_FLAGS=
15@@ -16,24 +16,24 @@
16 # PNG
17 PNG_LIBS=-lpng
18 
19-CFLAGS=$(FLAGS) -I$(INCDIR) -I$(INCDIR)/gui -Wall $(SDL_FLAGS) $(ZLIB_FLAGS) $(PNG_FLAGS) -fno-strict-aliasing
20-TEMP=/tmp
21-CC=gcc
22-CPP=g++
23+CFLAGS:=$(CFLAGS) $(FLAGS) -I$(INCDIR) -I$(INCDIR)/gui -Wall $(SDL_FLAGS) $(ZLIB_FLAGS) $(PNG_FLAGS) -fno-strict-aliasing
24+TEMP?=/tmp
25+CC?=gcc
26+CXX?=g++
27 .SUFFIXES: a .o .h .c
28 
29 $(TEMP)/libtcod/release/%.o : $(SRCDIR)/%.c
30     $(CC) $(CFLAGS) -O2 -s -o $@ -c $<
31 $(TEMP)/libtcod/release/%.o : $(SRCDIR)/%.cpp
32- $(CPP) $(CFLAGS) -O2 -s -o $@ -c $<
33+ $(CXX) $(CFLAGS) -O2 -s -o $@ -c $<
34 $(TEMP)/libtcod/release/gui/%.o : $(SRCDIR)/gui/%.cpp
35- $(CPP) $(CFLAGS) -O2 -s -o $@ -c $<
36+ $(CXX) $(CFLAGS) -O2 -s -o $@ -c $<
37 $(TEMP)/libtcod/debug/%.o : $(SRCDIR)/%.c
38     $(CC) $(CFLAGS) -g -o $@ -c $<
39 $(TEMP)/libtcod/debug/%.o : $(SRCDIR)/%.cpp
40- $(CPP) $(CFLAGS) -g -o $@ -c $<
41+ $(CXX) $(CFLAGS) -g -o $@ -c $<
42 $(TEMP)/libtcod/debug/gui/%.o : $(SRCDIR)/gui/%.cpp
43- $(CPP) $(CFLAGS) -g -o $@ -c $<
44+ $(CXX) $(CFLAGS) -g -o $@ -c $<
45 
46 LIBOBJS_C_DEBUG= \
47     $(TEMP)/libtcod/debug/bresenham_c.o \
48@@ -181,28 +181,28 @@
49     mkdir -p $@
50 
51 libtcod.a : $(LIBOBJS_C_DEBUG)
52- ar r $@ $(LIBOBJS_C_DEBUG)
53+ $(AR) r $@ $(LIBOBJS_C_DEBUG)
54 
55 libtcodxx.a : $(LIBOBJS_CPP_DEBUG)
56- ar r $@ $(LIBOBJS_CPP_DEBUG)
57+ $(AR) r $@ $(LIBOBJS_CPP_DEBUG)
58 
59 libtcod.so : $(TEMP)/libtcod/release $(LIBOBJS_C_RELEASE)
60- gcc -shared -Wl,-soname,$@ -o $@ $(LIBOBJS_C_RELEASE) $(ZLIB_LIBS) $(PNG_LIBS) $(SDL_LIBS) $(CFLAGS) $(OPENGL_LIB)
61+ $(CC) -shared -Wl,-soname,$@ -o $@ $(LIBOBJS_C_RELEASE) $(CFLAGS) $(OPENGL_LIB) $(PNG_LIBS) $(SDL_LIBS) $(ZLIB_LIBS)
62 
63 libtcodxx.so : $(TEMP)/libtcod/release $(LIBOBJS_CPP_RELEASE)
64- gcc -shared -Wl,-soname,$@ -o $@ $(LIBOBJS_CPP_RELEASE) -L. -ltcod $(CFLAGS)
65+ $(CC) -shared -Wl,-soname,$@ -o $@ $(LIBOBJS_CPP_RELEASE) -L. -ltcod $(CFLAGS)
66 
67 libtcodgui.so : $(TEMP)/libtcod/release/gui $(GUIOBJS_RELEASE)
68- gcc -shared -Wl,-soname,$@ -o $@ $(GUIOBJS_RELEASE) -L. -ltcod -ltcodxx $(CFLAGS)
69+ $(CC) -shared -Wl,-soname,$@ -o $@ $(GUIOBJS_RELEASE) -L. -ltcod -ltcodxx $(CFLAGS)
70 
71 libtcod_debug.so : $(TEMP)/libtcod/debug $(LIBOBJS_C_DEBUG)
72- gcc -shared -Wl,-soname,$@ -o $@ $(LIBOBJS_C_DEBUG) $(ZLIB_LIBS) $(PNG_LIBS) $(SDL_LIBS) $(CFLAGS) $(OPENGL_LIB)
73+ $(CC) -shared -Wl,-soname,$@ -o $@ $(LIBOBJS_C_DEBUG) $(ZLIB_LIBS) $(PNG_LIBS) $(SDL_LIBS) $(CFLAGS) $(OPENGL_LIB)
74 
75 libtcodxx_debug.so : $(TEMP)/libtcod/debug $(LIBOBJS_CPP_DEBUG)
76- gcc -shared -Wl,-soname,$@ -o $@ $(LIBOBJS_CPP_DEBUG) -L. -ltcod_debug $(CFLAGS)
77+ $(CC) -shared -Wl,-soname,$@ -o $@ $(LIBOBJS_CPP_DEBUG) -L. -ltcod_debug $(CFLAGS)
78 
79 libtcodgui_debug.so : $(TEMP)/libtcod/debug/gui $(GUIOBJS_DEBUG)
80- gcc -shared -Wl,-soname,$@ -o $@ $(GUIOBJS_DEBUG) -L. -ltcod_debug -ltcodxx_debug $(CFLAGS)
81+ $(CC) -shared -Wl,-soname,$@ -o $@ $(GUIOBJS_DEBUG) -L. -ltcod_debug -ltcodxx_debug $(CFLAGS)
82 
83 clean :
84     \rm -f $(LIBOBJS_C_RELEASE) $(LIBOBJS_CPP_RELEASE) $(GUIOBJS_RELEASE) $(LIBOBJS_C_DEBUG) $(LIBOBJS_CPP_DEBUG) $(GUIOBJS_DEBUG) libtcod.a libtcodxx.a libtcod.so libtcodxx.so libtcodgui.so libtcod_debug.so libtcodxx_debug.so libtcodgui_debug.so libtcodpy.pyc
85

Archive Download this file

Branches:
backfire
master
release_2010-11-17
release_2010-12-14
release_2011-02-23
release_2011-05-28
release_2011-08-27
release_2011-11-13
release_2012-03-18
release_2012-04-09
release_2012-07-11
release_2012-10-11



interactive