X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fmakefile.vc;h=accc762b566d9fd7e5191b530e9045c052ff1df4;hb=565c4771b6eba0eeb82f8602735100bbcf4b053e;hp=b25ba60c50d8514a32e98af43793bb93b1f96f26;hpb=58d9badfe2170742fe66551acf8e4c02e8f3a98c;p=novacoin.git

diff --git a/src/makefile.vc b/src/makefile.vc
index b25ba60..accc762 100644
--- a/src/makefile.vc
+++ b/src/makefile.vc
@@ -7,25 +7,20 @@ INCLUDEPATHS= \
   /I"/boost" \
   /I"/db/build_windows" \
   /I"/openssl/include" \
-  /I"/wxwidgets/lib/vc_lib/mswu" \
-  /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
+DEFS=/DWIN32 /D_WINDOWS /DNOPCH /DNOMINMAX
 
 LIBS= \
   libboost_system-vc100-mt.lib \
@@ -41,24 +36,49 @@ 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
+  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=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 keystore.h
+HEADERS = \
+    base58.h \
+    bignum.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\util.obj \
-    obj\script.obj \
-    obj\db.obj \
-    obj\net.obj \
-    obj\irc.obj \
-	obj\keystore.obj \
-    obj\main.obj \
-	obj\wallet.obj \
-    obj\rpc.obj \
-    obj\init.obj
+    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 \
+    cryptopp\obj\sha.o \
+    cryptopp\obj\cpu.o
 
 CRYPTOPP_OBJS= \
     cryptopp\obj\sha.obj \
@@ -67,7 +87,7 @@ CRYPTOPP_OBJS= \
 RC=../share
 
 
-all: bitcoin.exe
+all: bitcoind.exe
 
 
 .cpp{obj}.obj:
@@ -93,6 +113,8 @@ obj\rpc.obj: $(HEADERS)
 
 obj\init.obj: $(HEADERS)
 
+obj\crypter.obj: $(HEADERS)
+
 obj\ui.obj: $(HEADERS)
 
 obj\uibase.obj: $(HEADERS)
@@ -103,13 +125,6 @@ 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: $(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) $(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
 
@@ -136,10 +151,10 @@ obj\nogui\init.obj: $(HEADERS)
 bitcoind.exe: $(OBJS:obj\=obj\nogui\) $(CRYPTOPP_OBJS) 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
+    -del /Q bitcoind.exe