client library and tools moved to VS2005
authorVictor Kirhenshtein <victor@netxms.org>
Sun, 28 Dec 2008 23:42:17 +0000 (23:42 +0000)
committerVictor Kirhenshtein <victor@netxms.org>
Sun, 28 Dec 2008 23:42:17 +0000 (23:42 +0000)
18 files changed:
.gitattributes
netxms.sln
src/client/nxalarm/Makefile.am
src/client/nxalarm/nxalarm.vcproj [copied from src/libexpat/libexpat/libexpatw.vcproj with 71% similarity]
src/client/nxevent/Makefile.am
src/client/nxevent/nxevent.vcproj [copied from src/libexpat/libexpat/libexpatw.vcproj with 70% similarity]
src/client/nxpush/Makefile.am
src/client/nxpush/nxpush.vcproj [copied from src/libexpat/libexpat/libexpatw.vcproj with 70% similarity]
src/client/nxsms/Makefile.am
src/libexpat/libexpat/libexpatw.vcproj
src/libnxcl/Makefile.am
src/libnxcl/alarms.cpp
src/libnxcl/libnxcl.dsw [deleted file]
src/libnxcl/libnxcl.vcproj [copied from src/libexpat/libexpat/libexpatw.vcproj with 66% similarity]
src/libnxcl/libnxclw.vcproj [copied from src/libexpat/libexpat/libexpatw.vcproj with 69% similarity]
src/libnxcl/objects.cpp
src/libnxmap/libnxmap.vcproj
src/libnxmap/libnxmapw.vcproj

index bb871c0..bd52cab 100644 (file)
@@ -95,8 +95,11 @@ src/client/console/plugins/AlarmBrowser/mcpAlarmBrowser.dsp eol=crlf
 src/client/console/plugins/Dashboard/mcpDashboard.dsp eol=crlf
 src/client/console/plugins/ObjectBrowser/mcpObjectBrowser.dsp eol=crlf
 src/client/nxalarm/nxalarm.dsp eol=crlf
+src/client/nxalarm/nxalarm.vcproj -text
 src/client/nxevent/nxevent.dsp eol=crlf
+src/client/nxevent/nxevent.vcproj -text
 src/client/nxpush/nxpush.dsp eol=crlf
+src/client/nxpush/nxpush.vcproj -text
 src/client/nxsms/nxsms.dsp eol=crlf
 src/console/PocketPC/nxpc.vcc eol=crlf
 src/console/PocketPC/nxpc.vcp eol=crlf
@@ -316,9 +319,10 @@ src/libnetxms/libnetxms.vcproj -text
 src/libnetxms/libnetxms.vcw eol=crlf
 src/libnetxms/libnetxmsw.vcproj -text
 src/libnxcl/libnxcl.dsp eol=crlf
-src/libnxcl/libnxcl.dsw eol=crlf
 src/libnxcl/libnxcl.vcp eol=crlf
+src/libnxcl/libnxcl.vcproj -text
 src/libnxcl/libnxcl.vcw eol=crlf
+src/libnxcl/libnxclw.vcproj -text
 src/libnxlp/libnxlp.dsp eol=crlf
 src/libnxlp/libnxlp.h -text
 src/libnxlp/libnxlp.vcproj -text
index a52f815..71762df 100644 (file)
@@ -99,6 +99,44 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnxmapw", "src\libnxmap\l
                {AEB182ED-7F5C-4F5A-BCE1-9A38E98579BA} = {AEB182ED-7F5C-4F5A-BCE1-9A38E98579BA}
        EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnxcl", "src\libnxcl\libnxcl.vcproj", "{3CB9B8C6-E6BF-4002-A61A-7A21FEADB531}"
