aboutsummaryrefslogtreecommitdiff
path: root/src/makefile.osx
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2011-10-10 11:13:32 -0400
committerGavin Andresen <gavinandresen@gmail.com>2011-10-10 11:13:32 -0400
commitb50ac8f73e3e3aa47be567f3fcd5b7c8933c49db (patch)
tree539d18afba3b0342886b21b6f9b9ed11cbd3d631 /src/makefile.osx
parenteab61cd0b277da17816834fea81aa7a2d7f9c011 (diff)
Mac OSX release process changes
Rename App Bundle "Bitcoin-Qt.app" instead of "Bitcoin Qt" for consistency with Windows/Linux. Update create_osx_dmg.sh script to use macdeployqt tool. Add ifdef STATIC to makefile.osx to build bitcoind static or dynamic.
Diffstat (limited to 'src/makefile.osx')
-rw-r--r--src/makefile.osx21
1 files changed, 19 insertions, 2 deletions
diff --git a/src/makefile.osx b/src/makefile.osx
index 6269d93bda..7830f3bad5 100644
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -19,7 +19,19 @@ LIBPATHS= \
USE_UPNP:=1
-LIBS= -dead_strip \
+LIBS= -dead_strip
+ifdef STATIC
+# Build STATIC if you are redistributing the bitcoind binary
+LIBS += \
+ $(DEPSDIR)/lib/db48/libdb_cxx-4.8.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/libssl.a \
+ $(DEPSDIR)/lib/libcrypto.a
+else
+LIBS += \
-ldb_cxx-4.8 \
-lboost_system-mt \
-lboost_filesystem-mt \
@@ -27,6 +39,7 @@ LIBS= -dead_strip \
-lboost_thread-mt \
-lssl \
-lcrypto
+endif
DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DUSE_SSL
@@ -70,8 +83,12 @@ OBJS= \
obj/wallet.o
ifdef USE_UPNP
- LIBS += -lminiupnpc
DEFS += -DUSE_UPNP=$(USE_UPNP)
+ifdef STATIC
+ LIBS += $(DEPSDIR)/lib/libminiupnpc.a
+else
+ LIBS += -lminiupnpc
+endif
endif