more Windows makefiles added; driverloader tool renamed to nddload

diff --git a/Makefile.inc.w32 b/Makefile.inc.w32
index a9c59a6..4b25e30 100644 (file)
--- a/Makefile.inc.w32
+++ b/Makefile.inc.w32
@@ -29,14 +29,10 @@ OBJDIR = amd64
 !endif
 
 !if "$(ARCH)" == "x86"
-WINDDK_ARCH = i386
 OBJDIR = i386
 !endif
 
 # SDK locations
-!ifndef WINDDK_BASE
-WINDDK_BASE = C:\SDK\WinDDK
-!endif
 !ifndef OPENSSL_BASE
 OPENSSL_BASE = C:\SDK\OpenSSL
 !endif
@@ -93,8 +89,7 @@ MANIFEST = $(TARGET).intermediate.manifest
 LDFLAGS = $(LDFLAGS) /SUBSYSTEM:CONSOLE /MACHINE:$(ARCH) /MANIFESTFILE:$(MANIFEST) \
        /LIBPATH:"$(NETXMS_LIBDIR)" \
        /LIBPATH:"$(CURL_BASE)\$(ARCH)\lib" \
-       /LIBPATH:"$(OPENSSL_BASE)\$(ARCH)\lib" \
-       /LIBPATH:"$(WINDDK_BASE)\lib\wnet\$(WINDDK_ARCH)"
+       /LIBPATH:"$(OPENSSL_BASE)\$(ARCH)\lib"
 
 # Common libraries
 LIBS = $(LIBS) ssleay32.lib libeay32.lib uuid.lib kernel32.lib user32.lib advapi32.lib shell32.lib

diff --git a/build/msvc_setenv_x64.cmd b/build/msvc_setenv_x64.cmd
index 6ecd1b3..6e4125a 100644 (file)
--- a/build/msvc_setenv_x64.cmd
+++ b/build/msvc_setenv_x64.cmd
@@ -1,5 +1,5 @@
 @echo off
 set PATH=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64;C:\SDK\Windows 7 SDK\Bin\x64;%PATH%
-set INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include;C:\SDK\Windows 7 SDK\Include
-set LIB=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\lib\amd64;C:\SDK\Windows 7 SDK\Lib\x64
+set INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include;C:\SDK\Windows 7 SDK\Include;C:\SDK\WINDDK\inc\wnet
+set LIB=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\lib\amd64;C:\SDK\Windows 7 SDK\Lib\x64;C:\SDK\WINDDK\lib\wnet\amd64
 set LIBPATH=%LIB%

diff --git a/build/msvc_setenv_x86.cmd b/build/msvc_setenv_x86.cmd
index 2fb7772..2d550b0 100644 (file)
--- a/build/msvc_setenv_x86.cmd
+++ b/build/msvc_setenv_x86.cmd
@@ -1,5 +1,5 @@
 @echo off
 set PATH=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;C:\SDK\Windows 7 SDK\Bin;%PATH%
-set INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include;C:\SDK\Windows 7 SDK\Include
-set LIB=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\lib;C:\SDK\Windows 7 SDK\Lib
+set INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include;C:\SDK\Windows 7 SDK\Include;C:\SDK\WINDDK\inc\wnet
+set LIB=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\lib;C:\SDK\Windows 7 SDK\Lib;C:\SDK\WINDDK\lib\wnet\i386
 set LIBPATH=%LIB%

diff --git a/src/Makefile.w32 b/src/Makefile.w32
index 07b7fb4..5f56a26 100644 (file)
--- a/src/Makefile.w32
+++ b/src/Makefile.w32
@@ -1,4 +1,4 @@
-SUBDIRS = jansson libexpat libtre sqlite zlib libnetxms libnxlp libnxmap libnxmb libnxsl libstrophe \
+SUBDIRS = jansson libexpat libtre sqlite zlib libnetxms libnxlp libnxmb libnxsl libstrophe \
           nxscript db snmp appagent agent server tools
 
 include ..\Makefile.inc.w32

diff --git a/src/agent/subagents/Makefile.w32 b/src/agent/subagents/Makefile.w32
index f3fb08a..ac505c3 100644 (file)
--- a/src/agent/subagents/Makefile.w32
+++ b/src/agent/subagents/Makefile.w32
@@ -1,4 +1,5 @@
 SUBDIRS = db2 dbquery devemu ecs filemgr gps informix java jmx logwatch \
