created SDK installer; other minor changes
authorVictor Kirhenshtein <victor@netxms.org>
Tue, 12 Apr 2011 22:10:54 +0000 (22:10 +0000)
committerVictor Kirhenshtein <victor@netxms.org>
Tue, 12 Apr 2011 22:10:54 +0000 (22:10 +0000)
.gitattributes
doc/internal/nxcp_command_ranges.txt
netxms.sln
sdk/install/netxms-sdk.iss [new file with mode: 0644]
src/flow_analyzer/libipfix/libipfix.vcproj
src/server/core/lldp.cpp
src/server/core/ndd.cpp
src/server/core/tools.cpp
src/server/drivers/baystack/baystack.vcproj
src/server/drivers/ers8000/ers8000.vcproj

index 9f1a812..86bb6a3 100644 (file)
@@ -55,6 +55,7 @@ images/f9105c54-8dcf-483a-b387-b4587dfd3cba -text
 include/netxms_isc.h -text
 include/nxdbapi.h -text
 include/nxlpapi.h -text
+sdk/install/netxms-sdk.iss -text
 src/agent/core/nxagentd-unicode.vcproj -text
 src/agent/core/nxagentd.vcproj -text
 src/agent/core/push.cpp -text
index 5c97a66..f55a5e8 100644 (file)
@@ -1,2 +1,2 @@
 0000 .. 0FFF   Core system commands
-1000 .. 100F   NetXMS/AVS
+1000 .. 100F   NXVS
index 4017dd7..b82e7a4 100644 (file)
@@ -1126,11 +1126,13 @@ Global
                {2DEF303B-5FEF-4F5E-87C4-FB7895058F59}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32
                {2DEF303B-5FEF-4F5E-87C4-FB7895058F59}.Debug|Win32.ActiveCfg = Debug|Win32
                {2DEF303B-5FEF-4F5E-87C4-FB7895058F59}.Debug|Win32.Build.0 = Debug|Win32
-               {2DEF303B-5FEF-4F5E-87C4-FB7895058F59}.Debug|x64.ActiveCfg = Debug|Win32
+               {2DEF303B-5FEF-4F5E-87C4-FB7895058F59}.Debug|x64.ActiveCfg = Debug|x64
+               {2DEF303B-5FEF-4F5E-87C4-FB7895058F59}.Debug|x64.Build.0 = Debug|x64
                {2DEF303B-5FEF-4F5E-87C4-FB7895058F59}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32
                {2DEF303B-5FEF-4F5E-87C4-FB7895058F59}.Release|Win32.ActiveCfg = Release|Win32
                {2DEF303B-5FEF-4F5E-87C4-FB7895058F59}.Release|Win32.Build.0 = Release|Win32
-               {2DEF303B-5FEF-4F5E-87C4-FB7895058F59}.Release|x64.ActiveCfg = Release|Win32
+               {2DEF303B-5FEF-4F5E-87C4-FB7895058F59}.Release|x64.ActiveCfg = Release|x64
+               {2DEF303B-5FEF-4F5E-87C4-FB7895058F59}.Release|x64.Build.0 = Release|x64
                {D7F709ED-7483-49F0-8B17-ABB705606FEA}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32
                {D7F709ED-7483-49F0-8B17-ABB705606FEA}.Debug|Win32.ActiveCfg = Debug|Win32
                {D7F709ED-7483-49F0-8B17-ABB705606FEA}.Debug|Win32.Build.0 = Debug|Win32
@@ -1188,19 +1190,23 @@ Global
                {13A91F2E-A17B-4ABA-B5B2-285807BD7832}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32
                {13A91F2E-A17B-4ABA-B5B2-285807BD7832}.Debug|Win32.ActiveCfg = Debug|Win32
                {13A91F2E-A17B-4ABA-B5B2-285807BD7832}.Debug|Win32.Build.0 = Debug|Win32
