X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fmakefile.mingw;h=d7f2f53a78150d674f57897a328f86d3f148749d;hb=3176e0f244d929669aa3e1d81e0787d82d9150d3;hp=b793bea85d50add16f0de5db21c62779e80837b6;hpb=b76dbc1806483254e6092e25a8d61069905b9ff1;p=novacoin.git

diff --git a/src/makefile.mingw b/src/makefile.mingw
index b793bea..d7f2f53 100644
--- a/src/makefile.mingw
+++ b/src/makefile.mingw
@@ -42,10 +42,20 @@
 #     cd c:\boost-1.47.0-mgw
 #     bjam toolset=gcc --build-type=complete stage
 #
-# - Build ppcoind.exe
+# - Build Miniupnp library version: 1.6
+#   download from http://miniupnp.free.fr/files/
+#   file name is miniupnpc-1.6.20120509.tar.gz
+#   Extract to c:\miniupnpc-1.6-mgw
+#   In MinGW MSYS shell:
+#     cd /c/miniupnpc-1.6-mgw
+#     make -f Makefile.mingw
+#     mkdir miniupnpc
+#     cp *.h miniupnpc/
+#
+# - Build novacoind.exe
 #   in MinGW MSYS
-#     cd ppcoin/src
-#     make ppcoind.exe -f makefile.mingw USE_UPNP=
+#     cd novacoin/src
+#     make novacoind.exe -f makefile.mingw USE_UPNP=1
 #
 #
 
@@ -54,12 +64,12 @@ USE_UPNP:=0
 INCLUDEPATHS= \
  -I"C:\boost-1.47.0-mgw" \
  -I"C:\db-4.8.30.NC-mgw\build_unix" \
- -I"C:\openssl-1.0.0d-mgw\include"
+ -I"C:\openssl-1.0.1b-mgw\include"
 
 LIBPATHS= \
  -L"C:\boost-1.47.0-mgw\stage\lib" \
  -L"C:\db-4.8.30.NC-mgw\build_unix" \
- -L"C:\openssl-1.0.0d-mgw"
+ -L"C:\openssl-1.0.1b-mgw"
 
 LIBS= \
  -l boost_system-mgw46-mt-s-1_47 \
@@ -70,31 +80,11 @@ LIBS= \
  -l ssl \
  -l crypto
 
-DEFS=-DWIN32 -D_WINDOWS -DNOPCH -DUSE_SSL -DBOOST_THREAD_USE_LIB
+DEFS=-DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE
 DEBUGFLAGS=-g
-CFLAGS=-mthreads -O2 -w -Wno-invalid-offsetof -Wformat $(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 \
-    uint256.h \
-    util.h \
-    wallet.h
+CFLAGS=-mthreads -msse2 -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"
@@ -105,9 +95,16 @@ 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/version.o \
     obj/checkpoints.o \
+    obj/netbase.o \
+    obj/addrman.o \
     obj/crypter.o \
+    obj/key.o \
     obj/db.o \
     obj/init.o \
     obj/irc.o \
@@ -116,29 +113,43 @@ OBJS= \
     obj/net.o \
     obj/protocol.o \
     obj/bitcoinrpc.o \
+    obj/rpcdump.o \
     obj/script.o \
     obj/util.o \
-    obj/wallet.o
+    obj/wallet.o \
+    obj/walletdb.o \
+    obj/noui.o \
+    obj/kernel.o \
+    obj/pbkdf2.o \
+    obj/scrypt_mine.o \
+    obj/scrypt-x86.o \
+    obj/scrypt-x86_64.o
 
 
-all: ppcoind.exe
+all: novacoind.exe
 
-obj/nogui/%.o: %.cpp $(HEADERS)
+obj/%.o: %.cpp $(HEADERS)
 	g++ -c $(CFLAGS) -o $@ $<
 
-ppcoind.exe: $(OBJS:obj/%=obj/nogui/%)
-	g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
+obj/scrypt-x86.o: scrypt-x86.S
+	$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
 
-obj/test/test_bitcoin.o: $(wildcard test/*.cpp) $(HEADERS)
-	g++ -c $(CFLAGS) -o $@ test/test_bitcoin.cpp
+obj/scrypt-x86_64.o: scrypt-x86_64.S
+	$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
 
-test_bitcoin.exe: obj/test/test_bitcoin.o $(filter-out obj/nogui/init.o,$(OBJS:obj/%=obj/nogui/%))
+novacoind.exe: $(OBJS:obj/%=obj/%)
 	g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
 
+TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
+
+obj-test/%.o: test/%.cpp $(HEADERS)
+	g++ -c $(TESTDEFS) $(CFLAGS) -o $@ $<
+
+test_novacoin.exe: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
+	g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ -lboost_unit_test_framework $(LIBS)
+
 clean:
-	-del /Q ppcoind test_bitcoin
+	-del /Q novacoind test_novacoin
 	-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