+       ProjectSection(ProjectDependencies) = postProject
+               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
+               {AB386821-B630-49F5-95C3-677B9DCE1270} = {AB386821-B630-49F5-95C3-677B9DCE1270}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnxclw", "src\libnxcl\libnxclw.vcproj", "{3CB9B8C6-E6BF-4002-A61A-7A21FEADB532}"
+       ProjectSection(ProjectDependencies) = postProject
+               {AEB182ED-7F5C-4F5A-BCE1-9A38E98579BA} = {AEB182ED-7F5C-4F5A-BCE1-9A38E98579BA}
+               {0A5E80F3-485D-40C8-BE1E-9D7EE744DB8B} = {0A5E80F3-485D-40C8-BE1E-9D7EE744DB8B}
+       EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{39BF23C9-D903-4C20-8E88-19533A745625}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nxalarm", "src\client\nxalarm\nxalarm.vcproj", "{F9FFAAE9-D669-451E-B9EF-18BC8AD37FAB}"
+       ProjectSection(ProjectDependencies) = postProject
+               {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531} = {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531}
+               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nxevent", "src\client\nxevent\nxevent.vcproj", "{C7A460E8-12A8-4FC7-9F59-C9C5CE17ED20}"
+       ProjectSection(ProjectDependencies) = postProject
+               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
+               {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531} = {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nxpush", "src\client\nxpush\nxpush.vcproj", "{B8671BF7-94E1-4615-A8C2-F5C78DB8C515}"
+       ProjectSection(ProjectDependencies) = postProject
+               {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531} = {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531}
+               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nxsms", "src\client\nxsms\nxsms.vcproj", "{B0A70A32-A8F0-4071-8044-FDA3C834A5C5}"
+       ProjectSection(ProjectDependencies) = postProject
+               {B1745870-F3ED-4ACB-B813-0C4F47EF0793} = {B1745870-F3ED-4ACB-B813-0C4F47EF0793}
+               {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531} = {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531}
+       EndProjectSection
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -121,14 +159,16 @@ Global
                {B1745870-F3ED-4ACB-B813-0C4F47EF0793}.Debug|x64.Build.0 = Debug|x64
                {B1745870-F3ED-4ACB-B813-0C4F47EF0793}.Release|Win32.ActiveCfg = Release|Win32
                {B1745870-F3ED-4ACB-B813-0C4F47EF0793}.Release|Win32.Build.0 = Release|Win32
-               {B1745870-F3ED-4ACB-B813-0C4F47EF0793}.Release|x64.ActiveCfg = Release|Win32
+               {B1745870-F3ED-4ACB-B813-0C4F47EF0793}.Release|x64.ActiveCfg = Release|x64
+               {B1745870-F3ED-4ACB-B813-0C4F47EF0793}.Release|x64.Build.0 = Release|x64
                {AEB182ED-7F5C-4F5A-BCE1-9A38E98579BA}.Debug|Win32.ActiveCfg = Debug|Win32
                {AEB182ED-7F5C-4F5A-BCE1-9A38E98579BA}.Debug|Win32.Build.0 = Debug|Win32
                {AEB182ED-7F5C-4F5A-BCE1-9A38E98579BA}.Debug|x64.ActiveCfg = Debug|x64
                {AEB182ED-7F5C-4F5A-BCE1-9A38E98579BA}.Debug|x64.Build.0 = Debug|x64
                {AEB182ED-7F5C-4F5A-BCE1-9A38E98579BA}.Release|Win32.ActiveCfg = Release|Win32
                {AEB182ED-7F5C-4F5A-BCE1-9A38E98579BA}.Release|Win32.Build.0 = Release|Win32
-               {AEB182ED-7F5C-4F5A-BCE1-9A38E98579BA}.Release|x64.ActiveCfg = Release|Win32
+               {AEB182ED-7F5C-4F5A-BCE1-9A38E98579BA}.Release|x64.ActiveCfg = Release|x64
+               {AEB182ED-7F5C-4F5A-BCE1-9A38E98579BA}.Release|x64.Build.0 = Release|x64
                {F16F9CA8-9438-4118-8A3C-F6DDC3DDCFDA}.Debug|Win32.ActiveCfg = Debug|Win32
                {F16F9CA8-9438-4118-8A3C-F6DDC3DDCFDA}.Debug|Win32.Build.0 = Debug|Win32
                {F16F9CA8-9438-4118-8A3C-F6DDC3DDCFDA}.Debug|x64.ActiveCfg = Debug|x64
@@ -143,96 +183,160 @@ Global
                {64EFC0C2-C67B-41F6-851D-F11DAB27A60B}.Debug|x64.Build.0 = Debug|x64
                {64EFC0C2-C67B-41F6-851D-F11DAB27A60B}.Release|Win32.ActiveCfg = Release|Win32
                {64EFC0C2-C67B-41F6-851D-F11DAB27A60B}.Release|Win32.Build.0 = Release|Win32
-               {64EFC0C2-C67B-41F6-851D-F11DAB27A60B}.Release|x64.ActiveCfg = Release|Win32
+               {64EFC0C2-C67B-41F6-851D-F11DAB27A60B}.Release|x64.ActiveCfg = Release|x64
+               {64EFC0C2-C67B-41F6-851D-F11DAB27A60B}.Release|x64.Build.0 = Release|x64
                {57598B02-3295-4FE8-9322-94CE871CC84D}.Debug|Win32.ActiveCfg = Debug|Win32
                {57598B02-3295-4FE8-9322-94CE871CC84D}.Debug|Win32.Build.0 = Debug|Win32
                {57598B02-3295-4FE8-9322-94CE871CC84D}.Debug|x64.ActiveCfg = Debug|x64
                {57598B02-3295-4FE8-9322-94CE871CC84D}.Debug|x64.Build.0 = Debug|x64
                {57598B02-3295-4FE8-9322-94CE871CC84D}.Release|Win32.ActiveCfg = Release|Win32
                {57598B02-3295-4FE8-9322-94CE871CC84D}.Release|Win32.Build.0 = Release|Win32
-               {57598B02-3295-4FE8-9322-94CE871CC84D}.Release|x64.ActiveCfg = Release|Win32
+               {57598B02-3295-4FE8-9322-94CE871CC84D}.Release|x64.ActiveCfg = Release|x64
+               {57598B02-3295-4FE8-9322-94CE871CC84D}.Release|x64.Build.0 = Release|x64
                {E95263B5-A248-4163-95F3-E33CA679AEB3}.Debug|Win32.ActiveCfg = Debug|Win32
                {E95263B5-A248-4163-95F3-E33CA679AEB3}.Debug|Win32.Build.0 = Debug|Win32
                {E95263B5-A248-4163-95F3-E33CA679AEB3}.Debug|x64.ActiveCfg = Debug|x64
                {E95263B5-A248-4163-95F3-E33CA679AEB3}.Debug|x64.Build.0 = Debug|x64
                {E95263B5-A248-4163-95F3-E33CA679AEB3}.Release|Win32.ActiveCfg = Release|Win32
                {E95263B5-A248-4163-95F3-E33CA679AEB3}.Release|Win32.Build.0 = Release|Win32
-               {E95263B5-A248-4163-95F3-E33CA679AEB3}.Release|x64.ActiveCfg = Release|Win32
+               {E95263B5-A248-4163-95F3-E33CA679AEB3}.Release|x64.ActiveCfg = Release|x64
+               {E95263B5-A248-4163-95F3-E33CA679AEB3}.Release|x64.Build.0 = Release|x64
                {EE54BC06-6B0F-4B91-9FC6-A5BB9ECBE577}.Debug|Win32.ActiveCfg = Debug|Win32
                {EE54BC06-6B0F-4B91-9FC6-A5BB9ECBE577}.Debug|Win32.Build.0 = Debug|Win32
                {EE54BC06-6B0F-4B91-9FC6-A5BB9ECBE577}.Debug|x64.ActiveCfg = Debug|x64
                {EE54BC06-6B0F-4B91-9FC6-A5BB9ECBE577}.Debug|x64.Build.0 = Debug|x64
                {EE54BC06-6B0F-4B91-9FC6-A5BB9ECBE577}.Release|Win32.ActiveCfg = Release|Win32
                {EE54BC06-6B0F-4B91-9FC6-A5BB9ECBE577}.Release|Win32.Build.0 = Release|Win32
-               {EE54BC06-6B0F-4B91-9FC6-A5BB9ECBE577}.Release|x64.ActiveCfg = Release|Win32
+               {EE54BC06-6B0F-4B91-9FC6-A5BB9ECBE577}.Release|x64.ActiveCfg = Release|x64
+               {EE54BC06-6B0F-4B91-9FC6-A5BB9ECBE577}.Release|x64.Build.0 = Release|x64
                {4E190DD5-70DA-41EC-8D05-5EE8D74F3709}.Debug|Win32.ActiveCfg = Debug|Win32
                {4E190DD5-70DA-41EC-8D05-5EE8D74F3709}.Debug|Win32.Build.0 = Debug|Win32
                {4E190DD5-70DA-41EC-8D05-5EE8D74F3709}.Debug|x64.ActiveCfg = Debug|x64
                {4E190DD5-70DA-41EC-8D05-5EE8D74F3709}.Debug|x64.Build.0 = Debug|x64
                {4E190DD5-70DA-41EC-8D05-5EE8D74F3709}.Release|Win32.ActiveCfg = Release|Win32
                {4E190DD5-70DA-41EC-8D05-5EE8D74F3709}.Release|Win32.Build.0 = Release|Win32
-               {4E190DD5-70DA-41EC-8D05-5EE8D74F3709}.Release|x64.ActiveCfg = Release|Win32
+               {4E190DD5-70DA-41EC-8D05-5EE8D74F3709}.Release|x64.ActiveCfg = Release|x64
+               {4E190DD5-70DA-41EC-8D05-5EE8D74F3709}.Release|x64.Build.0 = Release|x64
                {53A73D5F-C7E2-449E-A222-F2D78C85D514}.Debug|Win32.ActiveCfg = Debug|Win32
                {53A73D5F-C7E2-449E-A222-F2D78C85D514}.Debug|Win32.Build.0 = Debug|Win32
                {53A73D5F-C7E2-449E-A222-F2D78C85D514}.Debug|x64.ActiveCfg = Debug|x64
                {53A73D5F-C7E2-449E-A222-F2D78C85D514}.Debug|x64.Build.0 = Debug|x64
                {53A73D5F-C7E2-449E-A222-F2D78C85D514}.Release|Win32.ActiveCfg = Release|Win32
                {53A73D5F-C7E2-449E-A222-F2D78C85D514}.Release|Win32.Build.0 = Release|Win32
-               {53A73D5F-C7E2-449E-A222-F2D78C85D514}.Release|x64.ActiveCfg = Release|Win32
+               {53A73D5F-C7E2-449E-A222-F2D78C85D514}.Release|x64.ActiveCfg = Release|x64
+               {53A73D5F-C7E2-449E-A222-F2D78C85D514}.Release|x64.Build.0 = Release|x64
                {DE47D07A-C81B-4772-86D4-13389F263923}.Debug|Win32.ActiveCfg = Debug|Win32
                {DE47D07A-C81B-4772-86D4-13389F263923}.Debug|Win32.Build.0 = Debug|Win32
                {DE47D07A-C81B-4772-86D4-13389F263923}.Debug|x64.ActiveCfg = Debug|x64
                {DE47D07A-C81B-4772-86D4-13389F263923}.Debug|x64.Build.0 = Debug|x64
                {DE47D07A-C81B-4772-86D4-13389F263923}.Release|Win32.ActiveCfg = Release|Win32
                {DE47D07A-C81B-4772-86D4-13389F263923}.Release|Win32.Build.0 = Release|Win32
-               {DE47D07A-C81B-4772-86D4-13389F263923}.Release|x64.ActiveCfg = Release|Win32
+               {DE47D07A-C81B-4772-86D4-13389F263923}.Release|x64.ActiveCfg = Release|x64
+               {DE47D07A-C81B-4772-86D4-13389F263923}.Release|x64.Build.0 = Release|x64
                {F66A27F0-2943-4A16-ACC7-B450314B5163}.Debug|Win32.ActiveCfg = Debug|Win32
                {F66A27F0-2943-4A16-ACC7-B450314B5163}.Debug|Win32.Build.0 = Debug|Win32
                {F66A27F0-2943-4A16-ACC7-B450314B5163}.Debug|x64.ActiveCfg = Debug|x64
                {F66A27F0-2943-4A16-ACC7-B450314B5163}.Debug|x64.Build.0 = Debug|x64
                {F66A27F0-2943-4A16-ACC7-B450314B5163}.Release|Win32.ActiveCfg = Release|Win32
                {F66A27F0-2943-4A16-ACC7-B450314B5163}.Release|Win32.Build.0 = Release|Win32
-               {F66A27F0-2943-4A16-ACC7-B450314B5163}.Release|x64.ActiveCfg = Release|Win32
+               {F66A27F0-2943-4A16-ACC7-B450314B5163}.Release|x64.ActiveCfg = Release|x64
+               {F66A27F0-2943-4A16-ACC7-B450314B5163}.Release|x64.Build.0 = Release|x64
                {C5CCF5DE-152E-40F3-AC6C-C5E54BB7C45F}.Debug|Win32.ActiveCfg = Debug|Win32
                {C5CCF5DE-152E-40F3-AC6C-C5E54BB7C45F}.Debug|Win32.Build.0 = Debug|Win32
                {C5CCF5DE-152E-40F3-AC6C-C5E54BB7C45F}.Debug|x64.ActiveCfg = Debug|x64
                {C5CCF5DE-152E-40F3-AC6C-C5E54BB7C45F}.Debug|x64.Build.0 = Debug|x64
                {C5CCF5DE-152E-40F3-AC6C-C5E54BB7C45F}.Release|Win32.ActiveCfg = Release|Win32
                {C5CCF5DE-152E-40F3-AC6C-C5E54BB7C45F}.Release|Win32.Build.0 = Release|Win32
-               {C5CCF5DE-152E-40F3-AC6C-C5E54BB7C45F}.Release|x64.ActiveCfg = Release|Win32
+               {C5CCF5DE-152E-40F3-AC6C-C5E54BB7C45F}.Release|x64.ActiveCfg = Release|x64
+               {C5CCF5DE-152E-40F3-AC6C-C5E54BB7C45F}.Release|x64.Build.0 = Release|x64
                {1A2D2691-D9D4-4078-BBC4-A53DAF086D0C}.Debug|Win32.ActiveCfg = Debug|Win32
                {1A2D2691-D9D4-4078-BBC4-A53DAF086D0C}.Debug|Win32.Build.0 = Debug|Win32
                {1A2D2691-D9D4-4078-BBC4-A53DAF086D0C}.Debug|x64.ActiveCfg = Debug|x64
                {1A2D2691-D9D4-4078-BBC4-A53DAF086D0C}.Debug|x64.Build.0 = Debug|x64
                {1A2D2691-D9D4-4078-BBC4-A53DAF086D0C}.Release|Win32.ActiveCfg = Release|Win32
                {1A2D2691-D9D4-4078-BBC4-A53DAF086D0C}.Release|Win32.Build.0 = Release|Win32
-               {1A2D2691-D9D4-4078-BBC4-A53DAF086D0C}.Release|x64.ActiveCfg = Release|Win32
+               {1A2D2691-D9D4-4078-BBC4-A53DAF086D0C}.Release|x64.ActiveCfg = Release|x64
+               {1A2D2691-D9D4-4078-BBC4-A53DAF086D0C}.Release|x64.Build.0 = Release|x64
                {F8A8749E-E539-4A3B-A21C-2C5C86AE33EA}.Debug|Win32.ActiveCfg = Debug|Win32
                {F8A8749E-E539-4A3B-A21C-2C5C86AE33EA}.Debug|Win32.Build.0 = Debug|Win32
                {F8A8749E-E539-4A3B-A21C-2C5C86AE33EA}.Debug|x64.ActiveCfg = Debug|x64
                {F8A8749E-E539-4A3B-A21C-2C5C86AE33EA}.Debug|x64.Build.0 = Debug|x64
                {F8A8749E-E539-4A3B-A21C-2C5C86AE33EA}.Release|Win32.ActiveCfg = Release|Win32
                {F8A8749E-E539-4A3B-A21C-2C5C86AE33EA}.Release|Win32.Build.0 = Release|Win32
-               {F8A8749E-E539-4A3B-A21C-2C5C86AE33EA}.Release|x64.ActiveCfg = Release|Win32
+               {F8A8749E-E539-4A3B-A21C-2C5C86AE33EA}.Release|x64.ActiveCfg = Release|x64
+               {F8A8749E-E539-4A3B-A21C-2C5C86AE33EA}.Release|x64.Build.0 = Release|x64
                {BBE9028E-725C-45C6-97C9-BFC443F19DB6}.Debug|Win32.ActiveCfg = Debug|Win32
                {BBE9028E-725C-45C6-97C9-BFC443F19DB6}.Debug|Win32.Build.0 = Debug|Win32
                {BBE9028E-725C-45C6-97C9-BFC443F19DB6}.Debug|x64.ActiveCfg = Debug|x64
                {BBE9028E-725C-45C6-97C9-BFC443F19DB6}.Debug|x64.Build.0 = Debug|x64
                {BBE9028E-725C-45C6-97C9-BFC443F19DB6}.Release|Win32.ActiveCfg = Release|Win32
                {BBE9028E-725C-45C6-97C9-BFC443F19DB6}.Release|Win32.Build.0 = Release|Win32
-               {BBE9028E-725C-45C6-97C9-BFC443F19DB6}.Release|x64.ActiveCfg = Release|Win32
+               {BBE9028E-725C-45C6-97C9-BFC443F19DB6}.Release|x64.ActiveCfg = Release|x64
+               {BBE9028E-725C-45C6-97C9-BFC443F19DB6}.Release|x64.Build.0 = Release|x64
                {AB386821-B630-49F5-95C3-677B9DCE1270}.Debug|Win32.ActiveCfg = Debug|Win32
                {AB386821-B630-49F5-95C3-677B9DCE1270}.Debug|Win32.Build.0 = Debug|Win32
-               {AB386821-B630-49F5-95C3-677B9DCE1270}.Debug|x64.ActiveCfg = Debug|Win32
+               {AB386821-B630-49F5-95C3-677B9DCE1270}.Debug|x64.ActiveCfg = Debug|x64
+               {AB386821-B630-49F5-95C3-677B9DCE1270}.Debug|x64.Build.0 = Debug|x64
                {AB386821-B630-49F5-95C3-677B9DCE1270}.Release|Win32.ActiveCfg = Release|Win32
                {AB386821-B630-49F5-95C3-677B9DCE1270}.Release|Win32.Build.0 = Release|Win32
-               {AB386821-B630-49F5-95C3-677B9DCE1270}.Release|x64.ActiveCfg = Release|Win32
+               {AB386821-B630-49F5-95C3-677B9DCE1270}.Release|x64.ActiveCfg = Release|x64
+               {AB386821-B630-49F5-95C3-677B9DCE1270}.Release|x64.Build.0 = Release|x64
                {0A5E80F3-485D-40C8-BE1E-9D7EE744DB8B}.Debug|Win32.ActiveCfg = Debug|Win32
                {0A5E80F3-485D-40C8-BE1E-9D7EE744DB8B}.Debug|Win32.Build.0 = Debug|Win32
-               {0A5E80F3-485D-40C8-BE1E-9D7EE744DB8B}.Debug|x64.ActiveCfg = Debug|Win32
+               {0A5E80F3-485D-40C8-BE1E-9D7EE744DB8B}.Debug|x64.ActiveCfg = Debug|x64
+               {0A5E80F3-485D-40C8-BE1E-9D7EE744DB8B}.Debug|x64.Build.0 = Debug|x64
                {0A5E80F3-485D-40C8-BE1E-9D7EE744DB8B}.Release|Win32.ActiveCfg = Release|Win32
                {0A5E80F3-485D-40C8-BE1E-9D7EE744DB8B}.Release|Win32.Build.0 = Release|Win32
-               {0A5E80F3-485D-40C8-BE1E-9D7EE744DB8B}.Release|x64.ActiveCfg = Release|Win32
+               {0A5E80F3-485D-40C8-BE1E-9D7EE744DB8B}.Release|x64.ActiveCfg = Release|x64
+               {0A5E80F3-485D-40C8-BE1E-9D7EE744DB8B}.Release|x64.Build.0 = Release|x64
+               {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531}.Debug|Win32.ActiveCfg = Debug|Win32
+               {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531}.Debug|Win32.Build.0 = Debug|Win32
+               {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531}.Debug|x64.ActiveCfg = Debug|x64
+               {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531}.Debug|x64.Build.0 = Debug|x64
+               {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531}.Release|Win32.ActiveCfg = Release|Win32
+               {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531}.Release|Win32.Build.0 = Release|Win32
+               {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531}.Release|x64.ActiveCfg = Release|x64
+               {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531}.Release|x64.Build.0 = Release|x64
+               {3CB9B8C6-E6BF-4002-A61A-7A21FEADB532}.Debug|Win32.ActiveCfg = Debug|Win32
+               {3CB9B8C6-E6BF-4002-A61A-7A21FEADB532}.Debug|Win32.Build.0 = Debug|Win32
+               {3CB9B8C6-E6BF-4002-A61A-7A21FEADB532}.Debug|x64.ActiveCfg = Debug|x64
+               {3CB9B8C6-E6BF-4002-A61A-7A21FEADB532}.Debug|x64.Build.0 = Debug|x64
+               {3CB9B8C6-E6BF-4002-A61A-7A21FEADB532}.Release|Win32.ActiveCfg = Release|Win32
+               {3CB9B8C6-E6BF-4002-A61A-7A21FEADB532}.Release|Win32.Build.0 = Release|Win32
+               {3CB9B8C6-E6BF-4002-A61A-7A21FEADB532}.Release|x64.ActiveCfg = Release|x64
+               {3CB9B8C6-E6BF-4002-A61A-7A21FEADB532}.Release|x64.Build.0 = Release|x64
+               {F9FFAAE9-D669-451E-B9EF-18BC8AD37FAB}.Debug|Win32.ActiveCfg = Debug|Win32
+               {F9FFAAE9-D669-451E-B9EF-18BC8AD37FAB}.Debug|Win32.Build.0 = Debug|Win32
+               {F9FFAAE9-D669-451E-B9EF-18BC8AD37FAB}.Debug|x64.ActiveCfg = Debug|x64
+               {F9FFAAE9-D669-451E-B9EF-18BC8AD37FAB}.Debug|x64.Build.0 = Debug|x64
+               {F9FFAAE9-D669-451E-B9EF-18BC8AD37FAB}.Release|Win32.ActiveCfg = Release|Win32
+               {F9FFAAE9-D669-451E-B9EF-18BC8AD37FAB}.Release|Win32.Build.0 = Release|Win32
+               {F9FFAAE9-D669-451E-B9EF-18BC8AD37FAB}.Release|x64.ActiveCfg = Release|x64
+               {F9FFAAE9-D669-451E-B9EF-18BC8AD37FAB}.Release|x64.Build.0 = Release|x64
+               {C7A460E8-12A8-4FC7-9F59-C9C5CE17ED20}.Debug|Win32.ActiveCfg = Debug|Win32
+               {C7A460E8-12A8-4FC7-9F59-C9C5CE17ED20}.Debug|Win32.Build.0 = Debug|Win32
+               {C7A460E8-12A8-4FC7-9F59-C9C5CE17ED20}.Debug|x64.ActiveCfg = Debug|x64
+               {C7A460E8-12A8-4FC7-9F59-C9C5CE17ED20}.Debug|x64.Build.0 = Debug|x64
+               {C7A460E8-12A8-4FC7-9F59-C9C5CE17ED20}.Release|Win32.ActiveCfg = Release|Win32
+               {C7A460E8-12A8-4FC7-9F59-C9C5CE17ED20}.Release|Win32.Build.0 = Release|Win32
+               {C7A460E8-12A8-4FC7-9F59-C9C5CE17ED20}.Release|x64.ActiveCfg = Release|x64
+               {C7A460E8-12A8-4FC7-9F59-C9C5CE17ED20}.Release|x64.Build.0 = Release|x64
+               {B8671BF7-94E1-4615-A8C2-F5C78DB8C515}.Debug|Win32.ActiveCfg = Debug|Win32
+               {B8671BF7-94E1-4615-A8C2-F5C78DB8C515}.Debug|Win32.Build.0 = Debug|Win32
+               {B8671BF7-94E1-4615-A8C2-F5C78DB8C515}.Debug|x64.ActiveCfg = Debug|x64
+               {B8671BF7-94E1-4615-A8C2-F5C78DB8C515}.Debug|x64.Build.0 = Debug|x64
+               {B8671BF7-94E1-4615-A8C2-F5C78DB8C515}.Release|Win32.ActiveCfg = Release|Win32
+               {B8671BF7-94E1-4615-A8C2-F5C78DB8C515}.Release|Win32.Build.0 = Release|Win32
+               {B8671BF7-94E1-4615-A8C2-F5C78DB8C515}.Release|x64.ActiveCfg = Release|x64
+               {B8671BF7-94E1-4615-A8C2-F5C78DB8C515}.Release|x64.Build.0 = Release|x64
+               {B0A70A32-A8F0-4071-8044-FDA3C834A5C5}.Debug|Win32.ActiveCfg = Debug|Win32
+               {B0A70A32-A8F0-4071-8044-FDA3C834A5C5}.Debug|Win32.Build.0 = Debug|Win32
+               {B0A70A32-A8F0-4071-8044-FDA3C834A5C5}.Debug|x64.ActiveCfg = Debug|x64
+               {B0A70A32-A8F0-4071-8044-FDA3C834A5C5}.Debug|x64.Build.0 = Debug|x64
+               {B0A70A32-A8F0-4071-8044-FDA3C834A5C5}.Release|Win32.ActiveCfg = Release|Win32
+               {B0A70A32-A8F0-4071-8044-FDA3C834A5C5}.Release|Win32.Build.0 = Release|Win32
+               {B0A70A32-A8F0-4071-8044-FDA3C834A5C5}.Release|x64.ActiveCfg = Release|x64
+               {B0A70A32-A8F0-4071-8044-FDA3C834A5C5}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
@@ -257,5 +361,12 @@ Global
                {1A2D2691-D9D4-4078-BBC4-A53DAF086D0C} = {451F583D-C2DB-4414-870C-7FA0189BE7DD}
                {F8A8749E-E539-4A3B-A21C-2C5C86AE33EA} = {451F583D-C2DB-4414-870C-7FA0189BE7DD}
                {BBE9028E-725C-45C6-97C9-BFC443F19DB6} = {451F583D-C2DB-4414-870C-7FA0189BE7DD}
+               {3CB9B8C6-E6BF-4002-A61A-7A21FEADB531} = {E431F5D5-AAD8-4315-928A-23F86969DB35}
+               {3CB9B8C6-E6BF-4002-A61A-7A21FEADB532} = {E431F5D5-AAD8-4315-928A-23F86969DB35}
+               {39BF23C9-D903-4C20-8E88-19533A745625} = {E431F5D5-AAD8-4315-928A-23F86969DB35}
+               {F9FFAAE9-D669-451E-B9EF-18BC8AD37FAB} = {39BF23C9-D903-4C20-8E88-19533A745625}
+               {C7A460E8-12A8-4FC7-9F59-C9C5CE17ED20} = {39BF23C9-D903-4C20-8E88-19533A745625}
+               {B8671BF7-94E1-4615-A8C2-F5C78DB8C515} = {39BF23C9-D903-4C20-8E88-19533A745625}
+               {B0A70A32-A8F0-4071-8044-FDA3C834A5C5} = {39BF23C9-D903-4C20-8E88-19533A745625}
        EndGlobalSection
 EndGlobal
index badbf1b..1de1853 100644 (file)
@@ -4,4 +4,4 @@ bin_PROGRAMS = nxalarm
 nxalarm_SOURCES = nxalarm.cpp
 nxalarm_LDADD = ../../libnetxms/libnetxms.la ../../libnxcl/libnxcl.la
 
-EXTRA_DIST = nxalarm.dsp nxalarm.h
+EXTRA_DIST = nxalarm.vcproj nxalarm.h
similarity index 71%
copy from src/libexpat/libexpat/libexpatw.vcproj
copy to src/client/nxalarm/nxalarm.vcproj
index e1d14f1..383058f 100644 (file)
@@ -2,9 +2,9 @@
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
        Version="8.00"\r
-       Name="libexpatw"\r
-       ProjectGUID="{F16F9CA8-9438-4118-8A3C-F6DDC3DDCFDA}"\r
-       RootNamespace="libexpat"\r
+       Name="nxalarm"\r
+       ProjectGUID="{F9FFAAE9-D669-451E-B9EF-18BC8AD37FAB}"\r
+       RootNamespace="nxalarm"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
@@ -21,9 +21,9 @@
                <Configuration\r
                        Name="Debug|Win32"\r
                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)_UNICODE"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="1"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -43,7 +43,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP,XML_UNICODE_WCHAR_T"\r
