Update makefile.linux-mingw to work with crypter and UPnP fix.

hippich · Jul 13, 2011 · 0ca8324 · 0ca8324
1 parent 0fa89d8
commit 0ca8324
Showing 1 changed file with 12 additions and 17 deletions.
diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw
@@ -4,6 +4,8 @@
 
 DEPSDIR:=/usr/i586-mingw32msvc
 
+USE_UPNP:=0
+
 INCLUDEPATHS= \
  -I"$(DEPSDIR)/boost_1_43_0" \
  -I"$(DEPSDIR)/db-4.7.25.NC/build_unix" \
@@ -34,23 +36,15 @@ DEFS=-D_MT -DWIN32 -D__WXMSW__ -D_WINDOWS -DNOPCH -DUSE_SSL
 DEBUGFLAGS=-g -D__WXDEBUG__
 CFLAGS=-O2 -w -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
-
-bitcoin.exe: USE_UPNP:=1
-	ifdef USE_UPNP
-		INCLUDEPATHS += -I"$(DEPSDIR)/upnpc-exe-win32-20110215"
-		LIBPATHS += -L"$(DEPSDIR)/upnpc-exe-win32-20110215"
-		LIBS += -l miniupnpc -l iphlpapi
-		DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP)
-	endif
-
-bitcoind.exe: USE_UPNP:=0
-	ifdef USE_UPNP
-		INCLUDEPATHS += -I"$(DEPSDIR)/upnpc-exe-win32-20110215"
-		LIBPATHS += -L"$(DEPSDIR)/upnpc-exe-win32-20110215"
-		LIBS += -l miniupnpc -l iphlpapi
-		DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP)
-	endif
+    script.h db.h net.h irc.h keystore.h main.h wallet.h rpc.h uibase.h ui.h noui.h \
+    crypter.hinit.h
+
+ifdef USE_UPNP
+	INCLUDEPATHS += -I"$(DEPSDIR)/upnpc-exe-win32-20110215"
+	LIBPATHS += -L"$(DEPSDIR)/upnpc-exe-win32-20110215"
+	LIBS += -l miniupnpc -l iphlpapi
+	DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP)
+endif
 
 LIBS += -l mingwthrd -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l shlwapi
 
@@ -65,6 +59,7 @@ OBJS= \
     obj/wallet.o \
     obj/rpc.o \
     obj/init.o \
+    obj/crypter.o \
     cryptopp/obj/sha.o \
     cryptopp/obj/cpu.o