Skip to content

Commit

Permalink
Merge pull request #2 from Fuzzbawls/master
Browse files Browse the repository at this point in the history
Updates for new release version 1.1.1
  • Loading branch information
audiotopix committed Jul 30, 2017
2 parents be7c3c9 + 8c7bb48 commit e467c23
Show file tree
Hide file tree
Showing 112 changed files with 150 additions and 52,830 deletions.
34 changes: 34 additions & 0 deletions .gitignore
@@ -0,0 +1,34 @@
src/*.exe
src/Neutrond
src/test_neutron
.*.swp
*.*~*
*.bak
*.rej
*.orig
*.o
*.patch
.neutron
.qmake.stash

# Compilation and Qt preprocessor part
*.qm
Makefile
Neutron-qt
Neutron-qt.app

# Unit-tests
Makefile.test
neutron-qt_test

# Resources cpp
qrc_*.cpp

# Qt creator
*.pro.user

# Mac specific
.DS_Store
build

!src/leveldb-*/Makefile
12 changes: 5 additions & 7 deletions Neutron-qt.pro
@@ -1,6 +1,6 @@
TEMPLATE = app
TARGET = Neutron-qt
VERSION = 1.0.7
VERSION = 1.1.1
INCLUDEPATH += src src/json src/qt
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
CONFIG += no_include_pwd
Expand Down Expand Up @@ -28,8 +28,8 @@ UI_DIR = build

# use: qmake "RELEASE=1"
contains(RELEASE, 1) {
# Mac: compile for maximum compatibility (10.5, 32-bit)
macx:QMAKE_CXXFLAGS += -mmacosx-version-min=10.5 -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk
# Mac: compile for maximum compatibility (10.7, 64-bit)
macx:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -arch x86_64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk

!windows:!macx {
# Linux: static link
Expand Down Expand Up @@ -88,7 +88,7 @@ SOURCES += src/txdb-leveldb.cpp
QMAKE_RANLIB = $$replace(QMAKE_STRIP, strip, ranlib)
}
LIBS += -lshlwapi
#genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a
genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a
}
genleveldb.target = $$PWD/src/leveldb/libleveldb.a
genleveldb.depends = FORCE
Expand Down Expand Up @@ -177,7 +177,6 @@ HEADERS += src/qt/bitcoingui.h \
src/walletdb.h \
src/script.h \
src/init.h \
src/irc.h \
src/mruset.h \
src/json/json_spirit_writer_template.h \
src/json/json_spirit_writer.h \
Expand Down Expand Up @@ -251,7 +250,6 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/miner.cpp \
src/init.cpp \
src/net.cpp \
src/irc.cpp \
src/checkpoints.cpp \
src/addrman.cpp \
src/db.cpp \
Expand Down Expand Up @@ -478,7 +476,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
macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0
macx:ICON = src/qt/res/icons/bitcoin.icns
macx:ICON = src/qt/res/icons/neutron.icns
macx:TARGET = "Neutron-Qt"
macx:QMAKE_CFLAGS_THREAD += -pthread
macx:QMAKE_LFLAGS_THREAD += -pthread
Expand Down

0 comments on commit e467c23

Please sign in to comment.