+                               AdditionalIncludeDirectories="..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                LinkIncremental="2"\r
-                               ModuleDefinitionFile="libexpatw.def"\r
                                GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
+                               SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)_UNICODE"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="1"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP,XML_UNICODE_WCHAR_T"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               AdditionalIncludeDirectories="..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
+                               RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               Detect64BitPortabilityProblems="false"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="2"\r
-                               ModuleDefinitionFile="libexpatw.def"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="17"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)_UNICODE"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP,XML_UNICODE_WCHAR_T"\r
-                               RuntimeLibrary="2"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               ModuleDefinitionFile="libexpatw.def"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
+                               SubSystem="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                <Configuration\r
                        Name="Release|x64"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)_UNICODE"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="1"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP,XML_UNICODE_WCHAR_T"\r
+                               AdditionalIncludeDirectories="..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                LinkIncremental="1"\r
-                               ModuleDefinitionFile="libexpatw.def"\r
                                GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
+                               SubSystem="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="17"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
-                               RelativePath=".\libexpat.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\xmlparse.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\xmlrole.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\xmltok.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\xmltok_impl.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\xmltok_ns.c"\r
+                               RelativePath=".\nxalarm.cpp"\r
                                >\r
                        </File>\r
                </Filter>\r
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                        >\r
                        <File\r