-          mysql netsvc odbcquery oracle ping portCheck sms winnt
+          mysql netsvc odbcquery oracle ping portCheck sms ubntlw ups \
+          winnt winperf wmi
 
 include ..\..\..\Makefile.inc.w32

diff --git a/src/agent/subagents/ubntlw/Makefile.am b/src/agent/subagents/ubntlw/Makefile.am
index f1da930..a7070d6 100644 (file)
--- a/src/agent/subagents/ubntlw/Makefile.am
+++ b/src/agent/subagents/ubntlw/Makefile.am
@@ -6,4 +6,4 @@ ubntlw.jar: pom.xml
        mvn package
        mv target/ubntlw.jar .
 
-EXTRA_DIST = pom.xml ubntlw.jar LICENSE README
+EXTRA_DIST = Makefile.w32 pom.xml ubntlw.jar LICENSE README

diff --git a/src/agent/subagents/ubntlw/Makefile.w32 b/src/agent/subagents/ubntlw/Makefile.w32
new file mode 100644 (file)
index 0000000..8b4f377
--- /dev/null
+++ b/src/agent/subagents/ubntlw/Makefile.w32
@@ -0,0 +1,4 @@
+TARGET = ubntlw.jar
+TYPE = jar
+
+include ..\..\..\..\Makefile.inc.w32

diff --git a/src/agent/subagents/ups/Makefile.am b/src/agent/subagents/ups/Makefile.am
index 0784d5a..71eaf79 100644 (file)
--- a/src/agent/subagents/ups/Makefile.am
+++ b/src/agent/subagents/ups/Makefile.am
@@ -6,7 +6,7 @@ ups_la_CPPFLAGS=-I@top_srcdir@/include
 ups_la_LDFLAGS = -module -avoid-version -export-symbols ../subagent.sym
 ups_la_LIBADD= ../../libnxagent/libnxagent.la ../../../libnetxms/libnetxms.la
 
-EXTRA_DIST = ups.h ups.vcproj usb.cpp
+EXTRA_DIST = Makefile.w32 ups.h ups.vcproj usb.cpp
 
 if !STATIC_BUILD
 install-exec-hook:

diff --git a/src/agent/subagents/ups/Makefile.w32 b/src/agent/subagents/ups/Makefile.w32
new file mode 100644 (file)
index 0000000..ccc73fd
--- /dev/null
+++ b/src/agent/subagents/ups/Makefile.w32
@@ -0,0 +1,7 @@
+TARGET = ups.nsm
+TYPE = nsm
+SOURCES = apc.cpp bcmxcp.cpp main.cpp megatec.cpp metasys.cpp microdowell.cpp serial.cpp ups.cpp usb.cpp
+
+LIBS = libnxagent.lib libnetxms.lib hid.lib setupapi.lib
+         
+include ..\..\..\..\Makefile.inc.w32

diff --git a/src/agent/subagents/winperf/Makefile.am b/src/agent/subagents/winperf/Makefile.am
index 97cff4a..723c88d 100644 (file)
--- a/src/agent/subagents/winperf/Makefile.am
+++ b/src/agent/subagents/winperf/Makefile.am
@@ -10,4 +10,5 @@
 
 EXTRA_DIST = \
     collect.cpp tools.cpp winperf.cpp winperf.h \
+    Makefile.w32 \
     winperf.vcproj

diff --git a/src/agent/subagents/winperf/Makefile.w32 b/src/agent/subagents/winperf/Makefile.w32
new file mode 100644 (file)
index 0000000..da4900c
--- /dev/null
+++ b/src/agent/subagents/winperf/Makefile.w32
@@ -0,0 +1,7 @@
+TARGET = winperf.nsm
+TYPE = nsm
+SOURCES = collect.cpp tools.cpp winperf.cpp
+
+LIBS = libnxagent.lib libnetxms.lib pdh.lib
+         
+include ..\..\..\..\Makefile.inc.w32

