Permalink
Browse files

Update to 3 minute minimum time

  • Loading branch information...
catcoiner committed Apr 25, 2015
1 parent bca1eaf commit 0cccd2cbed5436a3d8a23d879e92bfc8332f1009
View
@@ -31,4 +31,4 @@ qrc_*.cpp
.DS_Store
build
!src/leveldb-*/Makefile
!src/leveldb/Makefile
View
@@ -12,6 +12,8 @@ etvblu1
0 (zerodrama), Minister of Disinformation
Maverickthenot-so-noob
Andy Hecker (Slimepuppy)
ambethia
nebajoth
And most importantly, the reason the intarwebz can haz cheezeburger
THE CATS
View
@@ -1,25 +1,25 @@
Catcoin integration/staging tree
================================
http://www.catcoin.pw
http://www.catcoin.org
Copyright (c) 2009-2013 Bitcoin Developers
Copyright (c) 2011-2013 Litecoin Developers
Copyright (c) 2013-2014 Catcoin Developers
See the file CREDITS for further info on the cats responsible for this
What is Catcoin?
----------------
Catcoin is a cat version of Litecoin using scrypt as a proof-of-work algorithm but using the same
blockchain parameters as Bitcoin:
Catcoin is a version of the Litecoin cryptographic currency, using scrypt
as a proof-of-work algorithm, and using substantially similiar blockchain
parameters to Bitcoin:
- 50 coins per block
- 10 minutes block targets
- Subsidy halves in 210k blocks
- 21 million total coins
- 36 blocks to retarget difficulty
- 1 block difficulty adjustment, based on a PID control loop adjustment algorithm
For more information, as well as an immediately useable, binary version of
the Catcoin client sofware, see http://www.catcoin.pw.
the Catcoin client sofware, see http://www.catcoin.org
License
-------
@@ -36,19 +36,15 @@ their feature or bug fix is ready.
If it is a simple/trivial/non-controversial change, then one of the Catcoin
development team members simply pulls it.
If it is a *more complicated or potentially controversial* change, then the patch
submitter will be asked to start a discussion (if they haven't already) on the
[mailing list](http://sourceforge.net/mailarchive/forum.php?forum_name=bitcoin-development).
If it is a *more complicated or potentially controversial* change, then the
patch submitter will be asked to start a discussion (if they haven't already)
on #catcoin-dev on IRC. (on the [freenode](http://www.freenode.net) network)
The patch will be accepted if there is broad consensus that it is a good thing.
Developers should expect to rework and resubmit patches if the code doesn't
match the project's coding conventions (see `doc/coding.txt`) or are
controversial.
The `master` branch is regularly built and tested, but is not guaranteed to be
completely stable. [Tags](https://github.com/bitcoin/bitcoin/tags) are created
regularly to indicate new official, stable release versions of Catcoin.
Testing
-------
@@ -68,7 +64,7 @@ Unit tests for the core code are in `src/test/`. To compile and run them:
Unit tests for the GUI code are in `src/qt/test/`. To compile and run them:
qmake BITCOIN_QT_TEST=1 -o Makefile.test bitcoin-qt.pro
qmake BITCOIN_QT_TEST=1 -o Makefile.test catcoin-qt.pro
make -f Makefile.test
./catcoin-qt_test
@@ -1,7 +1,7 @@
TEMPLATE = app
TARGET = catcoin-qt
macx:TARGET = "Catcoin-Qt"
VERSION = 0.8.7
VERSION = 0.8.9
INCLUDEPATH += src src/json src/qt
QT += core gui network
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
@@ -307,7 +307,7 @@ SOURCES += src/qt/bitcoin.cpp \
src/txdb.cpp \
src/qt/splashscreen.cpp
RESOURCES += src/qt/bitcoin.qrc
RESOURCES += src/qt/catcoin.qrc
FORMS += src/qt/forms/sendcoinsdialog.ui \
src/qt/forms/coincontroldialog.ui \
@@ -379,7 +379,7 @@ OTHER_FILES += README.md \
doc/*.rst \
doc/*.txt \
doc/*.md \
src/qt/res/bitcoin-qt.rc \
src/qt/res/catcoin-qt.rc \
src/test/*.cpp \
src/test/*.h \
src/qt/test/*.cpp \
@@ -396,15 +396,15 @@ isEmpty(BOOST_THREAD_LIB_SUFFIX) {
}
isEmpty(BDB_LIB_PATH) {
macx:BDB_LIB_PATH = /opt/local/lib/db48
macx:BDB_LIB_PATH = /opt/local/lib/db53
}
isEmpty(BDB_LIB_SUFFIX) {
macx:BDB_LIB_SUFFIX = -4.8
macx:BDB_LIB_SUFFIX = -5.3
}
isEmpty(BDB_INCLUDE_PATH) {
macx:BDB_INCLUDE_PATH = /opt/local/include/db48
macx:BDB_INCLUDE_PATH = /opt/local/include/db53
}
isEmpty(BOOST_LIB_PATH) {
@@ -416,7 +416,7 @@ isEmpty(BOOST_INCLUDE_PATH) {
}
win32:DEFINES += WIN32
win32:RC_FILE = src/qt/res/bitcoin-qt.rc
win32:RC_FILE = src/qt/res/catcoin-qt.rc
win32:!contains(MINGW_THREAD_BUGFIX, 0) {
# At least qmake's win32-g++-cross profile is missing the -lmingwthrd
@@ -440,7 +440,7 @@ macx:HEADERS += src/qt/macdockiconhandler.h src/qt/macnotificationhandler.h
macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm src/qt/macnotificationhandler.mm
macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit -framework CoreServices
macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0
macx:ICON = src/qt/res/icons/bitcoin.icns
macx:ICON = src/qt/res/icons/catcoin.icns
macx:QMAKE_CFLAGS_THREAD += -pthread
macx:QMAKE_LFLAGS_THREAD += -pthread
macx:QMAKE_CXXFLAGS_THREAD += -pthread
@@ -1,32 +0,0 @@
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index d938c07..e1dd4ec 100644
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -353,7 +353,7 @@
}
isEmpty(BDB_LIB_PATH) {
- macx:BDB_LIB_PATH = /opt/local/lib/db48
+ macx:BDB_LIB_PATH = /usr/local/opt/berkeley-db4/lib
}
isEmpty(BDB_LIB_SUFFIX) {
@@ -361,15 +361,15 @@
}
isEmpty(BDB_INCLUDE_PATH) {
- macx:BDB_INCLUDE_PATH = /opt/local/include/db48
+ macx:BDB_INCLUDE_PATH = /usr/local/opt/berkeley-db4/include
}
isEmpty(BOOST_LIB_PATH) {
- macx:BOOST_LIB_PATH = /opt/local/lib
+ macx:BOOST_LIB_PATH = /usr/local/opt/boost/lib
}
isEmpty(BOOST_INCLUDE_PATH) {
- macx:BOOST_INCLUDE_PATH = /opt/local/include
+ macx:BOOST_INCLUDE_PATH = /usr/local/opt/boost/include
}
win32:DEFINES += WIN32
@@ -1,48 +0,0 @@
diff --git a/src/makefile.osx b/src/makefile.osx
index bef0ef3..07ef8d3 100644
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -7,17 +7,21 @@
# Originally by Laszlo Hanyecz (solar@heliacal.net)
CXX=llvm-g++
-DEPSDIR=/opt/local
+DEPSDIR=/usr/local
+DB4DIR=/usr/local/opt/berkeley-db4
+OPENSSLDIR=/usr/local/opt/openssl
INCLUDEPATHS= \
-I"$(CURDIR)" \
- -I"$(CURDIR)"/obj \
+ -I"$(CURDIR)/obj" \
-I"$(DEPSDIR)/include" \
- -I"$(DEPSDIR)/include/db48"
+ -I"$(DB4DIR)/include" \
+ -I"$(OPENSSLDIR)/include"
LIBPATHS= \
-L"$(DEPSDIR)/lib" \
- -L"$(DEPSDIR)/lib/db48"
+ -L"$(DB4DIR)/lib" \
+ -L"$(OPENSSLDIR)/lib"
USE_UPNP:=1
USE_IPV6:=1
@@ -31,14 +35,14 @@ ifdef STATIC
TESTLIBS += \
$(DEPSDIR)/lib/libboost_unit_test_framework-mt.a
LIBS += \
- $(DEPSDIR)/lib/db48/libdb_cxx-4.8.a \
+ $(DB4DIR)/lib/libdb_cxx-4.8.a \
$(DEPSDIR)/lib/libboost_system-mt.a \
$(DEPSDIR)/lib/libboost_filesystem-mt.a \
$(DEPSDIR)/lib/libboost_program_options-mt.a \
$(DEPSDIR)/lib/libboost_thread-mt.a \
$(DEPSDIR)/lib/libboost_chrono-mt.a \
- $(DEPSDIR)/lib/libssl.a \
- $(DEPSDIR)/lib/libcrypto.a \
+ $(OPENSSLDIR)/lib/libssl.a \
+ $(OPENSSLDIR)/lib/libcrypto.a \
-lz
else
TESTLIBS += \
Oops, something went wrong.

0 comments on commit 0cccd2c

Please sign in to comment.