equal
deleted
inserted
replaced
92 # |
92 # |
93 include $(BUILDDIR)/common/Mapfile-vers.gmk |
93 include $(BUILDDIR)/common/Mapfile-vers.gmk |
94 |
94 |
95 include $(BUILDDIR)/common/Library.gmk |
95 include $(BUILDDIR)/common/Library.gmk |
96 |
96 |
|
97 ifeq ($(PLATFORM), macosx) |
|
98 ifdef DONT_ENABLE_IPV6 |
|
99 OTHER_CFLAGS += -DDONT_ENABLE_IPV6 |
|
100 endif |
|
101 OTHER_LDLIBS = $(JVMLIB) -pthread |
|
102 else |
97 ifeq ($(PLATFORM), windows) |
103 ifeq ($(PLATFORM), windows) |
98 OTHER_LDLIBS = ws2_32.lib $(JVMLIB) \ |
104 OTHER_LDLIBS = ws2_32.lib $(JVMLIB) \ |
99 secur32.lib iphlpapi.lib delayimp.lib \ |
105 secur32.lib iphlpapi.lib delayimp.lib \ |
100 /DELAYLOAD:secur32.dll /DELAYLOAD:iphlpapi.dll |
106 /DELAYLOAD:secur32.dll /DELAYLOAD:iphlpapi.dll |
101 else |
107 else |
102 OTHER_LDLIBS = $(LIBSOCKET) $(LIBNSL) -ldl $(JVMLIB) |
108 OTHER_LDLIBS = $(LIBSOCKET) $(LIBNSL) $(LIBDL) $(JVMLIB) |
103 endif |
109 endif |
104 ifeq ($(PLATFORM), linux) |
110 ifeq ($(PLATFORM), linux) |
105 OTHER_LDLIBS += -lpthread |
111 OTHER_LDLIBS += -lpthread |
106 endif |
112 endif |
|
113 endif # PLATFORM |
107 |
114 |
108 CLASSES.export += java.lang.Integer java.io.FileDescriptor java.net.InetAddressImplFactory java.net.Inet4AddressImpl java.net.Inet6AddressImpl |
115 CLASSES.export += java.lang.Integer java.io.FileDescriptor java.net.InetAddressImplFactory java.net.Inet4AddressImpl java.net.Inet6AddressImpl |
109 |
116 |
110 # |
117 # |
111 # Resources |
118 # Resources |