-                               RelativePath=".\ascii.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\asciitab.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\expat.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\expat_external.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\iasciitab.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\internal.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\latin1tab.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\macconfig.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\nametab.h"\r
+                               RelativePath="..\..\..\include\netxms-version.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\utf8tab.h"\r
+                               RelativePath="..\..\..\include\nms_common.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\winconfig.h"\r
+                               RelativePath="..\..\..\include\nms_util.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\xmlrole.h"\r
+                               RelativePath=".\nxalarm.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\xmltok.h"\r
+                               RelativePath="..\..\..\include\nxclapi.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\xmltok_impl.h"\r
+                               RelativePath="..\..\..\include\unicode.h"\r
                                >\r
                        </File>\r
                </Filter>\r
index a01093d..2e81ece 100644 (file)
@@ -14,4 +14,4 @@ bin_PROGRAMS = nxevent
 nxevent_SOURCES = nxevent.cpp
 nxevent_LDADD = ../libnetxms/libnetxms.la ../libnxmap/libnxmap.la ../libnxcl/libnxcl.la
 
-EXTRA_DIST = nxevent.dsp nxevent.dsw nxevent.h
+EXTRA_DIST = nxevent.vcproj nxevent.h
similarity index 70%
copy from src/libexpat/libexpat/libexpatw.vcproj
copy to src/client/nxevent/nxevent.vcproj
index e1d14f1..ed0c331 100644 (file)
@@ -2,9 +2,9 @@
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
        Version="8.00"\r
