Other changes

EnergyCoin · Jul 17, 2014 · 05a8f2c · 05a8f2c
1 parent 2655d15
commit 05a8f2c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/energycoin-qt.pro b/energycoin-qt.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = energycoin-qt
-VERSION = 0.7.2
+VERSION = 1.1.3
 INCLUDEPATH += src src/json src/qt
 QT += network
 DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN __NO_SYSTEM_INCLUDES
@@ -17,15 +17,17 @@ greaterThan(QT_MAJOR_VERSION, 4) {
 #    BOOST_INCLUDE_PATH, BOOST_LIB_PATH, BDB_INCLUDE_PATH,
 #    BDB_LIB_PATH, OPENSSL_INCLUDE_PATH and OPENSSL_LIB_PATH respectively
 
-BOOST_LIB_SUFFIX=-mgw48-mt-s-1_50 
-BOOST_INCLUDE_PATH=C:/boost-1.50.0-mgw
-BOOST_LIB_PATH=C:/boost-1.50.0-mgw/stage/lib
-BDB_INCLUDE_PATH=C:/db-4.8.30.NC-mgw/build_unix
-BDB_LIB_PATH=C:/db-4.8.30.NC-mgw/build_unix
-OPENSSL_INCLUDE_PATH=C:/openssl-1.0.1g/include
-OPENSSL_LIB_PATH=C:/openssl-1.0.1g
-MINIUPNPC_INCLUDE_PATH=C:/
-MINIUPNPC_LIB_PATH=C:/miniupnpc-1.6-mgw
+# For Windows, specify path and options from command line:
+#   qmake energycoin-qt.pro RELEASE=1 USE_UPNP=1 -config release QMAKE_LFLAGS+="-static-libgcc -static-libstdc++" BOOST_INCLUDE_PATH=C:/MinGW/msys/1.0/local/include BOOST_LIB_PATH=C:/MinGW/msys/1.0/local/lib BOOST_LIB_SUFFIX=-mgw46-mt-s-1_54
+#BOOST_LIB_SUFFIX=-mgw48-mt-s-1_50 
+#BOOST_INCLUDE_PATH=C:/boost-1.50.0-mgw
+#BOOST_LIB_PATH=C:/boost-1.50.0-mgw/stage/lib
+#BDB_INCLUDE_PATH=C:/db-4.8.30.NC-mgw/build_unix
+#BDB_LIB_PATH=C:/db-4.8.30.NC-mgw/build_unix
+#OPENSSL_INCLUDE_PATH=C:/openssl-1.0.1g/include
+#OPENSSL_LIB_PATH=C:/openssl-1.0.1g
+#MINIUPNPC_INCLUDE_PATH=C:/
+#MINIUPNPC_LIB_PATH=C:/miniupnpc-1.6-mgw
 
 OBJECTS_DIR = build
 MOC_DIR = build

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -8,7 +8,7 @@
 // These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR       1
 #define CLIENT_VERSION_MINOR       1
-#define CLIENT_VERSION_REVISION    2
+#define CLIENT_VERSION_REVISION    3
 #define CLIENT_VERSION_BUILD       0
 
 // Converts the parameter X to a string after macro replacement on X has been performed.

diff --git a/src/net.cpp b/src/net.cpp
@@ -1149,9 +1149,10 @@ void MapPort()
 // The first name is used as information source for addrman.
 // The second name should resolve to a list of seed addresses.
 static const char *strDNSSeed[][2] = {
-	{"207.12.89.180", "207.12.89.180"},
+    {"207.12.89.180", "207.12.89.180"},
     {"212.114.59.109", "212.114.59.109"},
-	{"162.243.248.229", "162.243.248.229"},
+    {"162.243.248.229", "162.243.248.229"},
+    {NULL, NULL}
 };
 
 void ThreadDNSAddressSeed(void* parg)

diff --git a/src/netbase.h b/src/netbase.h
@@ -117,7 +117,10 @@ class CService : public CNetAddr
         std::string ToStringIPPort() const;
         void print() const;
 
-
+#ifdef USE_IPV6
+        CService(const struct in6_addr& ipv6Addr, unsigned short port);
+        CService(const struct sockaddr_in6& addr);
+#endif
 
         IMPLEMENT_SERIALIZE
             (