blob: b3798678f81a8a2782cb5721faa4726097c1370b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
--- kodilib/linux/Makefile
+++ kodilib/linux/Makefile
@@ -21,7 +21,7 @@
INCLUDES = $(KODI_INCLUDES) $(X11_INCLUDES) $(SDL_INCLUDES)
-CXXFLAGS = $(INCLUDES) $(SDL_CFLAGS)
+CXXFLAGS += $(INCLUDES) $(SDL_CFLAGS)
src = \
$(KODISRCDIR)/handler/KEventHandler.cpp \
--- linux/Makefile
+++ linux/Makefile
@@ -14,11 +14,7 @@
GLLIBS = -lglut -lGLU -lGL
-PYTHONHOME = /usr/lib/python$(PYTHON_VERSION)/
-PYTHONLIBS = $(PYTHONHOME)/config/libpython$(PYTHON_VERSION).a -lutil \
- $(PYTHONHOME)/lib-dynload/math.so \
- $(PYTHONHOME)/lib-dynload/time.so \
- $(PYTHONHOME)/lib-dynload/_random.so
+PYTHONLIBS = -lpython$(PYTHON_VERSION) -lutil
# change this, if the kodilib directory isn't parallel to the kiki directory
@@ -46,7 +42,7 @@
INCLUDES = $(KIKI_INCLUDES) $(X11_INCLUDES) $(PYTHON_INCLUDES)
-CXXFLAGS = $(INCLUDES) $(SDLCFLAGS)
+CXXFLAGS += $(INCLUDES) $(SDLCFLAGS)
src = \
$(KIKISRC)/base/KikiAction.cpp \
@@ -105,8 +101,7 @@
obj = $(src:.cpp=.o)
kiki: $(KIKISRC)/../SWIG/KikiPy_wrap.cpp $(obj)
- -(cd ../SWIG; swig -c++ -python -globals kiki -o KikiPy_wrap.cpp KikiPy.i; cp kiki.py ../py)
- $(CXX) $(obj) $(KODILIB) -o kiki $(GLLIBS) $(SDLLIBS) $(PYTHONLIBS)
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(obj) $(KODILIB) -o kiki $(GLLIBS) $(SDLLIBS) $(PYTHONLIBS)
obj-clean:
$(RM) -f $(obj)
|
GitWeb
