aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorphobos <phobos@phobos-laptop.(none)>2009-08-30 20:40:02 -0400
committerphobos <phobos@phobos-laptop.(none)>2009-08-30 20:40:02 -0400
commitca5e41afd7e3cb164b7c3ac99c8a338a121f682f (patch)
tree7148aebdb63460be08dd398001d69a4409212e27 /contrib
parent64f393d56f8ff58223db56f3b8e64f0074877616 (diff)
downloadtor-ca5e41afd7e3cb164b7c3ac99c8a338a121f682f.tar
tor-ca5e41afd7e3cb164b7c3ac99c8a338a121f682f.tar.gz
update the README instructions and OS X makefiles
Diffstat (limited to 'contrib')
-rw-r--r--contrib/polipo/Makefile.osx10
-rw-r--r--contrib/polipo/README2
2 files changed, 9 insertions, 3 deletions
diff --git a/contrib/polipo/Makefile.osx b/contrib/polipo/Makefile.osx
index 8e748e2ad..55ed1c62f 100644
--- a/contrib/polipo/Makefile.osx
+++ b/contrib/polipo/Makefile.osx
@@ -30,9 +30,13 @@ FILE_DEFINES = -DLOCAL_ROOT=\"$(LOCAL_ROOT)/\" \
DEFINES = $(FILE_DEFINES) $(PLATFORM_DEFINES)
-UNIVERSAL = -O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc
-LDFLAGS = -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk
-CFLAGS = $(MD5INCLUDES) $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES) $(UNIVERSAL)
+# Uncomment the UNIVERSAL, LDFLAGS, CFLAGS lines if you want universal binaries, otherwise
+# you'll produce a binary only for your architecture and version of OSX
+# UNIVERSAL = -O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc
+# LDFLAGS = -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk
+# CFLAGS = $(MD5INCLUDES) $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES) $(UNIVERSAL)
+# If you uncommented the above CFLAGS, remove this next one.
+CFLAGS = $(MD5INCLUDES) $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES)
SRCS = util.c event.c io.c chunk.c atom.c object.c log.c diskcache.c main.c \
config.c local.c http.c client.c server.c auth.c tunnel.c \
diff --git a/contrib/polipo/README b/contrib/polipo/README
index 038e35441..e05ab0cee 100644
--- a/contrib/polipo/README
+++ b/contrib/polipo/README
@@ -1,4 +1,6 @@
Copyright 2007-2008 Andrew Lewman
+Copyright 2009 The Tor Project
+
----------------
General Comments
----------------