Commit a1ab3bb4 authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge commit 'phobos/polipo-updates-maint-0.2.1' into maint-0.2.1

parents 23943364 ca5e41af

contrib/polipo/Makefile.osx

+7 −3
Original line number Diff line number Diff line
@@ -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 \

contrib/polipo/README

+2 −0
Original line number Diff line number Diff line 
Copyright 2007-2008 Andrew Lewman

Copyright 2009 The Tor Project



----------------

General Comments

----------------