aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2004-01-13 08:04:05 +0000
committerDaniel Stenberg <daniel@haxx.se>2004-01-13 08:04:05 +0000
commita76235c0088946dd8b8d28b8428a9f91a86023ae (patch)
tree08e08bf9f986ac3eb80d0749422bc81a31952609
parent71b3cc08a6d68420dbf4a10ae59b83e18ee2b68b (diff)
Matt Veenstra updated the Mac OS X framework files
-rw-r--r--lib/libcurl.framework.make32
-rw-r--r--lib/libcurl.plist6
2 files changed, 21 insertions, 17 deletions
diff --git a/lib/libcurl.framework.make b/lib/libcurl.framework.make
index 27bcb6fdf..e57f88c12 100644
--- a/lib/libcurl.framework.make
+++ b/lib/libcurl.framework.make
@@ -1,17 +1,8 @@
-#
-# libcurl.framework.make is the make file. There are comments about unique
-# Mac OS X things if you want to read. It can be built by calling:
-# "make build -e -f libcurl.framework.make"
-#
-# The libcurl.plist is a basically the resource bit of the framework on Mac OS
-# X. It is a simple XML file so you can open this to see what it is.
-# Version, name, etc.
-#
-
TMP_DIR = ../lib/.lib
LIB_DIR = ../lib
-# for debug symbols add the -g option
+# for debug symbols add the -g option. Remove the -O2 option for best debuggin.
+# Can be compiled with -O3 optimizations.
C_OPTIONS = \
-fno-common \
-O2 \
@@ -22,13 +13,26 @@ C_OPTIONS = \
-Wall
# The 2 -framework tags are the needed Mac OS X sytem libs
-LIBRARIES = -framework CoreFoundation -framework CoreServices -lssl -lcrypto -lz
+# must link to version 0.9 of libssl to run on Mac OS X 10.2. 10.1 is not tested but should work.
+LIBRARIES = -framework CoreFoundation \
+ -framework CoreServices \
+ /usr/lib/libssl.dylib \
+ /usr/lib/libcrypto.dylib \
+ -lz
# These libtool options are needed for a framework.
# @executable_path tells the application that links to this library where to find it.
-# On Mac OS X we usually put frameworks iniside the application bundle in a frameworks folder.
-LINK_OPTIONS = -prebind -dynamiclib -install_name @executable_path/../frameworks/libcurl.framework/libcurl
+# On Mac OS X frameworks are usually iniside the application bundle in a frameworks folder.
+# Define a seg1addr so prebinding does not overlap with other frameworks or bundles.
+# For prebinding 0x10400000 was chosen a bit at random.
+# If this overlaps one of you current libs just change in the makefile.
+# This address is safe for all built in frameworks.
+LINK_OPTIONS = -prebind \
+ -seg1addr 0x10400000 \
+ -dynamiclib \
+ -install_name @executable_path/../frameworks/libcurl.framework/libcurl
+# This is the file list. It is not dynamically generated so this must be updated if new files are added to the build.
OBJECTS = $(TMP_DIR)/base64.o \
$(TMP_DIR)/connect.o \
$(TMP_DIR)/content_encoding.o \
diff --git a/lib/libcurl.plist b/lib/libcurl.plist
index 9b0fa0720..b17119cca 100644
--- a/lib/libcurl.plist
+++ b/lib/libcurl.plist
@@ -15,7 +15,7 @@
<string>com.libcurl.libcurl</string>
<key>CFBundleVersion</key>
- <string>7.10.8</string>
+ <string>7.11.0</string>
<key>CFBundleName</key>
<string>libcurl</string>
@@ -27,9 +27,9 @@
<string>????</string>
<key>CFBundleShortVersionString</key>
- <string>libcurl 7.10.8</string>
+ <string>libcurl 7.11.0</string>
<key>CFBundleGetInfoString</key>
- <string>libcurl.plist 7.10.8</string>
+ <string>libcurl.plist 7.11.0</string>
</dict>
</plist> \ No newline at end of file