* add global switch USE_UPNP to makefile

vmlinuxer · Jun 27, 2016 · b668c4c · b668c4c
1 parent 6467782
commit b668c4c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -11,6 +11,7 @@ include filelist.mk
 
 USE_AESNI  := yes
 USE_STATIC := no
+USE_UPNP   := no
 
 ifeq ($(UNAME),Darwin)
 	DAEMON_SRC += DaemonLinux.cpp

diff --git a/Makefile.homebrew b/Makefile.homebrew
@@ -8,7 +8,7 @@ INCFLAGS = -I${SSLROOT}/include -I${BOOSTROOT}/include
 LDFLAGS = -L${SSLROOT}/lib -L${BOOSTROOT}/lib
 LDLIBS = -lz -lcrypto -lssl -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread
 
-ifeq ($(USE_UPNP),1)
+ifeq ($(USE_UPNP),yes)
   LDFLAGS += -ldl
   CXXFLAGS += -DUSE_UPNP
 endif

diff --git a/Makefile.linux b/Makefile.linux
@@ -43,7 +43,7 @@ else
 endif
 
 # UPNP Support (miniupnpc 1.5 or 1.6)
-ifeq ($(USE_UPNP),1)
+ifeq ($(USE_UPNP),yes)
   LDFLAGS += -lminiupnpc
   CXXFLAGS += -DUSE_UPNP
 endif

diff --git a/Makefile.mingw b/Makefile.mingw
@@ -9,7 +9,7 @@ LDFLAGS = -Wl,-rpath,/usr/local/lib \
   -L/usr/local/lib 
 
 # UPNP Support 
-ifeq ($(USE_UPNP),1)
+ifeq ($(USE_UPNP),yes)
   CXXFLAGS += -DUSE_UPNP -DMINIUPNP_STATICLIB
   LDLIBS = -Wl,-Bstatic -lminiupnpc	
 endif
@@ -37,7 +37,7 @@ ifeq ($(USE_WIN32_APP), yes)
 	DAEMON_OBJS += $(patsubst %.rc,obj/%.o,$(DAEMON_RC))
 endif
 
-ifeq ($(USE_AESNI),1)
+ifeq ($(USE_AESNI),yes)
 	CPU_FLAGS = -maes -DAESNI
 else
 	CPU_FLAGS = -msse

diff --git a/Makefile.osx b/Makefile.osx
@@ -5,7 +5,7 @@ INCFLAGS = -I/usr/local/include -I/usr/local/ssl/include
 LDFLAGS = -Wl,-rpath,/usr/local/lib -L/usr/local/lib -L/usr/local/ssl/lib
 LDLIBS = -lz -lcrypto -lssl -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread
 
-ifeq ($(USE_UPNP),1)
+ifeq ($(USE_UPNP),yes)
   LDFLAGS += -ldl
   CXXFLAGS += -DUSE_UPNP
 endif