-       Name="libexpatw"\r
-       ProjectGUID="{F16F9CA8-9438-4118-8A3C-F6DDC3DDCFDA}"\r
-       RootNamespace="libexpat"\r
+       Name="nxevent"\r
+       ProjectGUID="{C7A460E8-12A8-4FC7-9F59-C9C5CE17ED20}"\r
+       RootNamespace="nxevent"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
@@ -21,9 +21,9 @@
                <Configuration\r
                        Name="Debug|Win32"\r
                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)_UNICODE"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="1"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP,XML_UNICODE_WCHAR_T"\r
+                               AdditionalIncludeDirectories="..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                LinkIncremental="2"\r
-                               ModuleDefinitionFile="libexpatw.def"\r
                                GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
+                               SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)_UNICODE"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="1"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP,XML_UNICODE_WCHAR_T"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               AdditionalIncludeDirectories="..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
+                               RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="2"\r
-                               ModuleDefinitionFile="libexpatw.def"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="17"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)_UNICODE"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP,XML_UNICODE_WCHAR_T"\r
-                               RuntimeLibrary="2"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               ModuleDefinitionFile="libexpatw.def"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
+                               SubSystem="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                <Configuration\r
                        Name="Release|x64"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)_UNICODE"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="1"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP,XML_UNICODE_WCHAR_T"\r