-               {13A91F2E-A17B-4ABA-B5B2-285807BD7832}.Debug|x64.ActiveCfg = Debug|Win32
+               {13A91F2E-A17B-4ABA-B5B2-285807BD7832}.Debug|x64.ActiveCfg = Debug|x64
+               {13A91F2E-A17B-4ABA-B5B2-285807BD7832}.Debug|x64.Build.0 = Debug|x64
                {13A91F2E-A17B-4ABA-B5B2-285807BD7832}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32
                {13A91F2E-A17B-4ABA-B5B2-285807BD7832}.Release|Win32.ActiveCfg = Release|Win32
                {13A91F2E-A17B-4ABA-B5B2-285807BD7832}.Release|Win32.Build.0 = Release|Win32
-               {13A91F2E-A17B-4ABA-B5B2-285807BD7832}.Release|x64.ActiveCfg = Release|Win32
+               {13A91F2E-A17B-4ABA-B5B2-285807BD7832}.Release|x64.ActiveCfg = Release|x64
+               {13A91F2E-A17B-4ABA-B5B2-285807BD7832}.Release|x64.Build.0 = Release|x64
                {076E6815-4B6B-4F1E-A36C-CD3DD26EA5AC}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32
                {076E6815-4B6B-4F1E-A36C-CD3DD26EA5AC}.Debug|Win32.ActiveCfg = Debug|Win32
                {076E6815-4B6B-4F1E-A36C-CD3DD26EA5AC}.Debug|Win32.Build.0 = Debug|Win32
-               {076E6815-4B6B-4F1E-A36C-CD3DD26EA5AC}.Debug|x64.ActiveCfg = Debug|Win32
+               {076E6815-4B6B-4F1E-A36C-CD3DD26EA5AC}.Debug|x64.ActiveCfg = Debug|x64
+               {076E6815-4B6B-4F1E-A36C-CD3DD26EA5AC}.Debug|x64.Build.0 = Debug|x64
                {076E6815-4B6B-4F1E-A36C-CD3DD26EA5AC}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32
                {076E6815-4B6B-4F1E-A36C-CD3DD26EA5AC}.Release|Win32.ActiveCfg = Release|Win32
                {076E6815-4B6B-4F1E-A36C-CD3DD26EA5AC}.Release|Win32.Build.0 = Release|Win32
