Better wording for transaction fee notification messages

[novacoin.git] / makefile.vc

diff --git a/makefile.vc b/makefile.vc
index e8e1ea6..18ced02 100644 (file)
--- 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
 
@@ -73,16 +76,16 @@ obj\ui.obj: $(HEADERS)
 obj\uibase.obj: $(HEADERS)
 
 cryptopp\obj\sha.obj: cryptopp\sha.cpp
-    cl $(CFLAGS) /O2 /Fo$@ %s
+    cl $(CFLAGS) /O2 /DCRYPTOPP_DISABLE_ASM /Fo$@ %s
 
 cryptopp\obj\cpu.obj: cryptopp\cpu.cpp
-    cl $(CFLAGS) /O2 /Fo$@ %s
+    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
     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: