!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
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
@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%
@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%
-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
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
mvn package
mv target/ubntlw.jar .
-EXTRA_DIST = pom.xml ubntlw.jar LICENSE README
+EXTRA_DIST = Makefile.w32 pom.xml ubntlw.jar LICENSE README
--- /dev/null
+TARGET = ubntlw.jar
+TYPE = jar
+
+include ..\..\..\..\Makefile.inc.w32
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:
--- /dev/null
+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
EXTRA_DIST = \
collect.cpp tools.cpp winperf.cpp winperf.h \
+ Makefile.w32 \
winperf.vcproj
--- /dev/null
+TARGET = winperf.nsm
+TYPE = nsm
+SOURCES = collect.cpp tools.cpp winperf.cpp
+
+LIBS = libnxagent.lib libnetxms.lib pdh.lib
+
+include ..\..\..\..\Makefile.inc.w32
# 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
--- /dev/null
+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
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
-SUBDIRS = libnxsrv core drivers hdlink netxmsd
+SUBDIRS = libnxsrv core drivers hdlink netxmsd tools
include ..\..\Makefile.inc.w32
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 \
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 \
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
#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
*/
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
#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
*/
SUBDIRS = nxget nxadm nxaction nxap nxdbmgr nxminfo nxupload
SUBDIRS += @SERVER_TOOLS@
+
+EXTRA_DIST = Makefile.w32
--- /dev/null
+SUBDIRS = nddload nxaction nxadm nxdbmgr
+
+include ..\..\..\Makefile.inc.w32
+++ /dev/null
-<?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>
--- /dev/null
+TARGET = nddload.exe
+TYPE = exe
+COMPONENT = server
+SOURCES = nddload.cpp
+
+LIBS = libnxsnmp.lib libnetxms.lib ws2_32.lib
+
+include ..\..\..\..\Makefile.inc.w32
nxaction_LDADD = ../../../libnetxms/libnetxms.la ../../libnxsrv/libnxsrv.la ../../../snmp/libnxsnmp/libnxsnmp.la
EXTRA_DIST = \
- nxaction.vcproj
+ nxaction.vcproj \
+ Makefile.w32
--- /dev/null
+TARGET = nxaction.exe
+TYPE = exe
+COMPONENT = server
+SOURCES = nxaction.cpp
+
+LIBS = libnxsrv.lib libnetxms.lib ws2_32.lib
+
+include ..\..\..\..\Makefile.inc.w32
nxadm_LDADD = ../../../libnetxms/libnetxms.la ../../libnxsrv/libnxsrv.la ../../../snmp/libnxsnmp/libnxsnmp.la @SERVER_LIBS@
EXTRA_DIST = \
+ Makefile.w32 \
nxadm.vcproj \
nxadm.h
--- /dev/null
+TARGET = nxadm.exe
+TYPE = exe
+COMPONENT = server
+SOURCES = comm.cpp nxadm.cpp
+
+LIBS = libnetxms.lib ws2_32.lib
+
+include ..\..\..\..\Makefile.inc.w32
@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
--- /dev/null
+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
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