d0s3t3ch/wownero-puddle
1
0
Fork 0
mirror of https://git.wownero.com/wownero/wownero-puddle.git synced 2024-08-15 01:03:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'improve-make' into dev

Browse source
This commit is contained in:
Jethro Grassie 2019-05-04 13:32:34 -04:00
commit b21fb830d4
No known key found for this signature in database
GPG key ID: DE8ED755616565BB
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Makefile
View file

@ -37,7 +37,7 @@ endif
ifeq ($(OS),Darwin) ifeq ($(OS),Darwin)
LDPARAM = LDPARAM =
else else
LDPARAM = -rdynamic -Wl,-warn-unresolved-symbols -fPIC -pie LDPARAM = -Wl,-warn-unresolved-symbols -fPIC -pie
endif endif
ifeq ($(TYPE),debug) ifeq ($(TYPE),debug)
@ -48,7 +48,7 @@ endif
ifeq ($(TYPE), release) ifeq ($(TYPE), release)
CCPARAM += -O3 -Wno-unused-variable CCPARAM += -O3 -Wno-unused-variable
ifneq ($(OS), Darwin) ifneq ($(OS), Darwin)
LDPARAM = -rdynamic -Wl,--unresolved-symbols=ignore-in-object-files LDPARAM = -Wl,--unresolved-symbols=ignore-in-object-files
endif endif
endif endif
@ -56,9 +56,9 @@ LDPARAM += $(LDFLAGS)
LIBS := lmdb pthread microhttpd unbound LIBS := lmdb pthread microhttpd unbound
ifeq ($(OS), Darwin) ifeq ($(OS), Darwin)
LIBS += c++ boost_system-mt boost_date_time-mt boost_chrono-mt boost_filesystem-mt boost_thread-mt LIBS += c++ boost_system-mt boost_date_time-mt boost_chrono-mt boost_filesystem-mt boost_thread-mt boost_regex-mt
else else
LIBS += dl boost_system boost_date_time boost_chrono boost_filesystem boost_thread uuid LIBS += dl boost_system boost_date_time boost_chrono boost_filesystem boost_thread boost_regex uuid
endif endif
PKG_LIBS := $(shell pkg-config \ PKG_LIBS := $(shell pkg-config \
@ -87,6 +87,7 @@ EXTRA_FILES = Makefile
C++ = g++ C++ = g++
CC = gcc CC = gcc
XXD := $(shell command -v xxd)
STORE = build/$(TYPE) STORE = build/$(TYPE)
SOURCE := $(foreach DIR,$(DIRS),$(wildcard $(DIR)/*.cpp)) SOURCE := $(foreach DIR,$(DIRS),$(wildcard $(DIR)/*.cpp))
@ -163,6 +164,12 @@ endif
ifeq ($(origin MONERO_BUILD_ROOT), undefined) ifeq ($(origin MONERO_BUILD_ROOT), undefined)
$(error You need to set an environment variable MONERO_BUILD_ROOT to your monero build root) $(error You need to set an environment variable MONERO_BUILD_ROOT to your monero build root)
endif endif
ifndef PKG_LIBS
$(error Missing dependencies)
endif
ifndef XXD
$(error Command xxd not found)
endif
-include $(DFILES) -include $(DFILES)
-include $(CDFILES) -include $(CDFILES)