-               {076E6815-4B6B-4F1E-A36C-CD3DD26EA5AC}.Release|x64.ActiveCfg = Release|Win32
+               {076E6815-4B6B-4F1E-A36C-CD3DD26EA5AC}.Release|x64.ActiveCfg = Release|x64
+               {076E6815-4B6B-4F1E-A36C-CD3DD26EA5AC}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
diff --git a/sdk/install/netxms-sdk.iss b/sdk/install/netxms-sdk.iss
new file mode 100644 (file)
index 0000000..329050a
--- /dev/null
@@ -0,0 +1,121 @@
+; NetXMS SDK installation script\r
+; Copyright (c)\r
+\r
+[Setup]\r
+AppName=NetXMS SDK\r
+AppVerName=NetXMS SDK 1.1.1\r
+AppVersion=1.1.1\r
+AppPublisher=Raden Solutions\r
+AppPublisherURL=http://www.radensolutions.com\r
+AppSupportURL=http://www.radensolutions.com\r
+AppUpdatesURL=http://www.netxms.org\r
+DefaultDirName=C:\NetXMS\SDK\r
+DefaultGroupName=NetXMS SDK\r
+AllowNoIcons=yes\r
+LicenseFile=..\..\LGPL.txt\r
+Compression=lzma\r
+SolidCompression=yes\r
+LanguageDetectionMethod=none\r
+OutputBaseFilename=netxms-sdk-1.1.1\r
+\r
+[Files]\r
+; Header files\r
+Source: "..\..\include\base64.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\dbdrv.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\geolocation.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\netxms-regex.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\netxms-version.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\netxms_getopt.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\netxms_isc.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\netxms_maps.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\netxmsdb.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\nms_agent.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\nms_common.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\nms_cscp.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\nms_threads.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\nms_util.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\nxclapi.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\nxconfig.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\nxcpapi.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\nxdbapi.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\nxevent.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\nxlog.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\nxlpapi.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\nxmbapi.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\nxqueue.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\nxsl.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\nxsl_classes.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\nxsnmp.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\nxtools.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\rwlock.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\unicode.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\include\uuid.h"; DestDir: "{app}\include"; Flags: ignoreversion;\r
+Source: "..\..\src\server\include\nddrv.h"; DestDir: "{app}\include\server"; Flags: ignoreversion;\r
+Source: "..\..\src\server\include\nms_actions.h"; DestDir: "{app}\include\server"; Flags: ignoreversion;\r
+Source: "..\..\src\server\include\nms_alarm.h"; DestDir: "{app}\include\server"; Flags: ignoreversion;\r
+Source: "..\..\src\server\include\nms_core.h"; DestDir: "{app}\include\server"; Flags: ignoreversion;\r
+Source: "..\..\src\server\include\nms_dcoll.h"; DestDir: "{app}\include\server"; Flags: ignoreversion;\r
+Source: "..\..\src\server\include\nms_events.h"; DestDir: "{app}\include\server"; Flags: ignoreversion;\r
+Source: "..\..\src\server\include\nms_locks.h"; DestDir: "{app}\include\server"; Flags: ignoreversion;\r
+Source: "..\..\src\server\include\nms_objects.h"; DestDir: "{app}\include\server"; Flags: ignoreversion;\r
+Source: "..\..\src\server\include\nms_pkg.h"; DestDir: "{app}\include\server"; Flags: ignoreversion;\r
+Source: "..\..\src\server\include\nms_script.h"; DestDir: "{app}\include\server"; Flags: ignoreversion;\r
+Source: "..\..\src\server\include\nms_topo.h"; DestDir: "{app}\include\server"; Flags: ignoreversion;\r
+Source: "..\..\src\server\include\nms_users.h"; DestDir: "{app}\include\server"; Flags: ignoreversion;\r
+Source: "..\..\src\server\include\nxcore_jobs.h"; DestDir: "{app}\include\server"; Flags: ignoreversion;\r
+Source: "..\..\src\server\include\nxcore_logs.h"; DestDir: "{app}\include\server"; Flags: ignoreversion;\r
+Source: "..\..\src\server\include\nxcore_maps.h"; DestDir: "{app}\include\server"; Flags: ignoreversion;\r
+Source: "..\..\src\server\include\nxcore_situations.h"; DestDir: "{app}\include\server"; Flags: ignoreversion;\r
+Source: "..\..\src\server\include\nxmodule.h"; DestDir: "{app}\include\server"; Flags: ignoreversion;\r
+Source: "..\..\src\server\include\nxsrvapi.h"; DestDir: "{app}\include\server"; Flags: ignoreversion;\r
+; x86 libraries\r
+Source: "..\..\release\libexpat.lib"; DestDir: "{app}\lib\x86"; Flags: ignoreversion;\r
+Source: "..\..\release\libnetxms.lib"; DestDir: "{app}\lib\x86"; Flags: ignoreversion;\r
+Source: "..\..\release\libnetxmsw.lib"; DestDir: "{app}\lib\x86"; Flags: ignoreversion;\r
+Source: "..\..\release\libnxcl.lib"; DestDir: "{app}\lib\x86"; Flags: ignoreversion;\r
+Source: "..\..\release\libnxclw.lib"; DestDir: "{app}\lib\x86"; Flags: ignoreversion;\r
+Source: "..\..\release\libnxdb.lib"; DestDir: "{app}\lib\x86"; Flags: ignoreversion;\r
+Source: "..\..\release\libnxdbw.lib"; DestDir: "{app}\lib\x86"; Flags: ignoreversion;\r
+Source: "..\..\release\libnxlp.lib"; DestDir: "{app}\lib\x86"; Flags: ignoreversion;\r
+Source: "..\..\release\libnxmap.lib"; DestDir: "{app}\lib\x86"; Flags: ignoreversion;\r
+Source: "..\..\release\libnxmapw.lib"; DestDir: "{app}\lib\x86"; Flags: ignoreversion;\r
+Source: "..\..\release\libnxmb.lib"; DestDir: "{app}\lib\x86"; Flags: ignoreversion;\r
+Source: "..\..\release\libnxsl.lib"; DestDir: "{app}\lib\x86"; Flags: ignoreversion;\r
+Source: "..\..\release\libnxsnmp.lib"; DestDir: "{app}\lib\x86"; Flags: ignoreversion;\r
+Source: "..\..\release\libnxsrv.lib"; DestDir: "{app}\lib\x86"; Flags: ignoreversion;\r
+Source: "..\..\release\libtre.lib"; DestDir: "{app}\lib\x86"; Flags: ignoreversion;\r
+Source: "..\..\release\nxcore.lib"; DestDir: "{app}\lib\x86"; Flags: ignoreversion;\r
+Source: "..\..\release\nxsqlite.lib"; DestDir: "{app}\lib\x86"; Flags: ignoreversion;\r
+Source: "..\..\release\nxzlib.lib"; DestDir: "{app}\lib\x86"; Flags: ignoreversion;\r
+; x64 libraries\r
+Source: "..\..\x64\release\libexpat.lib"; DestDir: "{app}\lib\x64"; Flags: ignoreversion;\r
+Source: "..\..\x64\release\libnetxms.lib"; DestDir: "{app}\lib\x64"; Flags: ignoreversion;\r
+Source: "..\..\x64\release\libnetxmsw.lib"; DestDir: "{app}\lib\x64"; Flags: ignoreversion;\r
+Source: "..\..\x64\release\libnxcl.lib"; DestDir: "{app}\lib\x64"; Flags: ignoreversion;\r
+Source: "..\..\x64\release\libnxclw.lib"; DestDir: "{app}\lib\x64"; Flags: ignoreversion;\r
+Source: "..\..\x64\release\libnxdb.lib"; DestDir: "{app}\lib\x64"; Flags: ignoreversion;\r
+Source: "..\..\x64\release\libnxdbw.lib"; DestDir: "{app}\lib\x64"; Flags: ignoreversion;\r
+Source: "..\..\x64\release\libnxlp.lib"; DestDir: "{app}\lib\x64"; Flags: ignoreversion;\r
+Source: "..\..\x64\release\libnxmap.lib"; DestDir: "{app}\lib\x64"; Flags: ignoreversion;\r
+Source: "..\..\x64\release\libnxmapw.lib"; DestDir: "{app}\lib\x64"; Flags: ignoreversion;\r
+Source: "..\..\x64\release\libnxmb.lib"; DestDir: "{app}\lib\x64"; Flags: ignoreversion;\r
+Source: "..\..\x64\release\libnxsl.lib"; DestDir: "{app}\lib\x64"; Flags: ignoreversion;\r
+Source: "..\..\x64\release\libnxsnmp.lib"; DestDir: "{app}\lib\x64"; Flags: ignoreversion;\r
+Source: "..\..\x64\release\libnxsrv.lib"; DestDir: "{app}\lib\x64"; Flags: ignoreversion;\r
+Source: "..\..\x64\release\libtre.lib"; DestDir: "{app}\lib\x64"; Flags: ignoreversion;\r
+Source: "..\..\x64\release\nxcore.lib"; DestDir: "{app}\lib\x64"; Flags: ignoreversion;\r
+Source: "..\..\x64\release\nxsqlite.lib"; DestDir: "{app}\lib\x64"; Flags: ignoreversion;\r
+Source: "..\..\x64\release\nxzlib.lib"; DestDir: "{app}\lib\x64"; Flags: ignoreversion;\r
+; Java API\r
+Source: "..\..\src\java\netxms-base\target\netxms-base-1.1.1.jar"; DestDir: "{app}\java"; Flags: ignoreversion;\r
+Source: "..\..\src\java\netxms-base\target\netxms-base-1.1.1-javadoc.jar"; DestDir: "{app}\java"; Flags: ignoreversion;\r
+Source: "..\..\src\java\netxms-client\target\netxms-client-1.1.1.jar"; DestDir: "{app}\java"; Flags: ignoreversion;\r
+Source: "..\..\src\java\netxms-client\target\netxms-client-1.1.1-javadoc.jar"; DestDir: "{app}\java"; Flags: ignoreversion;\r
+Source: "..\..\src\java\netxms-client-api\target\netxms-client-api-1.1.1.jar"; DestDir: "{app}\java"; Flags: ignoreversion;\r
+Source: "..\..\src\java\netxms-client-api\target\netxms-client-api-1.1.1-javadoc.jar"; DestDir: "{app}\java"; Flags: ignoreversion;\r
+; Documentation\r
+Source: "..\..\doc\internal\event_code_ranges.txt"; DestDir: "{app}\doc"; Flags: ignoreversion;\r
+Source: "..\..\doc\internal\nxcp_command_ranges.txt"; DestDir: "{app}\doc"; Flags: ignoreversion;\r
+Source: "..\..\doc\internal\unicode.txt"; DestDir: "{app}\doc"; Flags: ignoreversion;\r
+Source: "..\..\doc\manuals\nxcp_reference.pdf"; DestDir: "{app}\doc"; Flags: ignoreversion;\r
+\r
index b185759..b28d9b5 100644 (file)
@@ -11,6 +11,9 @@
                <Platform\r
                        Name="Win32"\r
                />\r
