libresolv-54.tar.gz

diff --git a/libresolv.xcodeproj/project.pbxproj b/libresolv.xcodeproj/project.pbxproj
index a5bc7a1c219b9b23b25090a8c6bab79301d820ea..7a1df2b6c2264ac981d95d79e3ee904e7dd68ae7 100644 (file)
--- a/libresolv.xcodeproj/project.pbxproj
+++ b/libresolv.xcodeproj/project.pbxproj
@@ -300,7 +300,7 @@
                                "PRIVATE_HEADERS_FOLDER_PATH[sdk=iphonesimulator*]" = "$(SDKROOT)/usr/local/include";
                                PROVISIONING_PROFILE = "";
                                PUBLIC_HEADERS_FOLDER_PATH = /usr/include;
                                "PRIVATE_HEADERS_FOLDER_PATH[sdk=iphonesimulator*]" = "$(SDKROOT)/usr/local/include";
                                PROVISIONING_PROFILE = "";
                                PUBLIC_HEADERS_FOLDER_PATH = /usr/include;

-                               "PUBLIC_HEADERS_FOLDER_PATH[sdk=iphonesimulator*]" = "$(SDKROOT)/usr/local/include";
+                               "PUBLIC_HEADERS_FOLDER_PATH[sdk=iphonesimulator*]" = "$(SDKROOT)/usr/include";

                                WARNING_CFLAGS = "-Wall";
                        };
                        name = Release;
                                WARNING_CFLAGS = "-Wall";
                        };
                        name = Release;


@@ -310,6 +310,7 @@
                        buildSettings = {
                                FRAMEWORK_VERSION = 9;
                                PRODUCT_NAME = "$(TARGET_NAME).$(FRAMEWORK_VERSION)";
                        buildSettings = {
                                FRAMEWORK_VERSION = 9;
                                PRODUCT_NAME = "$(TARGET_NAME).$(FRAMEWORK_VERSION)";

+                               LD_DYLIB_INSTALL_NAME = "/usr/lib/$(PRODUCT_NAME).dylib";

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

diff --git a/xcodescripts/headers.sh b/xcodescripts/headers.sh
index ee06b70cc36567437e0ef34425c9bcfa8fbe1a49..1f35dbcdbae9cce89e0157b6216d95013a8b83bf 100644 (file)
--- a/xcodescripts/headers.sh
+++ b/xcodescripts/headers.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
 set -e -x
 
 #!/bin/bash
 set -e -x
 

+# check if we're building for the simulator
+if [ "${RC_ProjectName%_Sim}" != "${RC_ProjectName}" ] ; then
+       DSTROOT="${DSTROOT}${SDKROOT}"
+fi
+

 DIR="$DSTROOT"/usr/include/arpa
 install -d -m 0755 -o "$INSTALL_OWNER" -g "$INSTALL_GROUP" \
        "$DIR"
 DIR="$DSTROOT"/usr/include/arpa
 install -d -m 0755 -o "$INSTALL_OWNER" -g "$INSTALL_GROUP" \
        "$DIR"

diff --git a/xcodescripts/links.sh b/xcodescripts/links.sh
index 151c4e3a1b4a3fb3a058caf615a756c802bf3513..82266be57c728b80e21ed329ada422f1462191da 100644 (file)
--- a/xcodescripts/links.sh
+++ b/xcodescripts/links.sh
@@ -3,6 +3,11 @@ set -e -x
 
 if [ "$ACTION" = installhdrs ]; then exit 0; fi
 
 
 if [ "$ACTION" = installhdrs ]; then exit 0; fi
 

+# check if we're building for the simulator
+if [ "${RC_ProjectName%_Sim}" != "${RC_ProjectName}" ] ; then
+       DSTROOT="${DSTROOT}${SDKROOT}"
+fi
+

 LIBDIR="$DSTROOT"/usr/lib
 ln -s libresolv.9.dylib "$LIBDIR"/libresolv.dylib
 chown -h "$INSTALL_OWNER:$INSTALL_GROUP" "$LIBDIR"/libresolv.dylib
 LIBDIR="$DSTROOT"/usr/lib
 ln -s libresolv.9.dylib "$LIBDIR"/libresolv.dylib
 chown -h "$INSTALL_OWNER:$INSTALL_GROUP" "$LIBDIR"/libresolv.dylib