diff --git a/src/agent/subagents/wmi/Makefile.am b/src/agent/subagents/wmi/Makefile.am
index 6be8711..f938bbd 100644 (file)
--- a/src/agent/subagents/wmi/Makefile.am
+++ b/src/agent/subagents/wmi/Makefile.am
@@ -9,4 +9,5 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 EXTRA_DIST = \
-    acpi.cpp sc.cpp wmi.cpp wmi.h wmi.vcproj
+    acpi.cpp sc.cpp wmi.cpp wmi.h wmi.vcproj \
+    Makefile.w32

diff --git a/src/agent/subagents/wmi/Makefile.w32 b/src/agent/subagents/wmi/Makefile.w32
new file mode 100644 (file)
index 0000000..2c64df2
--- /dev/null
+++ b/src/agent/subagents/wmi/Makefile.w32
@@ -0,0 +1,7 @@
+TARGET = wmi.nsm
+TYPE = nsm
+SOURCES = acpi.cpp sc.cpp wmi.cpp
+
+LIBS = libnxagent.lib libnetxms.lib wbemuuid.lib ole32.lib oleaut32.lib
+         
+include ..\..\..\..\Makefile.inc.w32

diff --git a/src/libnetxms/Makefile.w32 b/src/libnetxms/Makefile.w32
index 645ffc8..9f690cd 100644 (file)
--- a/src/libnetxms/Makefile.w32
+++ b/src/libnetxms/Makefile.w32
@@ -13,6 +13,6 @@ SOURCES = array.cpp base64.cpp bytestream.cpp cc_mb.cpp cc_ucs2.cpp \
        tp.cpp unicode.cpp uuid.cpp 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 nxzlib.lib ws2_32.lib dbghelp.lib psapi.lib rpcrt4.lib iphlpapi.lib crypt32.lib
+LIBS = libexpat.lib libtre.lib jansson.lib nxzlib.lib ws2_32.lib dbghelp.lib psapi.lib rpcrt4.lib iphlpapi.lib crypt32.lib
          
 include ../../Makefile.inc.w32

diff --git a/src/server/Makefile.w32 b/src/server/Makefile.w32
index 9d82c2f..51c917c 100644 (file)
--- a/src/server/Makefile.w32
+++ b/src/server/Makefile.w32
@@ -1,3 +1,3 @@
-SUBDIRS = libnxsrv core drivers hdlink netxmsd
+SUBDIRS = libnxsrv core drivers hdlink netxmsd tools
 
 include ..\..\Makefile.inc.w32

diff --git a/src/server/core/Makefile.w32 b/src/server/core/Makefile.w32
index a87f7c4..7efe256 100644 (file)
--- a/src/server/core/Makefile.w32
+++ b/src/server/core/Makefile.w32
@@ -10,7 +10,7 @@ SOURCES =  accesspoint.cpp acl.cpp actions.cpp addrlist.cpp \
        container.cpp correlate.cpp dashboard.cpp datacoll.cpp dbwrite.cpp \
        dc_nxsl.cpp dcitem.cpp dcithreshold.cpp dcivalue.cpp \
        dcobject.cpp dcst.cpp dctable.cpp dctarget.cpp \
-       dctcolumn.cpp dctthreshold.cpp debug.cpp dfile_info.cpp \
+       dctcolumn.cpp dctthreshold.cpp debug.cpp devdb.cpp dfile_info.cpp \
        download_job.cpp ef.cpp email.cpp entirenet.cpp \
        epp.cpp events.cpp evproc.cpp fdb.cpp \
        filemonitoring.cpp graph.cpp hdlink.cpp hk.cpp id.cpp \
@@ -19,10 +19,10 @@ SOURCES =  accesspoint.cpp acl.cpp actions.cpp addrlist.cpp \
        ldap.cpp lln.cpp lldp.cpp locks.cpp logfilter.cpp \
        loghandle.cpp logs.cpp macdb.cpp main.cpp maint.cpp \
        market.cpp mdconn.cpp mdsession.cpp mobile.cpp \
