From 025d495481f2313a1550d8d101415ff3e3a6b89f Mon Sep 17 00:00:00 2001 From: Gavin Andresen Date: Thu, 12 Jan 2012 16:55:44 -0500 Subject: [PATCH] Remove broken Visual C++ makefile.vc, and removed annoying HEADERS= list from other makefiles --- src/makefile.linux-mingw | 26 +------ src/makefile.mingw | 27 +------ src/makefile.osx | 23 ------ src/makefile.unix | 23 ------ src/makefile.vc | 153 --------------------------------------- 5 files changed, 7 insertions(+), 245 deletions(-) delete mode 100644 src/makefile.vc diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index d837691f..5868a180 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -29,29 +29,6 @@ LIBS= \ DEFS=-D_MT -DWIN32 -D_WINDOWS -DNOPCH -DUSE_SSL -DBOOST_THREAD_USE_LIB DEBUGFLAGS=-g CFLAGS=-O2 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) -HEADERS = \ - base58.h \ - bignum.h \ - checkpoints.h \ - compat.h \ - crypter.h \ - db.h \ - headers.h \ - init.h \ - irc.h \ - key.h \ - keystore.h \ - main.h \ - net.h \ - noui.h \ - protocol.h \ - bitcoinrpc.h \ - script.h \ - serialize.h \ - strlcpy.h \ - uint256.h \ - util.h \ - wallet.h ifdef USE_UPNP @@ -62,6 +39,9 @@ endif LIBS += -l mingwthrd -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l shlwapi +# TODO: make the mingw builds smarter about dependencies, like the linux/osx builds are +HEADERS = $(wildcard *.h) + OBJS= \ obj/checkpoints.o \ obj/netbase.o \ diff --git a/src/makefile.mingw b/src/makefile.mingw index ac1e4c75..08379401 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -26,29 +26,7 @@ LIBS= \ DEFS=-DWIN32 -D_WINDOWS -DNOPCH -DUSE_SSL -DBOOST_THREAD_USE_LIB DEBUGFLAGS=-g CFLAGS=-mthreads -O2 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) -HEADERS = \ - base58.h \ - bignum.h \ - checkpoints.h \ - compat.h \ - crypter.h \ - db.h \ - headers.h \ - init.h \ - irc.h \ - key.h \ - keystore.h \ - main.h \ - net.h \ - noui.h \ - protocol.h \ - bitcoinrpc.h \ - script.h \ - serialize.h \ - strlcpy.h \ - uint256.h \ - util.h \ - wallet.h + ifdef USE_UPNP INCLUDEPATHS += -I"C:\miniupnpc-1.6-mgw" @@ -59,6 +37,9 @@ endif LIBS += -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l shlwapi +# TODO: make the mingw builds smarter about dependencies, like the linux/osx builds are +HEADERS = $(wildcard *.h) + OBJS= \ obj/checkpoints.o \ obj/netbase.o \ diff --git a/src/makefile.osx b/src/makefile.osx index 4c124e6f..78ecdb8d 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -47,29 +47,6 @@ DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DUSE_SSL DEBUGFLAGS=-g # ppc doesn't work because we don't support big-endian CFLAGS=-mmacosx-version-min=10.5 -arch i386 -O3 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) -HEADERS = \ - base58.h \ - bignum.h \ - checkpoints.h \ - compat.h \ - crypter.h \ - db.h \ - headers.h \ - init.h \ - irc.h \ - key.h \ - keystore.h \ - main.h \ - net.h \ - noui.h \ - protocol.h \ - bitcoinrpc.h \ - script.h \ - serialize.h \ - strlcpy.h \ - uint256.h \ - util.h \ - wallet.h OBJS= \ obj/checkpoints.o \ diff --git a/src/makefile.unix b/src/makefile.unix index 8b41b74a..dad100db 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -84,29 +84,6 @@ LIBS+= \ DEBUGFLAGS=-g CXXFLAGS=-O2 xCXXFLAGS=-pthread -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(HARDENING) $(CXXFLAGS) -HEADERS = \ - base58.h \ - bignum.h \ - checkpoints.h \ - compat.h \ - crypter.h \ - db.h \ - headers.h \ - init.h \ - irc.h \ - key.h \ - keystore.h \ - main.h \ - net.h \ - noui.h \ - protocol.h \ - bitcoinrpc.h \ - script.h \ - serialize.h \ - strlcpy.h \ - uint256.h \ - util.h \ - wallet.h OBJS= \ obj/checkpoints.o \ diff --git a/src/makefile.vc b/src/makefile.vc deleted file mode 100644 index 60f1e096..00000000 --- a/src/makefile.vc +++ /dev/null @@ -1,153 +0,0 @@ -# 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"/miniupnpc" - -LIBPATHS= \ - /LIBPATH:"/boost/stage/lib" \ - /LIBPATH:"/db/build_windows/Release" \ - /LIBPATH:"/openssl/lib" \ - /LIBPATH:"/miniupnpc/msvc/Release" \ - /NODEFAULTLIB:libc.lib /NODEFAULTLIB:libcmt.lib \ - /NODEFAULTLIB:libcd.lib /NODEFAULTLIB:libcmtd.lib \ - /NODEFAULTLIB:msvcrtd.lib - -USE_UPNP=0 - -DEFS=/DWIN32 /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 - -!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 iphlpapi.lib - -DEBUGFLAGS=/Os -CFLAGS=/MD /c /nologo /EHsc /GR /Zm300 $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) -HEADERS = \ - base58.h \ - bignum.h \ - checkpoints.h \ - crypter.h \ - db.h \ - headers.h \ - init.h \ - irc.h \ - key.h \ - keystore.h \ - main.h \ - net.h \ - noui.h \ - protocol.h \ - bitcoinrpc.h \ - script.h \ - serialize.h \ - strlcpy.h \ - ui.h \ - uibase.h \ - uint256.h \ - util.h \ - wallet.h - -OBJS= \ - obj\checkpoints.o \ - obj\crypter.o \ - obj\db.o \ - obj\init.o \ - obj\irc.o \ - obj\keystore.o \ - obj\main.o \ - obj\net.o \ - obj\rpc.o \ - obj\protocol.o \ - obj\script.o \ - obj\util.o \ - obj\wallet.o - -RC=../share - - -all: bitcoind.exe - - -.cpp{obj}.obj: - cl $(CFLAGS) /DGUI /Fo$@ %s - -obj\checkpoints.obj: $(HEADERS) - -obj\util.obj: $(HEADERS) - -obj\script.obj: $(HEADERS) - -obj\db.obj: $(HEADERS) - -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) - -obj\crypter.obj: $(HEADERS) - -obj\ui.obj: $(HEADERS) - -obj\uibase.obj: $(HEADERS) - -.cpp{obj\nogui}.obj: - cl $(CFLAGS) /Fo$@ %s - -obj\nogui\checkpoints.obj: $(HEADERS) - -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\keystore.obj: $(HEADERS) - -obj\nogui\main.obj: $(HEADERS) - -obj\nogui\wallet.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 *.ilk - -del /Q *.pdb - -del /Q bitcoind.exe