diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-02-14 17:25:34 +0000 |
|---|---|---|
| committer | unknown <Administrator@.(none)> | 2011-02-14 17:26:24 +0000 |
| commit | cf7c1874fead05a828a1a28a239da411a0cb725e (patch) | |
| tree | 5b536f094406b9f63bb72588199c001b2b1afcd9 /makefile.vc | |
| parent | 47908a890726f424371c9784b8508cff163c2c78 (diff) | |
Update windows build process for 0.3.20 release
Diffstat (limited to 'makefile.vc')
| -rw-r--r-- | makefile.vc | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/makefile.vc b/makefile.vc index ee65f85990..18ced0236e 100644 --- a/makefile.vc +++ b/makefile.vc @@ -7,29 +7,32 @@ INCLUDEPATHS= \ /I"/boost" \ /I"/db/build_windows" \ /I"/openssl/include" \ - /I"/wxwidgets/lib/vc_lib/mswud" \ + /I"/wxwidgets/lib/vc_lib/mswu" \ /I"/wxwidgets/include" LIBPATHS= \ /LIBPATH:"/boost/stage/lib" \ - /LIBPATH:"/db/build_windows/debug" \ - /LIBPATH:"/openssl/out" \ - /LIBPATH:"/wxwidgets/lib/vc_lib" + /LIBPATH:"/db/build_windows/Release" \ + /LIBPATH:"/openssl/lib" \ + /LIBPATH:"/wxwidgets/lib/vc_lib" \ + /NODEFAULTLIB:libc.lib /NODEFAULTLIB:libcmt.lib \ + /NODEFAULTLIB:libcd.lib /NODEFAULTLIB:libcmtd.lib \ + /NODEFAULTLIB:msvcrtd.lib -WXLIBS=wxmsw29ud_html.lib wxmsw29ud_core.lib wxmsw29ud_adv.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib +WXLIBS=wxmsw29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib LIBS= \ - libboost_system-vc80-mt-gd.lib \ - libboost_filesystem-vc80-mt-gd.lib \ - libboost_program_options-vc80-mt-gd.lib \ - libboost_thread-vc80-mt-gd.lib \ - libdb47sd.lib \ + 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 \ 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=/Zi /D__WXDEBUG__ -CFLAGS=/c /nologo /MDd /EHsc /GR /Zm300 $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) +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 \ script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h @@ -82,7 +85,7 @@ obj\ui.res: ui.rc rc/bitcoin.ico rc/check.ico rc/send16.bmp rc/send16mask.bmp r rc $(INCLUDEPATHS) $(DEFS) /Fo$@ %s bitcoin.exe: $(OBJS) obj\ui.obj obj\uibase.obj obj\ui.res - link /nologo /DEBUG /SUBSYSTEM:WINDOWS /OUT:$@ $(LIBPATHS) $** $(WXLIBS) $(LIBS) + link /nologo /SUBSYSTEM:WINDOWS /OUT:$@ $(LIBPATHS) $** $(WXLIBS) $(LIBS) .cpp{obj\nogui}.obj: @@ -105,7 +108,7 @@ obj\nogui\rpc.obj: $(HEADERS) obj\nogui\init.obj: $(HEADERS) bitcoind.exe: $(OBJS:obj\=obj\nogui\) obj\ui.res - link /nologo /DEBUG /OUT:$@ $(LIBPATHS) $** $(LIBS) + link /nologo /OUT:$@ $(LIBPATHS) $** $(LIBS) clean: |