Permalink
Browse files

pvr: fix build after external tinyxml changes. credits @mikrohard

  • Loading branch information...
1 parent 1fd9686 commit c5a46b7e42a33a6e0d02ae6d780849d86cdaae86 Lars Op den Kamp committed Jun 14, 2012
@@ -25,7 +25,7 @@
#include "guilib/GUIFontManager.h"
#include "guilib/LocalizeStrings.h"
#include "guilib/DirtyRegion.h"
-#include "lib/tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
#include "utils/log.h"
#include "utils/Variant.h"
#include "threads/SystemClock.h"
@@ -1,7 +1,7 @@
#include "GetChannelListResult.h"
#include <stdlib.h>
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
#include "utils/log.h"
GetChannelListResult::GetChannelListResult() {
@@ -8,7 +8,7 @@
#include "GetNumChannelsResult.h"
#include <stdlib.h>
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
#include "utils/log.h"
GetNumChannelsResult::GetNumChannelsResult() {
@@ -1,7 +1,7 @@
#include "GetProgramGuideResult.h"
#include <stdlib.h>
-#include "tinyXML/tinyxml.h"
+#include "utils/XBMCTinyXML.h"
#include "utils/log.h"
/*
static const SContentType g_content_group[] =
@@ -5,7 +5,7 @@
# how to reach the author.
#
-LIBS = @abs_top_srcdir@/lib/tinyXML/tinyxml.a -ldl
+LIBS = -ltinyxml -ldl
LIBDIR = @abs_top_srcdir@/addons/pvr.demo
LIB = @abs_top_srcdir@/addons/pvr.demo/XBMC_demo.pvr
@@ -16,8 +16,6 @@ include ../Makefile.include
clean:
-rm -f $(OBJS) $(LIB) *.P *~
- ${MAKE} -C @abs_top_srcdir@/lib/tinyXML clean
$(LIB): $(OBJS)
- ${MAKE} -C @abs_top_srcdir@/lib/tinyXML
$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -g $(OBJS) $(LIBS) $(LIBDIRS) $(SILIB) -o $(LIB)

0 comments on commit c5a46b7

Please sign in to comment.