forked from Lainports/freebsd-ports
1bc0763f37
- Update to 14.0 Changes: http://kodi.tv/introducing-kodi-14/ PR: 196299 Differential Revision: https://reviews.freebsd.org/D1900 Submitted by: mickael.maillot@gmail.com (maintainer) Reviewed by: bapt
41 lines
1.4 KiB
Text
41 lines
1.4 KiB
Text
diff --git Makefile.include.in Makefile.include.in
|
|
index 6ee228a..daeb046 100644
|
|
--- Makefile.include.in
|
|
+++ Makefile.include.in
|
|
@@ -43,7 +43,8 @@ INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.gui
|
|
INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.addon
|
|
INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.pvr
|
|
INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.codec
|
|
-INCLUDES+=$(sort @INCLUDES@)
|
|
+#INCLUDES+=$(sort @INCLUDES@)
|
|
+INCLUDES+=@INCLUDES@
|
|
INCLUDES+=-I@abs_top_srcdir@/xbmc/linux
|
|
INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
|
|
DEFINES+= \
|
|
@@ -91,22 +92,22 @@ GEN_DEPS=\
|
|
|
|
%.o: %.cpp
|
|
@rm -f $@
|
|
- $(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
|
|
+ $(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(DEFINES) $(INCLUDES) $(CXXFLAGS) $< -o $@ \
|
|
&& $(GEN_DEPS)
|
|
|
|
%.o: %.cc
|
|
@rm -f $@
|
|
- $(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
|
|
+ $(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(DEFINES) $(INCLUDES) $(CXXFLAGS) $< -o $@ \
|
|
&& $(GEN_DEPS)
|
|
|
|
%.o: %.c
|
|
@rm -f $@
|
|
- $(SILENT_CC) $(CC) -MF $*.d -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
|
|
+ $(SILENT_CC) $(CC) -MF $*.d -MD -c $(DEFINES) $(INCLUDES) $(CFLAGS) $< -o $@ \
|
|
&& $(GEN_DEPS)
|
|
|
|
%.o: %.C
|
|
@rm -f $@
|
|
- $(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
|
|
+ $(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(DEFINES) $(INCLUDES) $(CFLAGS) $< -o $@ \
|
|
&& $(GEN_DEPS)
|
|
|
|
%.o: %.S
|