+               <Platform\r
+                       Name="x64"\r
+               />\r
        </Platforms>\r
        <ToolFiles>\r
        </ToolFiles>\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\include;..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBIPFIX_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib libeay32.lib ssleay32.lib"\r
+                               LinkIncremental="2"\r
+                               AdditionalLibraryDirectories=""\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="..\include;..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBIPFIX_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib libeay32.lib ssleay32.lib"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories=""\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
        </Configurations>\r
        <References>\r
        </References>\r
index 0694d88..30e9b32 100644 (file)
@@ -46,7 +46,7 @@ static Interface *FindRemoteInterface(Node *node, DWORD idType, BYTE *id, size_t
                        return NULL;
                case 5: // Interface name
 #ifdef UNICODE
-                       MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, (char *)id, idLen, ifName, 128);
+                       MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, (char *)id, (int)idLen, ifName, 128);
                        ifName[min(idLen, 127)] = 0;
 #else
                        {
index e621dbb..a276b32 100644 (file)
@@ -97,7 +97,7 @@ void LoadNetworkDeviceDrivers()
        if (dir != NULL)
        {
                _tcscat(path, FS_PATH_SEPARATOR);
-               int insPos = _tcslen(path);
+               int insPos = (int)_tcslen(path);
 
                struct _tdirent *f;
                while((f = _treaddir(dir)) != NULL)
index 1692a11..8731ad1 100644 (file)
@@ -78,7 +78,7 @@ void GetSysInfoStr(TCHAR *pszBuffer, int nMaxSize)
 TCHAR *GetLocalHostName(TCHAR *buffer, size_t bufSize)
 {
 #ifdef _WIN32
-   DWORD dwSize = bufSize;
+   DWORD dwSize = (DWORD)bufSize;
    GetComputerName(buffer, &dwSize);
 #else
 #ifdef HAVE_SYS_UTSNAME_H
index 12f02a2..c611530 100644 (file)
@@ -11,6 +11,9 @@
                <Platform\r
                        Name="Win32"\r
                />\r
+               <Platform\r
+                       Name="x64"\r
+               />\r
        </Platforms>\r
        <ToolFiles>\r
        </ToolFiles>\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BAYSTACK_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(ProjectName).ndd"\r
+                               LinkIncremental="2"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BAYSTACK_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(ProjectName).ndd"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
        </Configurations>\r
        <References>\r
        </References>\r
index 8d89eaa..8009e0b 100644 (file)
@@ -11,6 +11,9 @@
                <Platform\r
                        Name="Win32"\r
                />\r
+               <Platform\r
+                       Name="x64"\r
+               />\r
        </Platforms>\r
        <ToolFiles>\r
        </ToolFiles>\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ERS8000_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(ProjectName).ndd"\r
+                               LinkIncremental="2"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ERS8000_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(ProjectName).ndd"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
        </Configurations>\r
        <References>\r
        </References>\r