Merge branch 'Mac'

 Mac only specific changes.

4 files changed, 50 insertions, 14 deletions

diff --git a/src/compat.h b/src/compat.h
index 582300a92..3f61a9964 100644
--- a/src/compat.h
+++ b/src/compat.h
@@ -27,6 +27,10 @@
 #include <ifaddrs.h>
 #endif
 
+#if MAC_OSX
+#define MSG_NOSIGNAL        SO_NOSIGPIPE
+#endif
+
 typedef u_int SOCKET;
 #ifdef WIN32
 #define MSG_NOSIGNAL        0
diff --git a/src/mac/Info.plist b/src/mac/Info.plist
new file mode 100644
index 000000000..b3432ff1a
--- /dev/null
+++ b/src/mac/Info.plist
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleShortVersionString</key>
+        <string>1.5.0.1</string>
+	<key>CFBundleVersion</key>
+        <string>1.5 Alpha 1</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>CFBundleIconFile</key>
+	<string>Dogecoin.icns</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>© Dogecoin</string>
+	<key>CFBundleSignature</key>
+	<string>DOGE</string>
+	<key>CFBundleExecutable</key>
+	<string>Dogecoin-Qt</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.dogecoin.wallet-qt</string>
+	<key>CFBundleName</key>
+	<string>Dogecoin-Qt</string>
+</dict>
+</plist>
diff --git a/src/mac/artwork/Dogecoin.icns b/src/mac/artwork/Dogecoin.icns
new file mode 100644
index 000000000..1ced687b5
--- /dev/null
+++ b/src/mac/artwork/Dogecoin.icns
diff --git a/src/makefile.osx b/src/makefile.osx
index deab964e7..efa0d3996 100644
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -4,21 +4,27 @@
 # Distributed under the MIT/X11 software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-# Mac OS X makefile for bitcoin
+# Mac OS X makefile for Dogecoin
 # Originally by Laszlo Hanyecz ([email protected])
 
-CXX=llvm-g++
-DEPSDIR=/opt/local
+CXX=c++
+
+CHECKDIR=$(wildcard /usr/local/Cellar)
+
+ifneq ($(CHECK_DIR),)
+    DEPSDIR=/usr/local
+else
+    DEPSDIR=/opt/local
+endif
+
 
 INCLUDEPATHS= \
  -I"$(CURDIR)" \
  -I"$(CURDIR)"/obj \
- -I"$(DEPSDIR)/include" \
- -I"$(DEPSDIR)/include/db48"
+ -I"$(DEPSDIR)/include" 
 
 LIBPATHS= \
- -L"$(DEPSDIR)/lib" \
- -L"$(DEPSDIR)/lib/db48"
+ -L"$(DEPSDIR)/lib" 
 
 USE_UPNP:=1
 USE_IPV6:=1
@@ -32,20 +38,20 @@ ifdef STATIC
 TESTLIBS += \
  $(DEPSDIR)/lib/libboost_unit_test_framework-mt.a
 LIBS += \
- $(DEPSDIR)/lib/db48/libdb_cxx-4.8.a \
+ $(DEPSDIR)/lib/libdb_cxx.a \
  $(DEPSDIR)/lib/libboost_system-mt.a \
  $(DEPSDIR)/lib/libboost_filesystem-mt.a \
  $(DEPSDIR)/lib/libboost_program_options-mt.a \
  $(DEPSDIR)/lib/libboost_thread-mt.a \
  $(DEPSDIR)/lib/libboost_chrono-mt.a \
- $(DEPSDIR)/lib/libssl.a \
- $(DEPSDIR)/lib/libcrypto.a \
+ -lssl \
+ -lcrypto \
  -lz
 else
 TESTLIBS += \
  -lboost_unit_test_framework-mt
 LIBS += \
- -ldb_cxx-4.8 \
+ -ldb_cxx \
  -lboost_system-mt \
  -lboost_filesystem-mt \
  -lboost_program_options-mt \
@@ -57,13 +63,13 @@ LIBS += \
 TESTDEFS += -DBOOST_TEST_DYN_LINK
 endif
 
-DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DBOOST_SPIRIT_THREADSAFE
+DEFS=-DMAC_OSX -DBOOST_SPIRIT_THREADSAFE
 
 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
+CFLAGS = -mmacosx-version-min=10.6 -O3
 else
 DEBUGFLAGS = -g
 endif
@@ -144,7 +150,7 @@ LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
 DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
 DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
 leveldb/libleveldb.a:
-	@echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(CFLAGS)" libleveldb.a libmemenv.a && cd ..
+	@echo "Building LevelDB ..." && cd leveldb && chmod +x build_detect_platform && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(CFLAGS)" libleveldb.a libmemenv.a && cd ..
 
 # auto-generated dependencies:
 -include obj/*.P