From 84c3fb07b0b8199c7f85c5de280e7100bad0786f Mon Sep 17 00:00:00 2001 From: Jaromil Date: Sat, 23 Apr 2011 11:49:47 +0200 Subject: directory re-organization (keeps the old build system) there is no internal modification of any file in this commit files are moved into directories according to established standards in sourcecode distribution; these directories contain: src - Files that are used in constructing the executable binaries, but are not installed. doc - Files in HTML and text format that document usage, quirks of the implementation, and contributor checklists. locale - Files that contain human language translation of strings used in the program contrib - Files contributed from distributions or other third party implementing scripts and auxiliary programs --- src/makefile.vc | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) create mode 100644 src/makefile.vc (limited to 'src/makefile.vc') diff --git a/src/makefile.vc b/src/makefile.vc new file mode 100644 index 000000000..18ced0236 --- /dev/null +++ b/src/makefile.vc @@ -0,0 +1,119 @@ +# Copyright (c) 2009-2010 Satoshi Nakamoto +# Distributed under the MIT/X11 software license, see the accompanying +# file license.txt or http://www.opensource.org/licenses/mit-license.php. + + +INCLUDEPATHS= \ + /I"/boost" \ + /I"/db/build_windows" \ + /I"/openssl/include" \ + /I"/wxwidgets/lib/vc_lib/mswu" \ + /I"/wxwidgets/include" + +LIBPATHS= \ + /LIBPATH:"/boost/stage/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=wxmsw29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib + +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 \ + 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 \ + script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h + +OBJS= \ + obj\util.obj \ + obj\script.obj \ + obj\db.obj \ + obj\net.obj \ + obj\irc.obj \ + obj\main.obj \ + obj\rpc.obj \ + obj\init.obj \ + cryptopp\obj\sha.obj \ + cryptopp\obj\cpu.obj + + +all: bitcoin.exe + + +.cpp{obj}.obj: + cl $(CFLAGS) /DGUI /Fo$@ %s + +obj\util.obj: $(HEADERS) + +obj\script.obj: $(HEADERS) + +obj\db.obj: $(HEADERS) + +obj\net.obj: $(HEADERS) + +obj\irc.obj: $(HEADERS) + +obj\main.obj: $(HEADERS) + +obj\rpc.obj: $(HEADERS) + +obj\init.obj: $(HEADERS) + +obj\ui.obj: $(HEADERS) + +obj\uibase.obj: $(HEADERS) + +cryptopp\obj\sha.obj: cryptopp\sha.cpp + cl $(CFLAGS) /O2 /DCRYPTOPP_DISABLE_ASM /Fo$@ %s + +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 + rc $(INCLUDEPATHS) $(DEFS) /Fo$@ %s + +bitcoin.exe: $(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 + +obj\nogui\util.obj: $(HEADERS) + +obj\nogui\script.obj: $(HEADERS) + +obj\nogui\db.obj: $(HEADERS) + +obj\nogui\net.obj: $(HEADERS) + +obj\nogui\irc.obj: $(HEADERS) + +obj\nogui\main.obj: $(HEADERS) + +obj\nogui\rpc.obj: $(HEADERS) + +obj\nogui\init.obj: $(HEADERS) + +bitcoind.exe: $(OBJS:obj\=obj\nogui\) obj\ui.res + link /nologo /OUT:$@ $(LIBPATHS) $** $(LIBS) + + +clean: + -del /Q obj\* + -del /Q obj\nogui\* + -del /Q cryptopp\obj\* + -del /Q *.ilk + -del /Q *.pdb -- cgit v1.2.3 From f8b5028cd1092faa5c8b360a5f76462a80d0b629 Mon Sep 17 00:00:00 2001 From: Eric Hosmer Date: Fri, 1 Jul 2011 12:58:48 -0400 Subject: Updated Visual C++ makefile. --- src/makefile.vc | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) (limited to 'src/makefile.vc') diff --git a/src/makefile.vc b/src/makefile.vc index 18ced0236..d5aba3e69 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) -- cgit v1.2.3 From 12a4af47c28ed847aefaff7cd6ec888fac424603 Mon Sep 17 00:00:00 2001 From: Eric Hosmer Date: Fri, 1 Jul 2011 20:14:02 -0400 Subject: Further updated Visual C++ makefile. --- src/makefile.vc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/makefile.vc') diff --git a/src/makefile.vc b/src/makefile.vc index d5aba3e69..2c1553ae1 100644 --- a/src/makefile.vc +++ b/src/makefile.vc @@ -46,7 +46,7 @@ LIBS=$(LIBS) \ 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 + script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h wallet.h OBJS= \ obj\util.obj \ @@ -54,7 +54,9 @@ OBJS= \ obj\db.obj \ obj\net.obj \ obj\irc.obj \ + obj\keystore.obj \ obj\main.obj \ + obj\wallet.obj \ obj\rpc.obj \ obj\init.obj @@ -81,8 +83,12 @@ obj\net.obj: $(HEADERS) obj\irc.obj: $(HEADERS) +obj\keystore.obj: $(HEADERS) + obj\main.obj: $(HEADERS) +obj\wallet.obj: $(HEADERS) + obj\rpc.obj: $(HEADERS) obj\init.obj: $(HEADERS) @@ -117,8 +123,12 @@ obj\nogui\net.obj: $(HEADERS) obj\nogui\irc.obj: $(HEADERS) +obj\nogui\keystore.obj: $(HEADERS) + obj\nogui\main.obj: $(HEADERS) +obj\nogui\wallet.obj: $(HEADERS) + obj\nogui\rpc.obj: $(HEADERS) obj\nogui\init.obj: $(HEADERS) -- cgit v1.2.3 From 58d9badfe2170742fe66551acf8e4c02e8f3a98c Mon Sep 17 00:00:00 2001 From: Eric Hosmer Date: Fri, 1 Jul 2011 20:17:10 -0400 Subject: Add keystore.h to makefile.vs's header list. --- src/makefile.vc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/makefile.vc') diff --git a/src/makefile.vc b/src/makefile.vc index 2c1553ae1..b25ba60c5 100644 --- a/src/makefile.vc +++ b/src/makefile.vc @@ -46,7 +46,7 @@ LIBS=$(LIBS) \ 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 wallet.h + script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h wallet.h keystore.h OBJS= \ obj\util.obj \ -- cgit v1.2.3