-       modules.cpp mt.cpp ndd.cpp ndp.cpp \
-       netinfo.cpp netmap.cpp netobj.cpp netsrv.cpp \
-       node.cpp nodelink.cpp np.cpp npe.cpp nxsl_classes.cpp \
-       nxslext.cpp objects.cpp objtools.cpp package.cpp \
+       modules.cpp mt.cpp ndd.cpp ndp.cpp netinfo.cpp netmap.cpp \
+       netmap_element.cpp netmap_link.cpp netmap_objlist.cpp \
+       netobj.cpp netsrv.cpp node.cpp nodelink.cpp np.cpp npe.cpp \
+       nxsl_classes.cpp nxslext.cpp objects.cpp objtools.cpp package.cpp \
        pds.cpp poll.cpp ps.cpp rack.cpp radius.cpp \
        reporting.cpp rootobj.cpp schedule.cpp script.cpp \
        session.cpp slmcheck.cpp smclp.cpp \
@@ -36,6 +36,6 @@ SOURCES =  accesspoint.cpp acl.cpp actions.cpp addrlist.cpp \
 CPPFLAGS = /DNXCORE_EXPORTS
 LIBS = libnxsrv.lib libnxsnmp.lib libnxlp.lib libnxsl.lib libnxmap.lib \
    libnxdb.lib libnxagent.lib libnetxms.lib libstrophe.lib libtre.lib \
-   ws2_32.lib iphlpapi.lib psapi.lib wldap32.lib
+   jansson.lib ws2_32.lib iphlpapi.lib psapi.lib wldap32.lib
          
 include ..\..\..\Makefile.inc.w32

diff --git a/src/server/core/accesspoint.cpp b/src/server/core/accesspoint.cpp
index 496f7a5..9ee3033 100644 (file)
--- a/src/server/core/accesspoint.cpp
+++ b/src/server/core/accesspoint.cpp
@@ -21,22 +21,6 @@
 
 #include "nxcore.h"
 
-/**
- * Serialize radio interface information to JSON
- */
-json_t *RadioInterfaceInfo::toJson() const
-{
-   json_t *root = json_object();
-   json_object_set_new(root, "index", json_integer(index));
-   json_object_set_new(root, "name", json_string_t(name));
-   char macAddrText[64];
-   json_object_set_new(root, "macAddr", json_string(BinToStrA(macAddr, MAC_ADDR_LENGTH, macAddrText)));
-   json_object_set_new(root, "channel", json_integer(channel));
-   json_object_set_new(root, "powerDBm", json_integer(powerDBm));
-   json_object_set_new(root, "powerMW", json_integer(powerMW));
-   return root;
-}
-
 /**
  * Default constructor
  */

diff --git a/src/server/libnxsrv/Makefile.w32 b/src/server/libnxsrv/Makefile.w32
index 6893a4f..60b37ea 100644 (file)
--- a/src/server/libnxsrv/Makefile.w32
+++ b/src/server/libnxsrv/Makefile.w32
@@ -7,7 +7,7 @@ RESOURCES = libnxsrv.rc
 GENERATED = messages.h MSG00001.bin
 
 CPPFLAGS = /DLIBNXSRV_EXPORTS
-LIBS = libnxsnmp.lib libnetxms.lib ws2_32.lib
+LIBS = libnxsnmp.lib libnetxms.lib jansson.lib ws2_32.lib
          
 include ..\..\..\Makefile.inc.w32
 

diff --git a/src/server/libnxsrv/ndd.cpp b/src/server/libnxsrv/ndd.cpp
index 93dc427..992a4ab 100644 (file)
--- a/src/server/libnxsrv/ndd.cpp
+++ b/src/server/libnxsrv/ndd.cpp
@@ -22,6 +22,22 @@
 #include "libnxsrv.h"
 #include <nddrv.h>
 
+/**
+ * Serialize radio interface information to JSON
+ */
+json_t *RadioInterfaceInfo::toJson() const
+{
+   json_t *root = json_object();
+   json_object_set_new(root, "index", json_integer(index));
+   json_object_set_new(root, "name", json_string_t(name));
+   char macAddrText[64];
+   json_object_set_new(root, "macAddr", json_string(BinToStrA(macAddr, MAC_ADDR_LENGTH, macAddrText)));
+   json_object_set_new(root, "channel", json_integer(channel));
+   json_object_set_new(root, "powerDBm", json_integer(powerDBm));
+   json_object_set_new(root, "powerMW", json_integer(powerMW));
+   return root;
+}
+
 /**
  * Access point info constructor
  */

