Merge pull request #1150 from gavinandresen/NOPCH

Remove unused -DNOPCH

diff --combined src/makefile.linux-mingw
index 8e4e638,9bef4d4..4c155f3
--- 1/src/makefile.linux-mingw
--- 2/src/makefile.linux-mingw
+++ b/src/makefile.linux-mingw
@@@ -27,11 -27,10 +27,11 @@@ LIBS= 
   -l ssl \
   -l crypto
  
- DEFS=-D_MT -DWIN32 -D_WINDOWS -DNOPCH -DBOOST_THREAD_USE_LIB
+ DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB
  DEBUGFLAGS=-g
  CFLAGS=-O2 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
  
 +TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
  
  ifdef USE_UPNP
        LIBPATHS += -L"$(DEPSDIR)/miniupnpc"
@@@ -79,19 -78,20 +79,19 @@@ obj/%.o: %.cpp $(HEADERS
  bitcoind.exe: $(OBJS:obj/%=obj/%)
        i586-mingw32msvc-g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
  
 +TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
  
 -obj/test/%.o: obj/test/%.cpp $(HEADERS)
 -      i586-mingw32msvc-g++ -c $(CFLAGS) -o $@ $<
 +obj-test/%.o: test/%.cpp $(HEADERS)
 +      i586-mingw32msvc-g++ -c $(TESTDEFS) $(CFLAGS) -o $@ $<
  
 -test_bitcoin.exe: obj/test/test_bitcoin.o $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
 -      i586-mingw32msvc-g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) -lboost_unit_test_framework-mt-s
 +test_bitcoin.exe: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
 +      i586-mingw32msvc-g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ -lboost_unit_test_framework $(LIBS)
  
  
  clean:
        -rm -f obj/*.o
 -      -rm -f obj/test/*.o
 -      -rm -f test/*.o
 -      -rm -f headers.h.gch
        -rm -f bitcoind.exe
 +      -rm -f obj-test/*.o
        -rm -f test_bitcoin.exe
        -rm -f src/build.h
  

diff --combined src/makefile.mingw
index abcdcce,dcb46ef..917eb12
--- 1/src/makefile.mingw
--- 2/src/makefile.mingw
+++ b/src/makefile.mingw
@@@ -23,11 -23,10 +23,11 @@@ LIBS= 
   -l ssl \
   -l crypto
  
- DEFS=-DWIN32 -D_WINDOWS -DNOPCH -DBOOST_THREAD_USE_LIB
+ DEFS=-DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB
  DEBUGFLAGS=-g
  CFLAGS=-mthreads -O2 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
  
 +TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
  
  ifdef USE_UPNP
   INCLUDEPATHS += -I"C:\miniupnpc-1.6-mgw"
@@@ -72,16 -71,17 +72,16 @@@ obj/%.o: %.cpp $(HEADERS
  bitcoind.exe: $(OBJS:obj/%=obj/%)
        g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
  
 -obj/test/test_bitcoin.o: $(wildcard test/*.cpp) $(HEADERS)
 -      g++ -c $(CFLAGS) -o $@ test/test_bitcoin.cpp
 +TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
  
 -test_bitcoin.exe: obj/test/test_bitcoin.o $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
 -      g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
 +obj-test/%.o: test/%.cpp $(HEADERS)
 +      g++ -c $(TESTDEFS) $(CFLAGS) -o $@ $<
 +
 +test_bitcoin.exe: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
 +      g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ -lboost_unit_test_framework $(LIBS)
  
  clean:
        -del /Q bitcoind test_bitcoin
        -del /Q obj\*
 -      -del /Q obj\nogui\*
 -      -del /Q obj\test\*
 -      -del /Q test\*.o
 -      -del /Q headers.h.gch
 +      -del /Q obj-test\*
        -del /Q build.h

diff --combined src/makefile.unix
index 146f6b8,24ee06e..90be398
--- 1/src/makefile.unix
--- 2/src/makefile.unix
+++ b/src/makefile.unix
@@@ -4,13 -4,11 +4,13 @@@
  
  USE_UPNP:=0
  
- DEFS=-DNOPCH
+ DEFS=
  
  DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/obj $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH))
  LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH))
  
 +TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
 +
  LMODE = dynamic
  LMODE2 = dynamic
  ifdef STATIC