X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fmakefile.osx;h=89788562c3663024257be562d86c945345a18bf3;hb=4e87d341f75f13bbd7d108c31c03886fbc4df56f;hp=36890f98685a5aad0cc6b7a2de338d7fdfb1eec8;hpb=ee1f884229736da6f5443157ccba97f4e8f50f82;p=novacoin.git

diff --git a/src/makefile.osx b/src/makefile.osx
index 36890f9..8978856 100644
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -16,6 +16,8 @@ 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 \
@@ -31,7 +33,8 @@ 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 keystore.h main.h wallet.h rpc.h uibase.h ui.h noui.h init.h
+    script.h db.h net.h irc.h keystore.h main.h wallet.h rpc.h uibase.h ui.h noui.h \
+    init.h crypter.h
 
 OBJS= \
     obj/util.o \
@@ -44,20 +47,14 @@ OBJS= \
     obj/wallet.o \
     obj/rpc.o \
     obj/init.o \
+    obj/crypter.o \
     cryptopp/obj/sha.o \
     cryptopp/obj/cpu.o
 
-bitcoin: USE_UPNP:=1
-	ifdef USE_UPNP
-		LIBS += $(DEPSDIR)/lib/libminiupnpc.a
-		DEFS += -DUSE_UPNP=$(USE_UPNP)
-	endif
-
-bitcoind: USE_UPNP:=0
-	ifdef USE_UPNP
-		LIBS += $(DEPSDIR)/lib/libminiupnpc.a
-		DEFS += -DUSE_UPNP=$(USE_UPNP)
-	endif
+ifdef USE_UPNP
+	LIBS += $(DEPSDIR)/lib/libminiupnpc.a
+	DEFS += -DUSE_UPNP=$(USE_UPNP)
+endif
 	
 
 all: bitcoin