diff --git a/src/server/tools/Makefile.am b/src/server/tools/Makefile.am
index 26f289c..a5b2925 100644 (file)
--- a/src/server/tools/Makefile.am
+++ b/src/server/tools/Makefile.am
@@ -10,3 +10,5 @@
 
 SUBDIRS = nxget nxadm nxaction nxap nxdbmgr nxminfo nxupload
 SUBDIRS += @SERVER_TOOLS@
+
+EXTRA_DIST = Makefile.w32

diff --git a/src/server/tools/Makefile.w32 b/src/server/tools/Makefile.w32
new file mode 100644 (file)
index 0000000..e6500a7
--- /dev/null
+++ b/src/server/tools/Makefile.w32
@@ -0,0 +1,3 @@
+SUBDIRS = nddload nxaction nxadm nxdbmgr
+
+include ..\..\..\Makefile.inc.w32

diff --git a/src/server/tools/driverloader/driverloader.vcproj b/src/server/tools/driverloader/driverloader.vcproj
deleted file mode 100644 (file)
index 3604611..0000000
--- a/src/server/tools/driverloader/driverloader.vcproj
+++ /dev/null
@@ -1,380 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="driverloader"
-       ProjectGUID="{3FE49724-9935-4988-9573-156668B1E20C}"
-       RootNamespace="driverloader"
-       Keyword="Win32Proj"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-               <Platform
-                       Name="x64"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="1"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\..\include;..\..\include"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="4"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib"
-                               LinkIncremental="2"
-                               GenerateDebugInformation="true"
-                               SubSystem="1"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug|x64"
-                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-                       ConfigurationType="1"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\..\include;..\..\include"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib"
-                               LinkIncremental="2"
-                               GenerateDebugInformation="true"
-                               SubSystem="1"
-                               TargetMachine="17"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="1"
-                       CharacterSet="1"
-                       WholeProgramOptimization="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\..\..\include;..\..\include"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-                               RuntimeLibrary="2"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib"
-                               LinkIncremental="1"
-                               GenerateDebugInformation="true"
-                               SubSystem="1"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|x64"
-                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-                       ConfigurationType="1"
-                       CharacterSet="1"
-                       WholeProgramOptimization="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\..\..\include;..\..\include"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-                               RuntimeLibrary="2"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib"
-                               LinkIncremental="1"
-                               GenerateDebugInformation="true"
-                               SubSystem="1"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               TargetMachine="17"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-                       >
-                       <File
-                               RelativePath=".\loader.cpp"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Header Files"
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-                       >
-                       <File
-                               RelativePath="..\..\..\include\nms_common.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\include\nms_threads.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\include\nms_util.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\include\rwlock.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\include\unicode.h"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Resource Files"
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-                       >
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>

diff --git a/src/server/tools/nddload/Makefile.w32 b/src/server/tools/nddload/Makefile.w32
new file mode 100644 (file)
index 0000000..7e541fa
--- /dev/null
+++ b/src/server/tools/nddload/Makefile.w32
@@ -0,0 +1,8 @@
+TARGET = nddload.exe
+TYPE = exe
+COMPONENT = server
+SOURCES = nddload.cpp
+
+LIBS = libnxsnmp.lib libnetxms.lib ws2_32.lib
+         
+include ..\..\..\..\Makefile.inc.w32

diff --git a/src/server/tools/driverloader/loader.cpp b/src/server/tools/nddload/nddload.cpp
similarity index 100%
rename from src/server/tools/driverloader/loader.cpp
rename to src/server/tools/nddload/nddload.cpp

diff --git a/src/server/tools/nxaction/Makefile.am b/src/server/tools/nxaction/Makefile.am
index d35a372..f7c38f1 100644 (file)
--- a/src/server/tools/nxaction/Makefile.am
+++ b/src/server/tools/nxaction/Makefile.am
@@ -4,4 +4,5 @@ nxaction_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 nxaction_LDADD = ../../../libnetxms/libnetxms.la ../../libnxsrv/libnxsrv.la ../../../snmp/libnxsnmp/libnxsnmp.la
 
 EXTRA_DIST = \
-       nxaction.vcproj
+       nxaction.vcproj \
+       Makefile.w32

