Better wording for transaction fee notification messages

[novacoin.git] / makefile.osx

diff --git a/makefile.osx b/makefile.osx
index 264f0b1..4836ea3 100644 (file)
--- a/makefile.osx
+++ b/makefile.osx
@@ -1,65 +1,80 @@
-# Copyright (c) 2009-2010 Satoshi Nakamoto\r
-# Distributed under the MIT/X11 software license, see the accompanying\r
-# file license.txt or http://www.opensource.org/licenses/mit-license.php.\r
-\r
-# Mac OS X makefile for bitcoin\r
-# Laszlo Hanyecz (solar@heliacal.net)\r
-\r
-DEPSDIR=/Users/macosuser/bitcoin/deps\r
-\r
-INCLUDEPATHS= \\r
- -I"$(DEPSDIR)/include"\r
-\r
-LIBPATHS= \\r
- -L"$(DEPSDIR)/lib"\r
-\r
-WXLIBS=$(shell $(DEPSDIR)/bin/wx-config --libs --static)\r
-\r
-LIBS= -dead_strip \\r
- $(DEPSDIR)/lib/libdb_cxx-4.8.a \\r
- $(DEPSDIR)/lib/libboost_system.a \\r
- $(DEPSDIR)/lib/libboost_filesystem.a \\r
- $(DEPSDIR)/lib/libcrypto.a \r
-\r
-WXDEFS=$(shell $(DEPSDIR)/bin/wx-config --cxxflags) -DNOPCH -DMSG_NOSIGNAL=0\r
-\r
-DEBUGFLAGS=-g -DwxDEBUG_LEVEL=0\r
-# ppc doesn't work because we don't support big-endian\r
-CFLAGS=-mmacosx-version-min=10.5 -arch i386 -arch x86_64 -O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(WXDEFS) $(INCLUDEPATHS)\r
-HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \\r
-    script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h init.h sha.h\r
-\r
-\r
-all: bitcoin\r
-\r
-\r
-obj/%.o: %.cpp $(HEADERS)\r
-       g++ -c $(CFLAGS) -o $@ $<\r
-\r
-obj/sha.o: sha.cpp sha.h\r
-       g++ -c $(CFLAGS) -O3 -o $@ $<\r
-\r
-OBJS= \\r
-    obj/util.o \\r
-    obj/script.o \\r
-    obj/db.o \\r
-    obj/net.o \\r
-    obj/irc.o \\r
-    obj/main.o \\r
-    obj/rpc.o \\r
-    obj/init.o\r
-       \r
-bitcoin: $(OBJS) obj/ui.o obj/uibase.o obj/sha.o\r
-       g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(WXLIBS) $(LIBS)\r
-\r
-\r
-obj/nogui/%.o: %.cpp $(HEADERS)\r
-       g++ -c $(CFLAGS) -DwxUSE_GUI=0 -o $@ $<\r
-\r
-bitcoind: $(OBJS:obj/%=obj/nogui/%) obj/sha.o\r
-       g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(WXLIBS) $(LIBS)\r
-\r
-\r
-clean:\r
-       -rm -f obj/*.o\r
-       -rm -f obj/nogui/*.o\r
+# 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= \
+ -I"$(DEPSDIR)/include"
+
+LIBPATHS= \
+ -L"$(DEPSDIR)/lib"
+
+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 -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 -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
+
+OBJS= \
+    obj/util.o \
+    obj/script.o \
+    obj/db.o \
+    obj/net.o \
+    obj/irc.o \
+    obj/main.o \
+    obj/rpc.o \
+    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)
+       $(CXX) -c $(CFLAGS) -DGUI -o $@ $<
+
+cryptopp/obj/%.o: cryptopp/%.cpp
+       $(CXX) -c $(CFLAGS) -O3 -DCRYPTOPP_DISABLE_ASM -o $@ $<
+
+bitcoin: $(OBJS) obj/ui.o obj/uibase.o
+       $(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(WXLIBS) $(LIBS)
+
+
+obj/nogui/%.o: %.cpp $(HEADERS)
+       $(CXX) -c $(CFLAGS) -o $@ $<
+
+bitcoind: $(OBJS:obj/%=obj/nogui/%)
+       $(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
+
+
+clean:
+       -rm -f bitcoin bitcoind
+       -rm -f obj/*.o
+       -rm -f obj/nogui/*.o
+       -rm -f cryptopp/obj/*.o