aboutsummaryrefslogtreecommitdiff
path: root/makefile.vc
diff options
context:
space:
mode:
Diffstat (limited to 'makefile.vc')
-rw-r--r--makefile.vc34
1 files changed, 18 insertions, 16 deletions
diff --git a/makefile.vc b/makefile.vc
index f5452f4d0c..d6fd319caa 100644
--- a/makefile.vc
+++ b/makefile.vc
@@ -3,8 +3,6 @@
# file license.txt or http://www.opensource.org/licenses/mit-license.php.
-# for wxWidgets-2.8.x, search and replace "mswud"->"mswd" and "29u"->"28"
-
INCLUDEPATHS= \
/I"/boost" \
/I"/db/build_windows" \
@@ -18,25 +16,29 @@ LIBPATHS= \
/LIBPATH:"/openssl/out" \
/LIBPATH:"/wxwidgets/lib/vc_lib"
+WXLIBS=wxmsw29ud_html.lib wxmsw29ud_core.lib wxmsw29ud_adv.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib
+
LIBS= \
- libboost_system-vc80-mt-gd.lib libboost_filesystem-vc80-mt-gd.lib libboost_program_options-vc80-mt-gd.lib \
+ 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 \
libeay32.lib \
- wxmsw29ud_html.lib wxmsw29ud_core.lib wxmsw29ud_adv.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.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
-WXDEFS=/DWIN32 /D__WXMSW__ /D_WINDOWS /DNOPCH
+DEFS=/DWIN32 /D__WXMSW__ /D_WINDOWS /DNOPCH
DEBUGFLAGS=/Zi /Od /D__WXDEBUG__
-CFLAGS=/c /nologo /Ob0 /MDd /EHsc /GR /Zm300 $(DEBUGFLAGS) $(WXDEFS) $(INCLUDEPATHS)
+CFLAGS=/c /nologo /MDd /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 init.h sha.h
+ script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h sha.h
all: bitcoin.exe
.cpp{obj}.obj:
- cl $(CFLAGS) /Fo$@ %s
+ cl $(CFLAGS) /DGUI /Fo$@ %s
obj\util.obj: $(HEADERS)
@@ -59,10 +61,10 @@ obj\ui.obj: $(HEADERS)
obj\uibase.obj: $(HEADERS)
obj\sha.obj: sha.cpp sha.h
- cl $(CFLAGS) /O2 /Fo$@ %s
+ cl $(CFLAGS) /O2 /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) $(WXDEFS) /Fo$@ %s
+ rc $(INCLUDEPATHS) $(DEFS) /Fo$@ %s
OBJS= \
obj\util.obj \
@@ -75,11 +77,11 @@ OBJS= \
obj\init.obj
bitcoin.exe: $(OBJS) obj\ui.obj obj\uibase.obj obj\sha.obj obj\ui.res
- link /nologo /DEBUG /SUBSYSTEM:WINDOWS /OUT:$@ $(LIBPATHS) $** $(LIBS)
+ link /nologo /DEBUG /SUBSYSTEM:WINDOWS /OUT:$@ $(LIBPATHS) $** $(WXLIBS) $(LIBS)
.cpp{obj\nogui}.obj:
- cl $(CFLAGS) /DwxUSE_GUI=0 /Fo$@ %s
+ cl $(CFLAGS) /Fo$@ %s
obj\nogui\util.obj: $(HEADERS)
@@ -98,10 +100,10 @@ obj\nogui\rpc.obj: $(HEADERS)
obj\nogui\init.obj: $(HEADERS)
bitcoind.exe: $(OBJS:obj\=obj\nogui\) obj\sha.obj obj\ui.res
- link /nologo /DEBUG /OUT:$@ $(LIBPATHS) $** $(LIBS)
+ link /nologo /DEBUG /OUT:$@ $(LIBPATHS) $** $(LIBS)
clean:
- -del /Q obj\*
- -del *.ilk
- -del *.pdb
+ -del /Q obj\*
+ -del *.ilk
+ -del *.pdb