mirror of
https://github.com/AskDavis/Casinotest.git
synced 2026-01-03 20:29:46 -08:00
Release v3 updates
This commit is contained in:
@@ -4,11 +4,6 @@
|
||||
|
||||
# Makefile for the MinGW g++ compiler/toolchain
|
||||
#
|
||||
# Assumes Berkeley DB, Boost, and OpenSSL have all been compiled and installed
|
||||
# into /usr/local (/usr/local/include, /usr/local/lib).
|
||||
#
|
||||
# If dependencies are somewhere else, run 'make DEPSDIR=/path/'
|
||||
#
|
||||
# Boost libraries are given wacky names that include the particular version of
|
||||
# boost you're using; set BOOST_SUFFIX appropriately.
|
||||
#
|
||||
@@ -20,38 +15,37 @@ CXX ?= g++
|
||||
USE_UPNP:=-
|
||||
USE_IPV6:=1
|
||||
|
||||
DEPSDIR?=/usr/local
|
||||
BOOST_SUFFIX?=-mgw49-mt-s-1_55
|
||||
BOOST_SUFFIX?=-mt
|
||||
|
||||
INCLUDEPATHS= \
|
||||
-I"$(CURDIR)" \
|
||||
-I"C:\deps\boost_1_55_0" \
|
||||
-I"C:\deps\db-4.8.30.NC\build_unix" \
|
||||
-I"C:\deps\openssl-1.0.2d\include" \
|
||||
-I"C:\deps\qrencode-3.4.3"
|
||||
-I"C:/msys64/usr/src/deps32/boost_1_60_0" \
|
||||
-I"C:/msys64/usr/src/deps32/db-4.8.30.NC/build_unix" \
|
||||
-I"C:/msys64/usr/src/deps32/openssl-1.0.2g/include" \
|
||||
-I"C:/msys64/usr/src/deps32/qrencode-3.4.4"
|
||||
|
||||
LIBPATHS= \
|
||||
-L"$(CURDIR)/leveldb" \
|
||||
-L"C:\deps\boost_1_55_0\stage\lib" \
|
||||
-L"C:\deps\db-4.8.30.NC\build_unix" \
|
||||
-L"C:\deps\openssl-1.0.2d" \
|
||||
-L"C:\deps\qrencode-3.4.3\.libs"
|
||||
-L"C:/msys64/usr/src/deps32/boost_1_60_0/stage/lib" \
|
||||
-L"C:/msys64/usr/src/deps32/db-4.8.30.NC/build_unix" \
|
||||
-L"C:/msys64/usr/src/deps32/openssl-1.0.2g" \
|
||||
-L"C:/msys64/usr/src/deps32/qrencode-3.4.4/.libs"
|
||||
|
||||
LIBS= \
|
||||
-l leveldb \
|
||||
-l memenv \
|
||||
-l boost_system$(BOOST_SUFFIX) \
|
||||
-l boost_filesystem$(BOOST_SUFFIX) \
|
||||
-l boost_program_options$(BOOST_SUFFIX) \
|
||||
-l boost_thread$(BOOST_SUFFIX) \
|
||||
-l boost_chrono$(BOOST_SUFFIX) \
|
||||
-l db_cxx \
|
||||
-l ssl \
|
||||
-l crypto
|
||||
-lleveldb \
|
||||
-lmemenv \
|
||||
-lboost_system$(BOOST_SUFFIX) \
|
||||
-lboost_filesystem$(BOOST_SUFFIX) \
|
||||
-lboost_program_options$(BOOST_SUFFIX) \
|
||||
-lboost_thread$(BOOST_SUFFIX) \
|
||||
-lboost_chrono$(BOOST_SUFFIX) \
|
||||
-ldb_cxx \
|
||||
-lssl \
|
||||
-lcrypto
|
||||
|
||||
DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE -DUSE_IPV6 -D__NO_SYSTEM_INCLUDES
|
||||
DEBUGFLAGS=-g
|
||||
CFLAGS=-mthreads -O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) -static
|
||||
CFLAGS=-mthreads -O2 -std=c++11 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) -static
|
||||
# enable: ASLR, DEP and large address aware
|
||||
LDFLAGS=-Wl,--dynamicbase -Wl,--nxcompat -Wl,--large-address-aware -static
|
||||
|
||||
@@ -69,7 +63,7 @@ ifneq (${USE_IPV6}, -)
|
||||
DEFS += -DUSE_IPV6=$(USE_IPV6)
|
||||
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 mswsock -l shlwapi -l pthread
|
||||
LIBS += -lmingwthrd -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lws2_32 -lmswsock -lshlwapi -lpthread
|
||||
|
||||
# TODO: make the mingw builds smarter about dependencies, like the linux/osx builds are
|
||||
HEADERS = $(wildcard *.h)
|
||||
|
||||
12
src/net.cpp
12
src/net.cpp
@@ -1192,14 +1192,18 @@ void MapPort(bool)
|
||||
// The first name is used as information source for addrman.
|
||||
// The second name should resolve to a list of seed addresses.
|
||||
static const char *strMainNetDNSSeed[][2] = {
|
||||
{"casinocoin.org seed", "seed.dig0.com"},
|
||||
{"casinocoin.org seed", "seed1.casinocoin.info"},
|
||||
{"casinocoin.org seed s", "seed.casinocoin.org"},
|
||||
{"casinocoin.org seed #1", "seed1.dig0.com"},
|
||||
{"casinocoin.org seed t", "seed.dig0.com"},
|
||||
{"casinocoin.org seed #1", "seed2.casinocoin.info"},
|
||||
{"casinocoin.org seed #1s", "seed1.casinocoin.org"},
|
||||
{"casinocoin.org seed #2", "seed2.dig0.com"},
|
||||
{"casinocoin.org seed #1t", "seed1.dig0.com"},
|
||||
{"casinocoin.org seed #2", "seed3.casinocoin.info"},
|
||||
{"casinocoin.org seed #2s", "seed2.casinocoin.org"},
|
||||
{"casinocoin.org seed #3", "seed3.dig0.com"},
|
||||
{"casinocoin.org seed #2t", "seed2.dig0.com"},
|
||||
{"casinocoin.org seed #3", "seed4.casinocoin.info"},
|
||||
{"casinocoin.org seed #3s", "seed3.casinocoin.org"},
|
||||
{"casinocoin.org seed #4", "seed5.casinocoin.info"},
|
||||
{NULL, NULL}
|
||||
};
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
<widget class="QFrame" name="coinInfoBox">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
|
||||
<horstretch>3</horstretch>
|
||||
<horstretch>4</horstretch>
|
||||
<verstretch>1</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
@@ -371,7 +371,7 @@
|
||||
<widget class="QFrame" name="twitterFeedBox">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
|
||||
<horstretch>2</horstretch>
|
||||
<horstretch>3</horstretch>
|
||||
<verstretch>1</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
|
||||
@@ -212,7 +212,7 @@ GUIExchangesListView
|
||||
{
|
||||
id: id_exchangeTimeDescription
|
||||
anchors.left: id_exchangeLastUpdateTime.left
|
||||
text: qsTr( "Time:" )
|
||||
text: qsTr( "Updated:" )
|
||||
color: GUI20Skin.colorToolbarMainGradientEnd
|
||||
width: id_exchangeLastUpdateTime.width / 3
|
||||
}
|
||||
@@ -220,7 +220,7 @@ GUIExchangesListView
|
||||
{
|
||||
id: id_exchangeTimeValue
|
||||
anchors.left: id_exchangeTimeDescription.right
|
||||
text: qsTr( m_lastUpdateTime )
|
||||
text: m_lastUpdateTime + " UTC"
|
||||
font.bold: true
|
||||
color: GUI20Skin.colorTextActive
|
||||
}
|
||||
|
||||
@@ -32,7 +32,7 @@ QWidget* TwitterWidget::dockQmlToWidget()
|
||||
pPlaceHolder = QWidget::createWindowContainer( pTwitterWindow, this );
|
||||
if ( pPlaceHolder )
|
||||
{
|
||||
pPlaceHolder->setMinimumSize( 500, 170 );
|
||||
pPlaceHolder->setMinimumSize( 300, 150 );
|
||||
pPlaceHolder->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user