AskDavis/Casinotest
1
0
Fork 0
mirror of https://github.com/AskDavis/Casinotest.git synced 2025-12-31 20:55:58 -08:00
Code Issues Packages Projects Releases Wiki Activity

Release v3 updates

Browse Source
This commit is contained in:
Andre Jochems
2016-06-14 15:44:53 +02:00
parent ab4d8be388
commit f25171d266
10 changed files with 58 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
casinocoin-qt-windows.pro
View File

@@ -16,6 +16,8 @@ BOOST_INCLUDE_PATH=C:/msys64/usr/src/deps32/boost_1_60_0
BDB_INCLUDE_PATH=C:/msys64/usr/src/deps32/db-4.8.30.NC/build_unix
BDB_LIB_PATH=C:/msys64/usr/src/deps32/db-4.8.30.NC/build_unix
BDB_LIB_SUFFIX=-4.8
OPENSSL_INCLUDE_PATH=C:/msys64/usr/src/deps32/openssl-1.0.2g/include
OPENSSL_LIB_PATH=C:/msys64/usr/src/deps32/openssl-1.0.2g
MINIUPNPC_INCLUDE_PATH=C:/msys64/usr/src/deps32/miniupnpc-1.9/include
MINIUPNPC_LIB_PATH=C:/msys64/usr/src/deps32/miniupnpc-1.9
QRENCODE_INCLUDE_PATH=C:/msys64/usr/src/deps32/qrencode-3.4.4
@@ -424,8 +426,8 @@ RC_FILE = src/qt/res/bitcoin-qt.rc
}
# Set libraries and includes at end, to use platform-defined defaults if not overridden
INCLUDEPATH += $$BDB_INCLUDE_PATH $$QRENCODE_INCLUDE_PATH $$BOOST_INCLUDE_PATH
LIBS += $$join(BDB_LIB_PATH,,-L,) $$join(QRENCODE_LIB_PATH,,-L,) $$join(BOOST_LIB_PATH,,-L,)
INCLUDEPATH += $$BDB_INCLUDE_PATH $$QRENCODE_INCLUDE_PATH $$BOOST_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH
LIBS += $$join(BDB_LIB_PATH,,-L,) $$join(QRENCODE_LIB_PATH,,-L,) $$join(BOOST_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,)
LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX -lpthread
# -lgdi32 has to happen after -lcrypto (see #681)
LIBS += -lws2_32 -lole32 -lmswsock -loleaut32 -luuid -lgdi32 -lshlwapi

6
casinocoin-qt-windows.pro.user
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.0.0, 2016-06-08T18:03:58. -->
<!-- Written by QtCreator 4.0.0, 2016-06-14T10:56:38. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
@@ -62,7 +62,7 @@
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 5.6.0 (mingw32)</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Qt 5.6.0 (mingw32)</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{b3cf2641-46bb-4b28-b7a6-2713d9074823}</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
@@ -73,7 +73,7 @@
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments">&quot;USE_UPNP=0&quot; &quot;USE_QRCODE=1&quot; &quot;USE_IPV6=1&quot;</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>

BIN
contrib/release/favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

11
contrib/release/post-install.txt
View File

@@ -1 +1,10 @@
The wallet has been succesfully installed. Please be aware that this software makes use of OpenGL v2 rendering. On older machines or Virtual Machines that do not have recent video drivers this can cause graphics rendering problems. If this is the case then add the following parameter to your environment settings: QT_OPENGL_DLL = opengl32sw.dll
The wallet has been succesfully installed.
Please be aware of the following two requirements.
- This software makes use of OpenSSL libraries. They may not yet be available on your machine. If you encounter issues with Redeeming Prypto codes or showing the Twitter feed on the Info page they are missing. Local laws may prohibit installing them so they are not installed with the wallet. In that case you must install the OpenSSL libraries manually. You can download and install the light version from https://slproweb.com/products/Win32OpenSSL.html
- This software makes use of OpenGL v2 rendering. On older machines or Virtual Machines that do not have recent video drivers this can cause graphics rendering problems. If this is the case you can enable a software renderer. To do so add the following parameter to your environment settings via Control Panel -> System -> Advanced System Settings -> Environment Variables:
Variable: QT_OPENGL_DLL
Value: opengl32sw.dll

48
src/makefile.mingw
View File

@@ -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
View File

@@ -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}
};

4
src/qt/forms/infopage.ui
View File

@@ -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>

4
src/qt/qtquick_controls/qml/QmlGUIExchangesListView.qml
View File

@@ -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
}

2
src/qt/twitter/twitterwidget.cpp
View File

@@ -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 );
}
}

10
windows-inno-script.iss
View File

@@ -2,7 +2,6 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "Casinocoin"
#define MySetupAppName "casinocoin"
#define MyAppVersion "3.0.0.0"
#define MyAppPublisher "Casinocoin Foundation"
#define MyAppURL "http://www.casinocoin.org"
@@ -12,7 +11,7 @@
; NOTE: The value of AppId uniquely identifies this application.
; Do not use the same AppId value in installers for other applications.
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
AppId={{1698FEC3-9D7C-43F3-B379-9028E51F8B56}
AppId={{DFC9C26D-B51B-4EB5-A10C-1AA469AA73DA}
AppName={#MyAppName}
AppVersion={#MyAppVersion}
;AppVerName={#MyAppName} {#MyAppVersion}
@@ -22,7 +21,10 @@ AppSupportURL={#MyAppURL}
AppUpdatesURL={#MyAppURL}
DefaultDirName={pf}\{#MyAppName}
DisableProgramGroupPage=yes
OutputBaseFilename={#MySetupAppName}-{#MyAppVersion}-setup
LicenseFile=.\contrib\release\DISCLAIMER
InfoAfterFile=.\contrib\release\post-install.txt
OutputBaseFilename={#MyAppName}-{#MyAppVersion}-setup
SetupIconFile=.\contrib\release\favicon.ico
Compression=lzma
SolidCompression=yes
@@ -33,7 +35,9 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
[Files]
Source: "C:\Users\a.jochems\Documents\GitHub\casinocoin-development\release\casinocoin-qt.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "C:\Users\a.jochems\Documents\GitHub\casinocoin-development\release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
[Icons]