+                               AdditionalIncludeDirectories="..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                LinkIncremental="1"\r
-                               ModuleDefinitionFile="libexpatw.def"\r
                                GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
+                               SubSystem="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="17"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
-                               RelativePath=".\libexpat.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\xmlparse.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\xmlrole.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\xmltok.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\xmltok_impl.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\xmltok_ns.c"\r
+                               RelativePath=".\nxevent.cpp"\r
                                >\r
                        </File>\r
                </Filter>\r
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                        >\r
                        <File\r
-                               RelativePath=".\ascii.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\asciitab.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\expat.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\expat_external.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\iasciitab.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\internal.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\latin1tab.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\macconfig.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\nametab.h"\r
+                               RelativePath="..\..\..\include\netxms-version.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\utf8tab.h"\r
+                               RelativePath="..\..\..\include\nms_common.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\winconfig.h"\r
+                               RelativePath="..\..\..\include\nms_util.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\xmlrole.h"\r
+                               RelativePath="..\..\..\include\nxclapi.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\xmltok.h"\r
+                               RelativePath=".\nxevent.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\xmltok_impl.h"\r
+                               RelativePath="..\..\..\include\unicode.h"\r
                                >\r
                        </File>\r
                </Filter>\r
index 69813be..419eb8c 100644 (file)
@@ -14,4 +14,4 @@ bin_PROGRAMS = nxpush
 nxpush_SOURCES = nxpush.cpp
 nxpush_LDADD = ../libnetxms/libnetxms.la ../libnxmap/libnxmap.la ../libnxcl/libnxcl.la
 
-EXTRA_DIST = nxpush.dsp nxpush.dsw
+EXTRA_DIST = nxpush.vcproj
similarity index 70%
copy from src/libexpat/libexpat/libexpatw.vcproj
copy to src/client/nxpush/nxpush.vcproj
index e1d14f1..bb4b36b 100644 (file)
@@ -2,9 +2,9 @@
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
        Version="8.00"\r
-       Name="libexpatw"\r
-       ProjectGUID="{F16F9CA8-9438-4118-8A3C-F6DDC3DDCFDA}"\r
-       RootNamespace="libexpat"\r
+       Name="nxpush"\r
+       ProjectGUID="{B8671BF7-94E1-4615-A8C2-F5C78DB8C515}"\r
+       RootNamespace="nxpush"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
@@ -21,9 +21,9 @@
                <Configuration\r
                        Name="Debug|Win32"\r
                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)_UNICODE"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="1"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -43,7 +43,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP,XML_UNICODE_WCHAR_T"\r
+                               AdditionalIncludeDirectories="..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                LinkIncremental="2"\r
-                               ModuleDefinitionFile="libexpatw.def"\r
                                GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
+                               SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)_UNICODE"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="1"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP,XML_UNICODE_WCHAR_T"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               AdditionalIncludeDirectories="..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
+                               RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               Detect64BitPortabilityProblems="false"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="2"\r
-                               ModuleDefinitionFile="libexpatw.def"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="17"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)_UNICODE"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP,XML_UNICODE_WCHAR_T"\r
-                               RuntimeLibrary="2"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               ModuleDefinitionFile="libexpatw.def"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
+                               SubSystem="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                <Configuration\r
                        Name="Release|x64"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)_UNICODE"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="1"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP,XML_UNICODE_WCHAR_T"\r
+                               AdditionalIncludeDirectories="..\..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                LinkIncremental="1"\r
-                               ModuleDefinitionFile="libexpatw.def"\r
                                GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
+                               SubSystem="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="17"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
-                               RelativePath=".\libexpat.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\xmlparse.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\xmlrole.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\xmltok.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\xmltok_impl.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\xmltok_ns.c"\r
+                               RelativePath=".\nxpush.cpp"\r
                                >\r
                        </File>\r
                </Filter>\r
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                        >\r
                        <File\r
-                               RelativePath=".\ascii.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\asciitab.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\expat.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\expat_external.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\iasciitab.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\internal.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\latin1tab.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\macconfig.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\nametab.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\utf8tab.h"\r
+                               RelativePath="..\..\..\include\netxms-version.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\winconfig.h"\r
+                               RelativePath="..\..\..\include\nms_common.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\xmlrole.h"\r
+                               RelativePath="..\..\..\include\nms_util.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\xmltok.h"\r
+                               RelativePath="..\..\..\include\nxclapi.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\xmltok_impl.h"\r
+                               RelativePath="..\..\..\include\unicode.h"\r
                                >\r
                        </File>\r
                </Filter>\r
index 17f76a2..4a421d8 100644 (file)
@@ -4,4 +4,4 @@ bin_PROGRAMS = nxsms
 nxsms_SOURCES = nxsms.cpp
 nxsms_LDADD = ../../libnetxms/libnetxms.la ../../libnxcl/libnxcl.la
 
-EXTRA_DIST = nxsms.dsp nxsms.h
+EXTRA_DIST = nxsms.vcproj nxsms.h
index e1d14f1..8306f1d 100644 (file)
@@ -4,7 +4,7 @@
        Version="8.00"\r
        Name="libexpatw"\r
        ProjectGUID="{F16F9CA8-9438-4118-8A3C-F6DDC3DDCFDA}"\r
