Browse Source

Bugfix: Make USE_UPNP=- work with makefile.{linux-mingw,mingw,osx} too

0.8
Luke Dashjr 13 years ago
parent
commit
45beb88966
  1. 5
      src/makefile.linux-mingw
  2. 5
      src/makefile.mingw
  3. 5
      src/makefile.osx

5
src/makefile.linux-mingw

@ -35,7 +35,10 @@ CFLAGS=-O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(D
TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data) TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
ifdef USE_UPNP ifndef USE_UPNP
override USE_UPNP = -
endif
ifneq (${USE_UPNP}, -)
LIBPATHS += -L"$(DEPSDIR)/miniupnpc" LIBPATHS += -L"$(DEPSDIR)/miniupnpc"
LIBS += -l miniupnpc -l iphlpapi LIBS += -l miniupnpc -l iphlpapi
DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP) DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP)

5
src/makefile.mingw

@ -30,7 +30,10 @@ CFLAGS=-mthreads -O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-par
TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data) TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
ifdef USE_UPNP ifndef USE_UPNP
override USE_UPNP = -
endif
ifneq (${USE_UPNP}, -)
INCLUDEPATHS += -I"C:\miniupnpc-1.6-mgw" INCLUDEPATHS += -I"C:\miniupnpc-1.6-mgw"
LIBPATHS += -L"C:\miniupnpc-1.6-mgw" LIBPATHS += -L"C:\miniupnpc-1.6-mgw"
LIBS += -l miniupnpc -l iphlpapi LIBS += -l miniupnpc -l iphlpapi

5
src/makefile.osx vendored

@ -97,7 +97,10 @@ OBJS= \
obj/walletdb.o \ obj/walletdb.o \
obj/noui.o obj/noui.o
ifdef USE_UPNP ifndef USE_UPNP
override USE_UPNP = -
endif
ifneq (${USE_UPNP}, -)
DEFS += -DUSE_UPNP=$(USE_UPNP) DEFS += -DUSE_UPNP=$(USE_UPNP)
ifdef STATIC ifdef STATIC
LIBS += $(DEPSDIR)/lib/libminiupnpc.a LIBS += $(DEPSDIR)/lib/libminiupnpc.a

Loading…
Cancel
Save