projects / vuplus_xbmc / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ece940c)
[osx/ios] add libyajl in prep for remove_jsoncpp
authorS. Davilla <davilla@4pi.com>
Wed, 18 May 2011 03:34:58 +0000 (23:34 -0400)
committerS. Davilla <davilla@4pi.com>
Wed, 18 May 2011 03:35:30 +0000 (23:35 -0400)
tools/darwin/depends/Makefile.in patch | blob | history
tools/darwin/depends/libyajl/Makefile [new file with mode: 0644] patch | blob
tools/osx/ios-depends/Makefile patch | blob | history
tools/osx/ios-depends/libyajl/Makefile [new file with mode: 0644] patch | blob
tools/osx/osx-depends/Makefile patch | blob | history
tools/osx/osx-depends/libyajl/Makefile [new file with mode: 0644] patch | blob

diff --git a/tools/darwin/depends/Makefile.in b/tools/darwin/depends/Makefile.in
index 2d2b5de..c357573 100644 (file)
--- a/tools/darwin/depends/Makefile.in
+++ b/tools/darwin/depends/Makefile.in
@@ -10,7 +10,7 @@ SUBDIRS = \
        libvorbis libflac libmad fribidi libwavpack libmpeg2 \
        libass libcdio libsamplerate librtmp libcrystalhd \
        libGLEW libsdl libsdl_mixer libsdl_image \
-       libmicrohttpd libmodplug libbluray \
+       libmicrohttpd libmodplug libbluray libyajl \
        samba python26 mysqlclient boost \
 
 .PHONY: $(BUILDTOOLS) $(SUBDIRS)
diff --git a/tools/darwin/depends/libyajl/Makefile b/tools/darwin/depends/libyajl/Makefile
new file mode 100644 (file)
index 0000000..008f9c3
--- /dev/null
+++ b/tools/darwin/depends/libyajl/Makefile
@@ -0,0 +1,41 @@
+include ../Makefile.include
+include ../config.site.mk
+
+# lib name, version
+LIBNAME=lloyd-yajl
+VERSION=1.0.12
+SOURCE=lloyd-yajl-17b1790
+ARCHIVE=lloyd-yajl-1.0.12-0-g17b1790.tar.gz
+
+# configuration settings
+CONFIGURE=./configure --prefix=$(PREFIX)
+
+LIBDYLIB=$(SOURCE)/build/yajl-1.0.12/lib/libyajl.dylib
+
+all: $(LIBDYLIB) .installed
+
+$(TARBALLS_LOCATION)/$(ARCHIVE):
+       $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
+
+$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
+       rm -rf $(SOURCE)
+       $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+       echo $(SOURCE) > .gitignore
+       sed -ie "s|ADD_CUSTOM_TARGET|#ADD_CUSTOM_TARGET|g" "$(SOURCE)/CMakeLists.txt"
+       sed -ie "s|./run_tests.sh|#./run_tests.sh|g" "$(SOURCE)/CMakeLists.txt"
+       sed -ie "s|WORKING_DIRECTORY|#WORKING_DIRECTORY|g" "$(SOURCE)/CMakeLists.txt"
+       cd $(SOURCE); $(CONFIGURE)
+
+$(LIBDYLIB): $(SOURCE)
+       make -C $(SOURCE)
+
+.installed:
+       make -C $(SOURCE) install
+       touch $@
+
+clean:
+       make -C $(SOURCE) clean
+       rm -f .installed
+
+distclean::
+       rm -rf $(SOURCE) .installed
diff --git a/tools/osx/ios-depends/Makefile b/tools/osx/ios-depends/Makefile
index f981a52..4fe33db 100644 (file)
--- a/tools/osx/ios-depends/Makefile
+++ b/tools/osx/ios-depends/Makefile
@@ -9,7 +9,7 @@ SUBDIRS = \
        jpeg tiff libpng libogg \
        libvorbis libflac libmad fribidi libwavpack libmpeg2 \
        libass libcdio libsamplerate librtmp \
-       libmicrohttpd libmodplug libbluray \
+       libmicrohttpd libmodplug libbluray libyajl \
        samba python26 mysqlclient boost
 
 .PHONY: setup $(SUBDIRS)
