Link libplist and switch to their C++ wrapper API.

diff --git a/ldid.cpp b/ldid.cpp
index 40209b5cef9e711b2ea0bd9544b49e9a01f243f7..d95be4effb2925d37904f7fca36443b53564fe57 100644 (file)
--- a/ldid.cpp
+++ b/ldid.cpp
@@ -43,7 +43,7 @@
 #include <openssl/pkcs12.h>
 #include <openssl/sha.h>
 
 #include <openssl/pkcs12.h>
 #include <openssl/sha.h>
 

-#include <plist/plist.h>
+#include <plist/plist++.h>

 
 #include "ldid.hpp"
 
 
 #include "ldid.hpp"
 

diff --git a/make.sh b/make.sh
index 30fe7b06836067a5453c1c49b013c8e89470c013..bca0983db44aec38c6f9bcd262fc7706a2100b79 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -57,8 +57,10 @@ done
 
 set -x
 
 
 set -x
 

+plist=(-Llibplist/src/.libs -lplist++)
+

 "${flags[@]}" -c -std=c++11 -o "${out}"/ldid.o ldid.cpp
 "${flags[@]}" -c -std=c++11 -o "${out}"/ldid.o ldid.cpp

-"${flags[@]}" -o "${out}"/ldid "${out}"/ldid.o "${os[@]}" -x c lookup2.c -lxml2 -lcrypto
+"${flags[@]}" -o "${out}"/ldid "${out}"/ldid.o "${os[@]}" -x c lookup2.c -lxml2 -lcrypto "${plist[@]}"

 
 if ! "${ios}"; then
     ln -sf out/ldid .
 
 if ! "${ios}"; then
     ln -sf out/ldid .

diff --git a/plist.sh b/plist.sh
new file mode 100755 (executable)
index 0000000..bda6327
--- /dev/null
+++ b/plist.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+./configure CC='clang -mmacosx-version-min=10.4 -arch i386 -arch x86_64' CXX='clang++ -mmacosx-version-min=10.4 -arch i386 -arch x86_64' CPP='clang -E' CXXCPP='clang++ -E' libxml2_LIBS=-lxml2 libxml2_CFLAGS=-I/usr/include/libxml2 --enable-static --disable-shared