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

Merge pull request #34 from mmalecki/solaris 

Fix Solaris (SmartOS) build
This commit is contained in:
Thomas BERNARD 2013-05-03 01:59:53 -07:00
parent f6998fc8e6 cc165a7aa3
commit a0ac317b3b
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
miniupnpc/Makefile
View File

@ -49,8 +49,10 @@ JAVA = java
JNAERATOR = jnaerator-0.11-shaded.jar JNAERATOR = jnaerator-0.11-shaded.jar
JNAERATORARGS = -mode StandaloneJar -runtime JNAerator -library miniupnpc JNAERATORARGS = -mode StandaloneJar -runtime JNAerator -library miniupnpc
JNAERATORBASEURL = http://jnaerator.googlecode.com/files/ JNAERATORBASEURL = http://jnaerator.googlecode.com/files/
#following libs are needed on Solaris
#LDLIBS=-lsocket -lnsl -lresolv ifeq (SunOS, $(OS))
LDFLAGS=-lsocket -lnsl -lresolv
endif
# APIVERSION is used to build SONAME # APIVERSION is used to build SONAME
APIVERSION = 9 APIVERSION = 9
@ -225,10 +227,10 @@ else
$(CC) -shared $(LDFLAGS) -Wl,-soname,$(SONAME) -o $@ $^ $(CC) -shared $(LDFLAGS) -Wl,-soname,$(SONAME) -o $@ $^
endif endif
upnpc-static: upnpc.o $(LIBRARY) $(LDLIBS) upnpc-static: upnpc.o $(LIBRARY)
$(CC) $(LDFLAGS) -o $@ $^ $(CC) $(LDFLAGS) -o $@ $^
upnpc-shared: upnpc.o $(SHAREDLIBRARY) $(LDLIBS) upnpc-shared: upnpc.o $(SHAREDLIBRARY)
$(CC) $(LDFLAGS) -o $@ $^ $(CC) $(LDFLAGS) -o $@ $^
testminixml: $(TESTMINIXMLOBJS) testminixml: $(TESTMINIXMLOBJS)

1
miniupnpc/connecthostport.c
View File

@ -24,6 +24,7 @@
#else /* #ifdef _WIN32 */ #else /* #ifdef _WIN32 */
#include <unistd.h> #include <unistd.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/select.h>
#include <errno.h> #include <errno.h>
#define closesocket close #define closesocket close
#include <netdb.h> #include <netdb.h>