diff --git a/src/server/tools/nxaction/Makefile.w32 b/src/server/tools/nxaction/Makefile.w32
new file mode 100644 (file)
index 0000000..6fef32d
--- /dev/null
+++ b/src/server/tools/nxaction/Makefile.w32
@@ -0,0 +1,8 @@
+TARGET = nxaction.exe
+TYPE = exe
+COMPONENT = server
+SOURCES = nxaction.cpp
+
+LIBS = libnxsrv.lib libnetxms.lib ws2_32.lib
+         
+include ..\..\..\..\Makefile.inc.w32

diff --git a/src/server/tools/nxadm/Makefile.am b/src/server/tools/nxadm/Makefile.am
index e2a35e8..10af0ab 100644 (file)
--- a/src/server/tools/nxadm/Makefile.am
+++ b/src/server/tools/nxadm/Makefile.am
@@ -4,5 +4,6 @@ nxadm_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 nxadm_LDADD = ../../../libnetxms/libnetxms.la ../../libnxsrv/libnxsrv.la ../../../snmp/libnxsnmp/libnxsnmp.la @SERVER_LIBS@
 
 EXTRA_DIST = \
+       Makefile.w32 \
        nxadm.vcproj \
        nxadm.h

diff --git a/src/server/tools/nxadm/Makefile.w32 b/src/server/tools/nxadm/Makefile.w32
new file mode 100644 (file)
index 0000000..1d916da
--- /dev/null
+++ b/src/server/tools/nxadm/Makefile.w32
@@ -0,0 +1,8 @@
+TARGET = nxadm.exe
+TYPE = exe
+COMPONENT = server
+SOURCES = comm.cpp nxadm.cpp
+
+LIBS = libnetxms.lib ws2_32.lib
+         
+include ..\..\..\..\Makefile.inc.w32

diff --git a/src/server/tools/nxdbmgr/Makefile.am b/src/server/tools/nxdbmgr/Makefile.am
index f6b8a15..7229571 100644 (file)
--- a/src/server/tools/nxdbmgr/Makefile.am
+++ b/src/server/tools/nxdbmgr/Makefile.am
@@ -19,4 +19,5 @@ tables.cpp: @top_srcdir@/sql/schema.in
        @top_srcdir@/tools/create_table_list.pl @top_srcdir@/sql/schema.in > tables.cpp
 
 EXTRA_DIST = \
-       nxdbmgr.vcproj nxdbmgr.h
+       nxdbmgr.vcproj nxdbmgr.h \
+       Makefile.w32

diff --git a/src/server/tools/nxdbmgr/Makefile.w32 b/src/server/tools/nxdbmgr/Makefile.w32
new file mode 100644 (file)
index 0000000..5d4acb7
--- /dev/null
+++ b/src/server/tools/nxdbmgr/Makefile.w32
@@ -0,0 +1,15 @@
+TARGET = nxdbmgr.exe
+TYPE = exe
+COMPONENT = server
+SOURCES = check.cpp clear.cpp export.cpp import.cpp init.cpp migrate.cpp \
+          mm.cpp nxdbmgr.cpp reindex.cpp resetadmin.cpp tables.cpp \
+          tdata_convert.cpp unlock.cpp upgrade.cpp
+GENERATED = tables.cpp
+
+CPPFLAGS = /I$(NETXMS_BASE)\src\sqlite
+LIBS = libnxdb.lib libnetxms.lib nxsqlite.lib
+         
+include ..\..\..\..\Makefile.inc.w32
+
+tables.cpp: $(NETXMS_BASE)\sql\schema.in
+       $(NETXMS_BASE)\tools\create_table_list.pl $(NETXMS_BASE)\sql\schema.in > tables.cpp

diff --git a/src/snmp/libnxsnmp/Makefile.w32 b/src/snmp/libnxsnmp/Makefile.w32
index fb862a2..6a8924a 100644 (file)
--- a/src/snmp/libnxsnmp/Makefile.w32
+++ b/src/snmp/libnxsnmp/Makefile.w32
@@ -5,6 +5,6 @@ SOURCES = ber.cpp engine.cpp main.cpp mib.cpp oid.cpp pdu.cpp \
           variable.cpp zfile.cpp
 
 CPPFLAGS = /I$(NETXMS_BASE)\src\zlib /DLIBNXSNMP_EXPORTS
-LIBS = libnetxms.lib nxzlib.lib ws2_32.lib
+LIBS = jansson.lib libnetxms.lib nxzlib.lib ws2_32.lib
          
 include ..\..\..\Makefile.inc.w32