projects/guix·blob python-team · refs

57 lines · 1.7 KiB

1Downloaded from https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/kiki-the-nano-bot/debian/patches/Makefile.patch?revision=15681&view=co
2
3Makefile fixes:
4 - Make CXXFLAGS, CPPFLAGS, LDFLAGS available for user-specified flags.
5 - run SWIG before compiling
6
7Peter De Wachter ([email protected])
8placed in the public domain
9
10--- a/kodilib/linux/Makefile
11+++ b/kodilib/linux/Makefile
12@@ -21,7 +21,7 @@
13
14 INCLUDES = $(KODI_INCLUDES) $(X11_INCLUDES) $(SDL_INCLUDES)
15
16-CXXFLAGS = $(INCLUDES) $(SDL_CFLAGS)
17+CXXOPTS = -Wall $(INCLUDES) $(SDL_CFLAGS) $(CPPFLAGS) $(CXXFLAGS)
18
19 src = \
20 $(KODISRCDIR)/handler/KEventHandler.cpp \
21@@ -95,4 +95,4 @@
22 $(RM) -f $(obj) libkodi.a
23
24 %.o: %.cpp
25- $(CXX) -c $(CXXFLAGS) -o $@ $<
26+ $(CXX) -c $(CXXOPTS) -o $@ $<
27--- a/linux/Makefile
28+++ b/linux/Makefile
29@@ -46,7 +46,7 @@
30
31 INCLUDES = $(KIKI_INCLUDES) $(X11_INCLUDES) $(PYTHON_INCLUDES)
32
33-CXXFLAGS = $(INCLUDES) $(SDLCFLAGS)
34+CXXOPTS = -Wall $(INCLUDES) $(SDLCFLAGS) $(CPPFLAGS) $(CXXFLAGS)
35
36 src = \
37 $(KIKISRC)/base/KikiAction.cpp \
38@@ -105,8 +105,10 @@
39 obj = $(src:.cpp=.o)
40
41 kiki: $(KIKISRC)/../SWIG/KikiPy_wrap.cpp $(obj)
42- -(cd ../SWIG; swig -c++ -python -globals kiki -o KikiPy_wrap.cpp KikiPy.i; cp kiki.py ../py)
43- $(CXX) $(obj) $(KODILIB) -o kiki $(GLLIBS) $(SDLLIBS) $(PYTHONLIBS)
44+ $(CXX) $(LDFLAGS) $(obj) $(KODILIB) -o kiki $(GLLIBS) $(SDLLIBS) $(PYTHONLIBS)
45+
46+$(KIKISRC)/../SWIG/KikiPy_wrap.cpp: $(wildcard ../SWIG/*.i)
47+ (cd ../SWIG && swig -c++ -python -globals kiki -DSWIG_PYTHON_LEGACY_BOOL -o KikiPy_wrap.cpp KikiPy.i && cp kiki.py ../py)
48
49 obj-clean:
50 $(RM) -f $(obj)
51@@ -115,5 +117,5 @@
52 $(RM) -f $(obj) kiki
53
54 %.o: %.cpp
55- $(CXX) -c $(CXXFLAGS) -o $@ $<
56+ $(CXX) -c $(CXXOPTS) -o $@ $<
57