diff --git a/tools/osx/ios-depends/libyajl/Makefile b/tools/osx/ios-depends/libyajl/Makefile
new file mode 100644 (file)
index 0000000..6928f46
--- /dev/null
+++ b/tools/osx/ios-depends/libyajl/Makefile
@@ -0,0 +1,53 @@
+#  A quick and dirty Makefile to download/build and install
+#
+#  Usage:
+#    make
+#    sudo make install
+
+include ../config.mk
+
+# lib name, version
+LIBNAME=lloyd-yajl
+VERSION=1.0.12
+SOURCE=lloyd-yajl-17b1790
+ARCHIVE=lloyd-yajl-1.0.12-0-g17b1790.tar.gz
+# download location and format
+BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs
+TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs
+RETRIEVE_TOOL=/usr/bin/curl
+RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE)
+ARCHIVE_TOOL=tar
+ARCHIVE_TOOL_FLAGS=xf
+
+# configuration settings
+CONFIGURE=./configure --prefix=$(PREFIX)
+
+LIBDYLIB=$(SOURCE)/build/yajl-1.0.12/lib/libyajl.dylib
+
+all: $(LIBDYLIB) .installed
+
+$(TARBALLS_LOCATION)/$(ARCHIVE):
+       $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
+
+$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
+       rm -rf $(SOURCE)
+       $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+       echo $(SOURCE) > .gitignore
+       sed -ie "s|ADD_CUSTOM_TARGET|#ADD_CUSTOM_TARGET|g" "$(SOURCE)/CMakeLists.txt"
+       sed -ie "s|./run_tests.sh|#./run_tests.sh|g" "$(SOURCE)/CMakeLists.txt"
+       sed -ie "s|WORKING_DIRECTORY|#WORKING_DIRECTORY|g" "$(SOURCE)/CMakeLists.txt"
+       cd $(SOURCE); $(CONFIGURE)
+
+$(LIBDYLIB): $(SOURCE)
+       make -C $(SOURCE)
+
+.installed:
+       make -C $(SOURCE) install
+       touch $@
+
+clean:
+       make -C $(SOURCE) clean
+       rm -f .installed
+
+distclean::
+       rm -rf $(SOURCE) .installed
diff --git a/tools/osx/osx-depends/Makefile b/tools/osx/osx-depends/Makefile
index c441640..e9c2517 100644 (file)
--- a/tools/osx/osx-depends/Makefile
+++ b/tools/osx/osx-depends/Makefile
@@ -9,7 +9,7 @@ SUBDIRS = \
        libvorbis libflac libmad fribidi libwavpack libmpeg2 \
        faad2 libass libcdio libsamplerate librtmp libcrystalhd \
        libGLEW libsdl libsdl_mixer libsdl_image \
-       libmicrohttpd libmodplug libbluray \
+       libmicrohttpd libmodplug libbluray libyajl \
        samba python26 mysqlclient boost \
 
 .PHONY: setup $(SUBDIRS)
diff --git a/tools/osx/osx-depends/libyajl/Makefile b/tools/osx/osx-depends/libyajl/Makefile
new file mode 100644 (file)
index 0000000..6928f46
--- /dev/null
+++ b/tools/osx/osx-depends/libyajl/Makefile
@@ -0,0 +1,53 @@
+#  A quick and dirty Makefile to download/build and install
+#
+#  Usage:
+#    make
+#    sudo make install
+
+include ../config.mk
+
+# lib name, version
+LIBNAME=lloyd-yajl
+VERSION=1.0.12
+SOURCE=lloyd-yajl-17b1790
+ARCHIVE=lloyd-yajl-1.0.12-0-g17b1790.tar.gz
+# download location and format
+BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs
+TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs
+RETRIEVE_TOOL=/usr/bin/curl
+RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE)
+ARCHIVE_TOOL=tar
+ARCHIVE_TOOL_FLAGS=xf
+
+# configuration settings
+CONFIGURE=./configure --prefix=$(PREFIX)
+
+LIBDYLIB=$(SOURCE)/build/yajl-1.0.12/lib/libyajl.dylib
+
+all: $(LIBDYLIB) .installed
+
+$(TARBALLS_LOCATION)/$(ARCHIVE):
+       $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
+
+$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
+       rm -rf $(SOURCE)
+       $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+       echo $(SOURCE) > .gitignore
+       sed -ie "s|ADD_CUSTOM_TARGET|#ADD_CUSTOM_TARGET|g" "$(SOURCE)/CMakeLists.txt"
+       sed -ie "s|./run_tests.sh|#./run_tests.sh|g" "$(SOURCE)/CMakeLists.txt"
+       sed -ie "s|WORKING_DIRECTORY|#WORKING_DIRECTORY|g" "$(SOURCE)/CMakeLists.txt"
+       cd $(SOURCE); $(CONFIGURE)
+
+$(LIBDYLIB): $(SOURCE)
+       make -C $(SOURCE)
+
+.installed:
+       make -C $(SOURCE) install
+       touch $@
+
+clean:
+       make -C $(SOURCE) clean
+       rm -f .installed
+
+distclean::
+       rm -rf $(SOURCE) .installed
Unnamed repository; edit this file 'description' to name the repository.