From: svost Date: Fri, 30 Sep 2016 07:44:39 +0000 (+0300) Subject: Just use X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=7995c701e482b2813a6d7124e1029b06c7ccd832 Just use --- diff --git a/novacoin-qt.pro b/novacoin-qt.pro index 5a9e09f..44c1bcd 100644 --- a/novacoin-qt.pro +++ b/novacoin-qt.pro @@ -4,7 +4,7 @@ VERSION = 0.7.5 INCLUDEPATH += src src/json src/qt QT += core gui network greaterThan(QT_MAJOR_VERSION, 4): QT += widgets -DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE __STDC_FORMAT_MACROS __STDC_LIMIT_MACROS +DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE __STDC_FORMAT_MACROS CONFIG += no_include_pwd CONFIG += thread CONFIG += static diff --git a/src/makefile.bsd b/src/makefile.bsd index 82be177..8469f41 100644 --- a/src/makefile.bsd +++ b/src/makefile.bsd @@ -11,7 +11,7 @@ ARCH:=$(uname -m) LINK:=$(CXX) -DEFS=-DBOOST_SPIRIT_THREADSAFE -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS +DEFS=-DBOOST_SPIRIT_THREADSAFE -D__STDC_FORMAT_MACROS 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)) diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index 19820bd..4762599 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -50,7 +50,7 @@ ifeq (${USE_O3}, 1) xOPT_LEVEL=-O3 endif -DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS +DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE -D__STDC_FORMAT_MACROS DEBUGFLAGS=-g CFLAGS=$(xOPT_LEVEL) -msse2 -w -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) diff --git a/src/makefile.mingw b/src/makefile.mingw index 864ebca..121f8de 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -41,7 +41,7 @@ ifeq (${USE_O3}, 1) xOPT_LEVEL=-O3 endif -DEFS=-DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS +DEFS=-DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE -D__STDC_FORMAT_MACROS DEBUGFLAGS=-g CFLAGS=-mthreads $(xOPT_LEVEL) -msse2 -w -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) LDFLAGS=-Wl,--dynamicbase -Wl,--nxcompat -Wl,--large-address-aware -static diff --git a/src/makefile.osx b/src/makefile.osx index 2d68912..2c5e33f 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -48,7 +48,7 @@ LIBS += \ -lz endif -DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DBOOST_SPIRIT_THREADSAFE -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS +DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DBOOST_SPIRIT_THREADSAFE -D__STDC_FORMAT_MACROS ifdef RELEASE # Compile for maximum compatibility and smallest size. diff --git a/src/makefile.unix b/src/makefile.unix index d2bbcd5..69c0d87 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -11,7 +11,7 @@ USE_IPV6:=1 LINK:=$(CXX) ARCH:=$(shell uname -m) -DEFS=-DBOOST_SPIRIT_THREADSAFE -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS +DEFS=-DBOOST_SPIRIT_THREADSAFE -D__STDC_FORMAT_MACROS 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))