-       RootNamespace="libexpat"\r
+       RootNamespace="libexpatw"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
index 42ff394..ecb3813 100644 (file)
@@ -23,6 +23,6 @@ libnxclw_la_LDFLAGS = -version-info $(NETXMS_LIBRARY_VERSION)
 libnxclw_la_LIBADD = ../libnetxms/libnetxmsw.la ../libnxmap/libnxmapw.la
 
 EXTRA_DIST = \
-       libnxcl.dsp libnxcl.dsw \
+       libnxcl.vcproj libnxclw.vcproj libnxcl.dsp \
        libnxcl.vcp libnxcl.vcw \
        libnxcl.h
index 8f7f77d..f1eee72 100644 (file)
@@ -247,7 +247,7 @@ TCHAR LIBNXCL_EXPORTABLE *NXCFormatAlarmText(NXC_SESSION session, NXC_ALARM *ala
                        out += prev;
                        break;
                }
-               out.AddString(prev, curr - prev);
+               out.AddString(prev, (DWORD)(curr - prev));
                curr++;
                switch(*curr)
                {
diff --git a/src/libnxcl/libnxcl.dsw b/src/libnxcl/libnxcl.dsw
deleted file mode 100644 (file)
index 3202cb1..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "libnxcl"=.\libnxcl.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
similarity index 66%
copy from src/libexpat/libexpat/libexpatw.vcproj
copy to src/libnxcl/libnxcl.vcproj
index e1d14f1..fbe3c44 100644 (file)
@@ -2,9 +2,9 @@
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
        Version="8.00"\r
-       Name="libexpatw"\r
-       ProjectGUID="{F16F9CA8-9438-4118-8A3C-F6DDC3DDCFDA}"\r
-       RootNamespace="libexpat"\r
+       Name="libnxcl"\r
+       ProjectGUID="{3CB9B8C6-E6BF-4002-A61A-7A21FEADB531}"\r
+       RootNamespace="libnxcl"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
@@ -21,9 +21,9 @@
                <Configuration\r
                        Name="Debug|Win32"\r
                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)_UNICODE"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       CharacterSet="1"\r
+                       CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -43,7 +43,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP,XML_UNICODE_WCHAR_T"\r
+                               AdditionalIncludeDirectories="..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXCL_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -63,8 +64,8 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                LinkIncremental="2"\r
-                               ModuleDefinitionFile="libexpatw.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)_UNICODE"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       CharacterSet="1"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP,XML_UNICODE_WCHAR_T"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               AdditionalIncludeDirectories="..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXCL_EXPORTS"\r
+                               RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               Detect64BitPortabilityProblems="false"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="2"\r
-                               ModuleDefinitionFile="libexpatw.def"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
-                               TargetMachine="17"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)_UNICODE"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
+                       CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP,XML_UNICODE_WCHAR_T"\r
-                               RuntimeLibrary="2"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXCL_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               ModuleDefinitionFile="libexpatw.def"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                <Configuration\r
                        Name="Release|x64"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)_UNICODE"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       CharacterSet="1"\r
+                       CharacterSet="2"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP,XML_UNICODE_WCHAR_T"\r
+                               AdditionalIncludeDirectories="..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXCL_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                LinkIncremental="1"\r
-                               ModuleDefinitionFile="libexpatw.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
-                               RelativePath=".\libexpat.cpp"\r
+                               RelativePath=".\actions.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\xmlparse.c"\r
+                               RelativePath=".\agentcfg.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\xmlrole.c"\r
+                               RelativePath=".\alarms.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\xmltok.c"\r
+                               RelativePath=".\cert.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\xmltok_impl.c"\r
+                               RelativePath=".\comm.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\xmltok_ns.c"\r
+                               RelativePath=".\datacoll.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\epp.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\eventdb.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\events.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\graph.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\image.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\layer2.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\lpp.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\main.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\map.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\mib.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\mp.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\objects.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\objtools.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\package.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\script.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\server.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\session.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\situation.cpp"\r
                                >\r
                        </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Header Files"\r
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
-                       >\r
                        <File\r
-                               RelativePath=".\ascii.h"\r
+                               RelativePath=".\snmp.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\asciitab.h"\r
+                               RelativePath=".\snmptrap.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\expat.h"\r
+                               RelativePath=".\users.cpp"\r
                                >\r
                        </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
                        <File\r
-                               RelativePath=".\expat_external.h"\r
+                               RelativePath=".\libnxcl.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\iasciitab.h"\r
+                               RelativePath="..\..\include\netxms-regex.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\internal.h"\r
+                               RelativePath="..\..\include\netxms-version.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\latin1tab.h"\r
+                               RelativePath="..\..\include\netxms_maps.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\macconfig.h"\r
+                               RelativePath="..\..\include\nms_common.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\nametab.h"\r
+                               RelativePath="..\..\include\nms_cscp.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\utf8tab.h"\r
+                               RelativePath="..\..\include\nms_threads.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\winconfig.h"\r
+                               RelativePath="..\..\include\nms_util.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\xmlrole.h"\r
+                               RelativePath="..\..\include\nxclapi.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\xmltok.h"\r
+                               RelativePath="..\..\include\nxcpapi.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\xmltok_impl.h"\r
+                               RelativePath="..\..\include\unicode.h"\r
                                >\r
                        </File>\r
                </Filter>\r
similarity index 69%
copy from src/libexpat/libexpat/libexpatw.vcproj
copy to src/libnxcl/libnxclw.vcproj
index e1d14f1..18be685 100644 (file)
@@ -2,9 +2,9 @@
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
        Version="8.00"\r
-       Name="libexpatw"\r
-       ProjectGUID="{F16F9CA8-9438-4118-8A3C-F6DDC3DDCFDA}"\r
-       RootNamespace="libexpat"\r
+       Name="libnxclw"\r
+       ProjectGUID="{3CB9B8C6-E6BF-4002-A61A-7A21FEADB532}"\r
+       RootNamespace="libnxclw"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
@@ -43,7 +43,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP,XML_UNICODE_WCHAR_T"\r
+                               AdditionalIncludeDirectories="..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXCL_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -63,8 +64,8 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                LinkIncremental="2"\r
-                               ModuleDefinitionFile="libexpatw.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)_UNICODE"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)_UNICODE"\r
                        ConfigurationType="2"\r
                        CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP,XML_UNICODE_WCHAR_T"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               AdditionalIncludeDirectories="..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXCL_EXPORTS"\r
+                               RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               Detect64BitPortabilityProblems="false"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="2"\r
-                               ModuleDefinitionFile="libexpatw.def"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
-                               TargetMachine="17"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)_UNICODE"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)_UNICODE"\r
                        ConfigurationType="2"\r
                        CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP,XML_UNICODE_WCHAR_T"\r
-                               RuntimeLibrary="2"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXCL_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               ModuleDefinitionFile="libexpatw.def"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP,XML_UNICODE_WCHAR_T"\r
+                               AdditionalIncludeDirectories="..\..\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXCL_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
                                LinkIncremental="1"\r
