Merge pull request #400 from peercoin/fixtravis

fix travis

.travis.yml

@@ -59,18 +59,18 @@ matrix:
         script:
           - ./archive.sh
           - travis_wait 60 docker build -f scripts/docker/windows-crosscompile/Dockerfile-trusty .
-      - os: linux
-        sudo: required
-        env:
-          - V=windows-ubuntu
-        before_install:
-          - cd $TRAVIS_BUILD_DIR/scripts/windows-crosscompile
-          - pwd && ls -al
-          - travis_wait 60 ./dependencies.sh
-          - cd $TRAVIS_BUILD_DIR
-        install: true
-        script:
-          - travis_wait 60 ./scripts/windows-crosscompile/compile-peercoin.sh
+      #- os: linux
+      #  sudo: required
+      #  env:
+      #    - V=windows-ubuntu
+      #  before_install:
+      #    - cd $TRAVIS_BUILD_DIR/scripts/windows-crosscompile
+      #    - pwd && ls -al
+      #    - travis_wait 60 ./dependencies.sh
+      #    - cd $TRAVIS_BUILD_DIR
+      #  install: true
+      #  script:
+      #    - travis_wait 60 ./scripts/windows-crosscompile/compile-peercoin.sh
       #osx     
       - os: osx
         osx_image: xcode9.2

configure.ac

@@ -174,7 +174,7 @@ AC_ARG_ENABLE([wallet],
 ##       compatibility with the legacy buildsystem.
 ##
 CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter"
-CPPFLAGS="$CPPFLAGS -DBOOST_SPIRIT_THREADSAFE -DHAVE_BUILD_INFO"
+CPPFLAGS="$CPPFLAGS -DBOOST_SPIRIT_THREADSAFE -DBOOST_NO_CXX11_SCOPED_ENUMS -DHAVE_BUILD_INFO"
 DEBUG_CXXFLAGS="-g -ggdb"
 RELEASE_CXXFLAGS="-O2"
 

src/makefile.linux-mingw

@@ -33,7 +33,7 @@ LIBS= \
  -l ssl \
  -l crypto
 
-DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE -DHAVE_WORKING_BOOST_SLEEP_FOR
+DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE -DHAVE_WORKING_BOOST_SLEEP_FOR -DBOOST_NO_CXX11_SCOPED_ENUMS
 DEBUGFLAGS=-g
 xCXXFLAGS=-O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) $(CXXFLAGS)
 # enable: ASLR, DEP and large address aware

src/makefile.osx

@@ -57,7 +57,7 @@ LIBS += \
 TESTDEFS += -DBOOST_TEST_DYN_LINK
 endif
 
-DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DBOOST_SPIRIT_THREADSAFE -DHAVE_WORKING_BOOST_SLEEP_FOR
+DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DBOOST_SPIRIT_THREADSAFE -DHAVE_WORKING_BOOST_SLEEP_FOR -DBOOST_NO_CXX11_SCOPED_ENUMS
 
 ifdef RELEASE
 CFLAGS = -mmacosx-version-min=10.5 -O3

src/makefile.osx-mavericks

@@ -63,7 +63,7 @@ LIBS += \
 TESTDEFS += -DBOOST_TEST_DYN_LINK
 endif
 
-DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DBOOST_SPIRIT_THREADSAFE -DHAVE_WORKING_BOOST_SLEEP_FOR
+DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DBOOST_SPIRIT_THREADSAFE -DHAVE_WORKING_BOOST_SLEEP_FOR -DBOOST_NO_CXX11_SCOPED_ENUMS
 
 ifdef RELEASE
 CFLAGS = -mmacosx-version-min=10.5 -O3

src/makefile.unix

@@ -14,7 +14,7 @@ USE_IPV6:=1
 
 LINK:=$(CXX)
 
-DEFS=-DBOOST_SPIRIT_THREADSAFE -D_FILE_OFFSET_BITS=64 -DHAVE_WORKING_BOOST_SLEEP_FOR
+DEFS=-DBOOST_SPIRIT_THREADSAFE -D_FILE_OFFSET_BITS=64 -DHAVE_WORKING_BOOST_SLEEP_FOR -DBOOST_NO_CXX11_SCOPED_ENUMS
 
 DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/obj $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH))
 LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH))