fixed Windows build using makefiles
authorVictor Kirhenshtein <victor@netxms.org>
Fri, 22 Sep 2017 16:47:44 +0000 (19:47 +0300)
committerVictor Kirhenshtein <victor@netxms.org>
Fri, 22 Sep 2017 16:47:44 +0000 (19:47 +0300)
Makefile.inc.w32
src/client/java/netxms-client/Makefile.w32
src/libnetxms/Makefile.w32
src/libnxjava/java/Makefile.w32 [new file with mode: 0644]
src/libnxjava/java/base/netxms-base/Makefile.w32

index a9ece01..5c93e70 100644 (file)
@@ -201,7 +201,7 @@ messages.h: messages.mc
 .PHONY: clean
 
 clean:
-   rm -rf $(OBJ) $(TARGET) $(OBJDIR) $(GENERATED) $(EXTRA_CLEAN)
+   rm -rf $(OBJ) $(TARGET) $(BINFILE) $(OBJDIR) $(GENERATED) $(EXTRA_CLEAN)
        @for %%s in ($(SUBDIRS)) do @( \
                echo === Entering %%s === && \
                cd %%s && \
index 9fc5f9a..9008bd5 100644 (file)
@@ -1,6 +1,6 @@
 TARGET = netxms-client.jar
 TYPE = jar
-
+JAR_BUILD_MODE = install
 MVNFLAGS = -Dmaven.test.skip=true -Ppkg-build
 
 include ..\..\..\..\Makefile.inc.w32
index 7de2bad..8689daf 100644 (file)
@@ -1,17 +1,20 @@
 TARGET = libnetxms.dll
 TYPE = dll
 SOURCES = array.cpp base64.cpp bytestream.cpp cc_mb.cpp cc_ucs2.cpp \
-       cc_ucs4.cpp cc_utf8.cpp cch.cpp config.cpp crypto.cpp diff.cpp \
-       dir.cpp dirw.cpp dload.cpp geolocation.cpp getopt.c hash.cpp \
+       cc_ucs4.cpp cc_utf8.cpp cch.cpp config.cpp crypto.cpp \
+       debug_tag_tree.cpp diff.cpp dir.cpp dirw.cpp \
+       dload.cpp geolocation.cpp getopt.c hash.cpp \
        hashmapbase.cpp ice.c icmp.cpp inetaddr.cpp log.cpp \
        lz4.c macaddr.cpp main.cpp md5.cpp message.cpp \
-       msgrecv.cpp msgwq.cpp net.cpp nxcp.cpp pa.cpp \
+       msgrecv.cpp msgwq.cpp net.cpp nxcp.cpp nxproc.cpp \
+       nxproc_win32.cpp pa.cpp \
        qsort.c queue.cpp rbuffer.cpp rwlock.cpp scandir.c seh.cpp \
-       serial.cpp sha1.cpp sha2.cpp \
-       spoll.cpp StackWalker.cpp streamcomp.cpp string.cpp \
-       stringlist.cpp strmap.cpp strmapbase.cpp strptime.c strset.cpp \
+       serial.cpp sha1.cpp sha2.cpp spoll.cpp StackWalker.cpp \
+       streamcomp.cpp string.cpp stringlist.cpp strlcat.c strlcpy.c \
+       strmap.cpp strmapbase.cpp strptime.c strset.cpp \
        strtoll.c strtoull.c table.cpp threads.cpp timegm.c tools.cpp \
-       tp.cpp unicode.cpp uuid.cpp wcstoll.c wcstoull.c xml.cpp
+       tp.cpp unicode.cpp uuid.cpp wcslcat.c wcslcpy.c wcstoll.c \
+       wcstoull.c xml.cpp
 
 CPPFLAGS = /I "$(NETXMS_BASE)\src\libexpat\libexpat" /I "$(NETXMS_BASE)\src\zlib" /DLIBNETXMS_EXPORTS
 LIBS = libexpat.lib libtre.lib jansson.lib nxzlib.lib ws2_32.lib dbghelp.lib psapi.lib rpcrt4.lib iphlpapi.lib crypt32.lib
diff --git a/src/libnxjava/java/Makefile.w32 b/src/libnxjava/java/Makefile.w32
new file mode 100644 (file)
index 0000000..8f02b34
--- /dev/null
@@ -0,0 +1,3 @@
+SUBDIRS = base bridge
+         
+include ..\..\..\Makefile.inc.w32
index cb5eac2..66cdbf0 100644 (file)
@@ -1,6 +1,6 @@
 TARGET = netxms-base.jar
 TYPE = jar
-
+JAR_BUILD_MODE = install
 MVNFLAGS = -Dmaven.test.skip=true -Ppkg-build
 
 include ..\..\..\..\..\Makefile.inc.w32