Better wording for transaction fee notification messages

[novacoin.git] / makefile.osx

diff --git a/makefile.osx b/makefile.osx
index 39ca449..4836ea3 100644 (file)
--- a/makefile.osx
+++ b/makefile.osx
@@ -1,10 +1,11 @@
-# Copyright (c) 2009-2010 Satoshi Nakamoto
+# Copyright (c) 2010 Laszlo Hanyecz
 # Distributed under the MIT/X11 software license, see the accompanying
 # file license.txt or http://www.opensource.org/licenses/mit-license.php.
 
 # Mac OS X makefile for bitcoin
 # Laszlo Hanyecz (solar@heliacal.net)
 
+CXX=llvm-g++
 DEPSDIR=/Users/macosuser/bitcoin/deps
 
 INCLUDEPATHS= \
@@ -15,19 +16,22 @@ LIBPATHS= \
 
 WXLIBS=$(shell $(DEPSDIR)/bin/wx-config --libs --static)
 
+USE_UPNP:=0
+
 LIBS= -dead_strip \
  $(DEPSDIR)/lib/libdb_cxx-4.8.a \
  $(DEPSDIR)/lib/libboost_system.a \
  $(DEPSDIR)/lib/libboost_filesystem.a \
  $(DEPSDIR)/lib/libboost_program_options.a \
  $(DEPSDIR)/lib/libboost_thread.a \
+ $(DEPSDIR)/lib/libssl.a \
  $(DEPSDIR)/lib/libcrypto.a 
 
-DEFS=$(shell $(DEPSDIR)/bin/wx-config --cxxflags) -D__WXMAC_OSX__ -DNOPCH -DMSG_NOSIGNAL=0
+DEFS=$(shell $(DEPSDIR)/bin/wx-config --cxxflags) -D__WXMAC_OSX__ -DNOPCH -DMSG_NOSIGNAL=0 -DUSE_SSL
 
 DEBUGFLAGS=-g -DwxDEBUG_LEVEL=0
 # ppc doesn't work because we don't support big-endian
-CFLAGS=-mmacosx-version-min=10.5 -arch i386 -arch x86_64 -O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
+CFLAGS=-mmacosx-version-min=10.5 -arch i386 -arch x86_64 -O3 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
 HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \
     script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h
 
@@ -42,28 +46,35 @@ OBJS= \
     obj/init.o \
     cryptopp/obj/sha.o \
     cryptopp/obj/cpu.o
+
+ifdef USE_UPNP
+       LIBS += $(DEPSDIR)/lib/libminiupnpc.a
+       DEFS += -DUSE_UPNP=$(USE_UPNP)
+endif
        
 
 all: bitcoin
 
 
 obj/%.o: %.cpp $(HEADERS)
-       g++ -c $(CFLAGS) -DGUI -o $@ $<
+       $(CXX) -c $(CFLAGS) -DGUI -o $@ $<
 
 cryptopp/obj/%.o: cryptopp/%.cpp
-       g++ -c $(CFLAGS) -O3 -o $@ $<
+       $(CXX) -c $(CFLAGS) -O3 -DCRYPTOPP_DISABLE_ASM -o $@ $<
 
 bitcoin: $(OBJS) obj/ui.o obj/uibase.o
-       g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(WXLIBS) $(LIBS)
+       $(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(WXLIBS) $(LIBS)
 
 
 obj/nogui/%.o: %.cpp $(HEADERS)
-       g++ -c $(CFLAGS) -o $@ $<
+       $(CXX) -c $(CFLAGS) -o $@ $<
 
 bitcoind: $(OBJS:obj/%=obj/nogui/%)
-       g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
+       $(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
 
 
 clean:
+       -rm -f bitcoin bitcoind
        -rm -f obj/*.o
        -rm -f obj/nogui/*.o
+       -rm -f cryptopp/obj/*.o