From: Gavin Andresen <gavinandresen@gmail.com>
Date: Thu, 5 Apr 2012 14:34:45 +0000 (-0700)
Subject: Merge pull request #1042 from gavinandresen/use_ssl_cleanup
X-Git-Tag: v0.4.0-unstable~129^2~104
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=895c12943b1845411fb0282c17683c7b29a61459

Merge pull request #1042 from gavinandresen/use_ssl_cleanup

Remove USE_SSL #define
---

895c12943b1845411fb0282c17683c7b29a61459
diff --cc src/makefile.osx
index 0fcf800,3104ac2..ed35b33
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@@ -49,19 -49,12 +49,19 @@@ LIBS += 
  TESTDEFS += -DBOOST_TEST_DYN_LINK
  endif
  
- DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DUSE_SSL
+ DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0
  
 -DEBUGFLAGS=-g
 +ifdef RELEASE
 +# Compile for maximum compatibility and smallest size.
 +# This requires that dependencies are compiled
 +# the same way.
 +CFLAGS = -mmacosx-version-min=10.5 -arch i386 -O3
 +else
 +CFLAGS = -g
 +endif
 +
  # ppc doesn't work because we don't support big-endian
 -CFLAGS=-mmacosx-version-min=10.5 -arch i386 -O3 \
 -    -Wextra -Wno-sign-compare -Wno-char-subscripts -Wno-invalid-offsetof -Wformat-security \
 +CFLAGS += -Wextra -Wno-sign-compare -Wno-char-subscripts -Wno-invalid-offsetof -Wformat-security \
      $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
  
  OBJS= \