-                               ModuleDefinitionFile="libexpatw.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
-                               RelativePath=".\libexpat.cpp"\r
+                               RelativePath=".\actions.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\xmlparse.c"\r
+                               RelativePath=".\agentcfg.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\xmlrole.c"\r
+                               RelativePath=".\alarms.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\xmltok.c"\r
+                               RelativePath=".\cert.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\xmltok_impl.c"\r
+                               RelativePath=".\comm.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\xmltok_ns.c"\r
+                               RelativePath=".\datacoll.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\epp.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\eventdb.cpp"\r
                                >\r
                        </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Header Files"\r
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
-                       >\r
                        <File\r
-                               RelativePath=".\ascii.h"\r
+                               RelativePath=".\events.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\asciitab.h"\r
+                               RelativePath=".\graph.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\expat.h"\r
+                               RelativePath=".\image.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\expat_external.h"\r
+                               RelativePath=".\layer2.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\lpp.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\main.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\map.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\mib.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\mp.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\objects.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\objtools.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\package.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\script.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\server.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\session.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\situation.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\snmp.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\snmptrap.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\users.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\libnxcl.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\iasciitab.h"\r
+                               RelativePath="..\..\include\netxms-regex.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\internal.h"\r
+                               RelativePath="..\..\include\netxms-version.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\latin1tab.h"\r
+                               RelativePath="..\..\include\netxms_maps.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\macconfig.h"\r
+                               RelativePath="..\..\include\nms_common.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\nametab.h"\r
+                               RelativePath="..\..\include\nms_cscp.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\utf8tab.h"\r
+                               RelativePath="..\..\include\nms_threads.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\winconfig.h"\r
+                               RelativePath="..\..\include\nms_util.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\xmlrole.h"\r
+                               RelativePath="..\..\include\nxclapi.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\xmltok.h"\r
+                               RelativePath="..\..\include\nxcpapi.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\xmltok_impl.h"\r
+                               RelativePath="..\..\include\unicode.h"\r
                                >\r
                        </File>\r
                </Filter>\r
index 4d18404..1d74353 100644 (file)
@@ -1361,7 +1361,7 @@ DWORD LIBNXCL_EXPORTABLE NXCSaveObjectCache(NXC_SESSION hSession, const TCHAR *p
          fwrite(pList[i].pObject->pAccessList, 1, 
                 sizeof(NXC_ACL_ENTRY) * pList[i].pObject->dwAclSize, hFile);
          
-                       dwSize = _tcslen(pList[i].pObject->pszComments) * sizeof(TCHAR);
+                       dwSize = (DWORD)_tcslen(pList[i].pObject->pszComments) * sizeof(TCHAR);
          fwrite(&dwSize, 1, sizeof(DWORD), hFile);
          fwrite(pList[i].pObject->pszComments, 1, dwSize, hFile);
 
@@ -1373,11 +1373,11 @@ DWORD LIBNXCL_EXPORTABLE NXCSaveObjectCache(NXC_SESSION hSession, const TCHAR *p
          fwrite(&dwSize, 1, sizeof(DWORD), hFile);
                        for(j = 0; j < pList[i].pObject->pCustomAttrs->Size(); j++)
                        {
-            dwSize = _tcslen(pList[i].pObject->pCustomAttrs->GetKeyByIndex(j)) * sizeof(TCHAR);
+            dwSize = (DWORD)_tcslen(pList[i].pObject->pCustomAttrs->GetKeyByIndex(j)) * sizeof(TCHAR);
             fwrite(&dwSize, 1, sizeof(DWORD), hFile);
             fwrite(pList[i].pObject->pCustomAttrs->GetKeyByIndex(j), 1, dwSize, hFile);
 
-            dwSize = _tcslen(pList[i].pObject->pCustomAttrs->GetValueByIndex(j)) * sizeof(TCHAR);
+            dwSize = (DWORD)_tcslen(pList[i].pObject->pCustomAttrs->GetValueByIndex(j)) * sizeof(TCHAR);
             fwrite(&dwSize, 1, sizeof(DWORD), hFile);
             fwrite(pList[i].pObject->pCustomAttrs->GetValueByIndex(j), 1, dwSize, hFile);
                        }
@@ -1385,11 +1385,11 @@ DWORD LIBNXCL_EXPORTABLE NXCSaveObjectCache(NXC_SESSION hSession, const TCHAR *p
          switch(pList[i].pObject->iClass)
          {
             case OBJECT_NETWORKSERVICE:
-               dwSize = _tcslen(pList[i].pObject->netsrv.pszRequest) * sizeof(TCHAR);
+               dwSize = (DWORD)_tcslen(pList[i].pObject->netsrv.pszRequest) * sizeof(TCHAR);
                fwrite(&dwSize, 1, sizeof(DWORD), hFile);
                fwrite(pList[i].pObject->netsrv.pszRequest, 1, dwSize, hFile);
 
-               dwSize = _tcslen(pList[i].pObject->netsrv.pszResponse) * sizeof(TCHAR);
+               dwSize = (DWORD)_tcslen(pList[i].pObject->netsrv.pszResponse) * sizeof(TCHAR);
                fwrite(&dwSize, 1, sizeof(DWORD), hFile);
                fwrite(pList[i].pObject->netsrv.pszResponse, 1, dwSize, hFile);
                break;
@@ -1405,7 +1405,7 @@ DWORD LIBNXCL_EXPORTABLE NXCSaveObjectCache(NXC_SESSION hSession, const TCHAR *p
                       pList[i].pObject->vpnc.dwNumRemoteNets * sizeof(IP_NETWORK), hFile);
                break;
             case OBJECT_CONDITION:
-               dwSize = _tcslen(pList[i].pObject->cond.pszScript) * sizeof(TCHAR);
+               dwSize = (DWORD)_tcslen(pList[i].pObject->cond.pszScript) * sizeof(TCHAR);
                fwrite(&dwSize, 1, sizeof(DWORD), hFile);
                fwrite(pList[i].pObject->cond.pszScript, 1, dwSize, hFile);
 
index 1fb09d1..bf02091 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"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXMAP_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
+                               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="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"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXMAP_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
+                               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 ff09cbf..be68ca4 100644 (file)
@@ -4,13 +4,16 @@
        Version="8.00"\r
        Name="libnxmapw"\r
        ProjectGUID="{0A5E80F3-485D-40C8-BE1E-9D7EE744DB8B}"\r
-       RootNamespace="libnxmap"\r
+       RootNamespace="libnxmapw"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
                <Platform\r
                        Name="Win32"\r
                />\r
+               <Platform\r
+                       Name="x64"\r
+               />\r
        </Platforms>\r
        <ToolFiles>\r
        </ToolFiles>\r
@@ -18,7 +21,7 @@
                <Configuration\r
                        Name="Debug|Win32"\r
                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)_UNICODE"\r
                        ConfigurationType="2"\r
                        CharacterSet="1"\r
                        >\r
@@ -94,7 +97,7 @@
                <Configuration\r
                        Name="Release|Win32"\r
                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)_UNICODE"\r
                        ConfigurationType="2"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)_UNICODE"\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"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNXMAP_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
+                               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)_UNICODE"\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"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNXMAP_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
+                               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