diff options
| author | Jeff Garzik <jgarzik@exmulti.com> | 2011-07-01 16:31:33 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@exmulti.com> | 2011-07-01 16:31:33 -0700 |
| commit | 056d2ad3121bae19c321b33ce3352a61a1766411 (patch) | |
| tree | 856a62a1bb68902f6b57c6a9eae3b94f5ed5aff9 | |
| parent | 362efb24c14bb4e6b03bc4ed058870dfd684c89b (diff) | |
| parent | f8b5028cd1092faa5c8b360a5f76462a80d0b629 (diff) | |
Merge pull request #371 from EricJ2190/master
Updated Visual C++ Makefile
| -rw-r--r-- | src/makefile.vc | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/src/makefile.vc b/src/makefile.vc index 18ced0236e..d5aba3e69f 100644 --- a/src/makefile.vc +++ b/src/makefile.vc @@ -8,29 +8,41 @@ INCLUDEPATHS= \ /I"/db/build_windows" \ /I"/openssl/include" \ /I"/wxwidgets/lib/vc_lib/mswu" \ - /I"/wxwidgets/include" + /I"/wxwidgets/include" / + /I"/miniupnpc" LIBPATHS= \ /LIBPATH:"/boost/stage/lib" \ /LIBPATH:"/db/build_windows/Release" \ /LIBPATH:"/openssl/lib" \ /LIBPATH:"/wxwidgets/lib/vc_lib" \ + /LIBPATH:"/miniupnpc/msvc/Release" \ /NODEFAULTLIB:libc.lib /NODEFAULTLIB:libcmt.lib \ /NODEFAULTLIB:libcd.lib /NODEFAULTLIB:libcmtd.lib \ /NODEFAULTLIB:msvcrtd.lib WXLIBS=wxmsw29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib +USE_UPNP=0 + +DEFS=/DWIN32 /D__WXMSW__ /D_WINDOWS /DNOPCH /DNOMINMAX + LIBS= \ libboost_system-vc100-mt.lib \ libboost_filesystem-vc100-mt.lib \ libboost_program_options-vc100-mt.lib \ libboost_thread-vc100-mt.lib \ libdb47s.lib \ - libeay32.lib \ + libeay32.lib + +!IFDEF USE_UPNP +LIBS=$(LIBS) miniupnpc.lib +DEFS=$(DEFS) /DUSE_UPNP=$(USE_UPNP) +!ENDIF + +LIBS=$(LIBS) \ kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib ws2_32.lib shlwapi.lib -DEFS=/DWIN32 /D__WXMSW__ /D_WINDOWS /DNOPCH DEBUGFLAGS=/Os CFLAGS=/MD /c /nologo /EHsc /GR /Zm300 $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \ @@ -44,10 +56,14 @@ OBJS= \ obj\irc.obj \ obj\main.obj \ obj\rpc.obj \ - obj\init.obj \ + obj\init.obj + +CRYPTOPP_OBJS= \ cryptopp\obj\sha.obj \ cryptopp\obj\cpu.obj +RC=../share + all: bitcoin.exe @@ -81,13 +97,13 @@ cryptopp\obj\sha.obj: cryptopp\sha.cpp cryptopp\obj\cpu.obj: cryptopp\cpu.cpp cl $(CFLAGS) /O2 /DCRYPTOPP_DISABLE_ASM /Fo$@ %s -obj\ui.res: ui.rc rc/bitcoin.ico rc/check.ico rc/send16.bmp rc/send16mask.bmp rc/send16masknoshadow.bmp rc/send20.bmp rc/send20mask.bmp rc/addressbook16.bmp rc/addressbook16mask.bmp rc/addressbook20.bmp rc/addressbook20mask.bmp +obj\ui.res: $(RC)/ui.rc $(RC)/pixmaps/bitcoin.ico $(RC)/pixmaps/check.ico $(RC)/pixmaps/send16.bmp $(RC)/pixmaps/send16mask.bmp $(RC)/pixmaps/send16masknoshadow.bmp $(RC)/pixmaps/send20.bmp $(RC)/pixmaps/send20mask.bmp $(RC)/pixmaps/addressbook16.bmp $(RC)/pixmaps/addressbook16mask.bmp $(RC)/pixmaps/addressbook20.bmp $(RC)/pixmaps/addressbook20mask.bmp rc $(INCLUDEPATHS) $(DEFS) /Fo$@ %s -bitcoin.exe: $(OBJS) obj\ui.obj obj\uibase.obj obj\ui.res +bitcoin.exe: $(OBJS) $(CRYPTOPP_OBJS) obj\ui.obj obj\uibase.obj obj\ui.res link /nologo /SUBSYSTEM:WINDOWS /OUT:$@ $(LIBPATHS) $** $(WXLIBS) $(LIBS) - + .cpp{obj\nogui}.obj: cl $(CFLAGS) /Fo$@ %s @@ -107,7 +123,7 @@ obj\nogui\rpc.obj: $(HEADERS) obj\nogui\init.obj: $(HEADERS) -bitcoind.exe: $(OBJS:obj\=obj\nogui\) obj\ui.res +bitcoind.exe: $(OBJS:obj\=obj\nogui\) $(CRYPTOPP_OBJS) obj\ui.res link /nologo /OUT:$@ $(LIBPATHS) $** $(LIBS) |