Permalink
Browse files

removed curl dependency. this disables building the pvr.fortherecord.…

…argus add-on for now, until it's been updated. ping @Red-F
  • Loading branch information...
1 parent 50afdab commit a6693d02b670a5f0a35c7e41d62250869a9e76b7 Lars Op den Kamp committed Sep 30, 2012
View
15 README
@@ -1,7 +1,7 @@
WARNING: this is work in progress. Don't try to use this unless you know what you're doing.
=============================
- Linux
+ Linux, OS-X, BSD
=============================
Start by executing:
@@ -16,23 +16,16 @@ To build all PVR add-ons as .zip archives:
make zip
=============================
- OS-X
-=============================
-TODO
-
-=============================
Windows
=============================
Building the pvr addons standalone:
-----------------------------------
Prepare:
1) Install Visual C++ Express 2010 (follow the instructions on the wiki for XBMC itself)
Compile:
-2) Download the build dependencies.
- Run the following batch file: project\BuildDependences\DownloadBuildDeps.bat
-3) Open this solution from project\VS2010Express\xbmc-pvr-addons.sln
-4) Select the wanted configuration "Debug" or "Release"
-5) Press F7 to build the solution
+2) Open this solution from project\VS2010Express\xbmc-pvr-addons.sln
+3) Select the wanted configuration "Debug" or "Release"
+4) Press F7 to build the solution
Install:
Still a TODO. The buildsystem does not yet generate .zip archives
Workaround: copy the wanted pvr addons to your XBMC installation by hand.
View
@@ -4,10 +4,6 @@ SUBDIRS = pvr.demo \
pvr.vdr.vnsi \
pvr.njoy
-if USE_CURL
-SUBDIRS += pvr.fortherecord.argus
-endif
-
clean:
-rm -f *.zip
for d in $(SUBDIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done
View
@@ -70,11 +70,6 @@ case "${host}" in
;;
esac
-### External libraries checks
-# Curl
-use_libcurl="no"
-PKG_CHECK_MODULES([CURL],[libcurl],use_libcurl="yes",AC_MSG_WARN("CURL was not found, N7 add-on will not be available"))
-
### Check for Intree building
if test "x${cross_compiling}" = "xyes" || test "x${cross_compiling}" = "xmaybe"; then
# don't call AC_CHECK_FILE when (maybe) cross-compiling
@@ -102,14 +97,6 @@ else
AM_CONDITIONAL(HOST_IS_OSX, false)
fi
-if test "x$use_libcurl" = "xyes"; then
- INCLUDES="$INCLUDES $CURL_CFLAGS"
- LIBS="$LIBS $CURL_LIBS"
- AM_CONDITIONAL(USE_CURL, true)
-else
- AM_CONDITIONAL(USE_CURL, false)
-fi
-
if test "x${libdir}" != 'x${exec_prefix}/lib'; then
LIBDIR=${libdir}
elif test "$prefix" = "NONE"; then
@@ -1,13 +0,0 @@
-@ECHO OFF
-
-SET LOC_PATH=%CD%
-SET FILES=%LOC_PATH%\libcurl_d.txt
-
-CALL dlextract.bat libcurl %FILES%
-
-cd %TMP_PATH%
-
-xcopy curl-7.21.6-devel-mingw32\include\curl "%CUR_PATH%\include\curl" /E /Q /I /Y
-xcopy curl-7.21.6-devel-mingw32\lib\*.a "%CUR_PATH%\lib" /Y
-
-cd %LOC_PATH%
@@ -1,2 +0,0 @@
-; filename mirror source of the file
-curl-7.21.6-devel-mingw32.zip http://mirrors.xbmc.org/build-deps/win32/ http://www.gknw.de/mirror/curl/win32/old_releases/
@@ -23,12 +23,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pvr.njoy", "..\..\addons\pv
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjsoncpp", "..\..\lib\jsoncpp\project\VS2010Express\libjsoncpp.vcxproj", "{F3A72A50-E295-49BA-ACD7-8696907E0351}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pvr.fortherecord.argus", "..\..\addons\pvr.fortherecord.argus\project\VS2010Express\pvr.fortherecord.argus.vcxproj", "{8A82D2E1-F76F-427C-9479-FE70DA02825D}"
- ProjectSection(ProjectDependencies) = postProject
- {F3A72A50-E295-49BA-ACD7-8696907E0351} = {F3A72A50-E295-49BA-ACD7-8696907E0351}
- {FE4573F6-A794-4AD3-B37F-49E51F1140E6} = {FE4573F6-A794-4AD3-B37F-49E51F1140E6}
- EndProjectSection
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32

0 comments on commit a6693d0

Please sign in to comment.