status-im
/
nimbus-eth1
mirror of https://github.com/status-im/nimbus-eth1.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

libminiupnpc.a and libnatpmp.a: fix Windows compilation

This commit is contained in:
Ștefan Talpalaru 2019-04-17 12:26:40 +02:00
parent 8a3ef31ec4
commit 0412ecfc4f
No known key found for this signature in database
GPG Key ID: CBF7934204F1B6F9
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -117,10 +117,19 @@ deps: $(NIM_BINARY) $(NIMBLE_DIR) nimbus.nims
nat-libs: | libminiupnpc.a libnatpmp.a nat-libs: | libminiupnpc.a libnatpmp.a
libminiupnpc.a: | deps libminiupnpc.a: | deps
ifeq ($(OS), Windows_NT)
+ [ -e vendor/nim-nat-traversal/vendor/miniupnp/miniupnpc/$@ ] || \
$(MAKE) -C vendor/nim-nat-traversal/vendor/miniupnp/miniupnpc -f Makefile.mingw CC=gcc init $@ $(HANDLE_OUTPUT)
else
+ $(MAKE) -C vendor/nim-nat-traversal/vendor/miniupnp/miniupnpc $@ $(HANDLE_OUTPUT) + $(MAKE) -C vendor/nim-nat-traversal/vendor/miniupnp/miniupnpc $@ $(HANDLE_OUTPUT)
endif
libnatpmp.a: | deps libnatpmp.a: | deps
ifeq ($(OS), Windows_NT)
+ $(MAKE) -C vendor/nim-nat-traversal/vendor/libnatpmp CC=gcc CFLAGS="-Wall -Os -DWIN32 -DNATPMP_STATICLIB -DENABLE_STRNATPMPERR" $@ $(HANDLE_OUTPUT)
else
+ $(MAKE) -C vendor/nim-nat-traversal/vendor/libnatpmp $@ $(HANDLE_OUTPUT) + $(MAKE) -C vendor/nim-nat-traversal/vendor/libnatpmp $@ $(HANDLE_OUTPUT)
endif
#- depends on Git submodules being initialised #- depends on Git submodules being initialised
#- fakes a Nimble package repository with the minimum info needed by the Nim compiler #- fakes a Nimble package repository with the minimum info needed by the Nim compiler

2
vendor/nim-nat-traversal vendored

@ -1 +1 @@
Subproject commit 0bcb394f5787bde62e3c275e185498e2de20d637 Subproject commit 527932371f5e4866a1fa7b86c9ac33dcef3f228c