Merge pull request #960 from evoskuil/master

Rationalize and update Visual Studio projects and packaging.
zeromq · Apr 6, 2014 · 28c074e · 28c074e
2 parents 84bf625 + b7675ea
commit 28c074e
Show file tree

Hide file tree

Showing 107 changed files with 4,306 additions and 1,736 deletions.
diff --git a/builds/msvc/libzmq.rc b/builds/msvc/libzmq.rc
diff --git a/builds/msvc/vs2008/libzmq.sln b/builds/msvc/vs2008/libzmq.sln
@@ -1,24 +1,24 @@
 
-Microsoft Visual Studio Solution File, Format Version 9.00
+Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzmq", "libzmq\libzmq.vcproj", "{641C5F36-32EE-4323-B740-992B651CF9D6}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_lat", "c_local_lat\c_local_lat.vcproj", "{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_lat", "local_lat\local_lat.vcproj", "{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}"
 	ProjectSection(ProjectDependencies) = postProject
 		{641C5F36-32EE-4323-B740-992B651CF9D6} = {641C5F36-32EE-4323-B740-992B651CF9D6}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_lat", "c_remote_lat\c_remote_lat.vcproj", "{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_lat", "remote_lat\remote_lat.vcproj", "{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}"
 	ProjectSection(ProjectDependencies) = postProject
 		{641C5F36-32EE-4323-B740-992B651CF9D6} = {641C5F36-32EE-4323-B740-992B651CF9D6}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_thr", "c_local_thr\c_local_thr.vcproj", "{8EF2DF6B-6646-460F-8032-913B70FE0E94}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_thr", "local_thr\local_thr.vcproj", "{8EF2DF6B-6646-460F-8032-913B70FE0E94}"
 	ProjectSection(ProjectDependencies) = postProject
 		{641C5F36-32EE-4323-B740-992B651CF9D6} = {641C5F36-32EE-4323-B740-992B651CF9D6}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_thr", "c_remote_thr\c_remote_thr.vcproj", "{B15E059C-0CBB-4A82-8C42-6567FB650802}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_thr", "remote_thr\remote_thr.vcproj", "{B15E059C-0CBB-4A82-8C42-6567FB650802}"
 	ProjectSection(ProjectDependencies) = postProject
 		{641C5F36-32EE-4323-B740-992B651CF9D6} = {641C5F36-32EE-4323-B740-992B651CF9D6}
 	EndProjectSection

diff --git a/...svc/vs2008/c_local_lat/c_local_lat.vcproj → ...ds/msvc/vs2008/local_lat/local_lat.vcproj b/...svc/vs2008/c_local_lat/c_local_lat.vcproj → ...ds/msvc/vs2008/local_lat/local_lat.vcproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject ProjectType="Visual C++" Version="9.00" Name="local_lat" ProjectGUID="{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}" RootNamespace="c_local_lat" TargetFrameworkVersion="196613">
+<VisualStudioProject ProjectType="Visual C++" Version="9.00" Name="local_lat" ProjectGUID="{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}" RootNamespace="local_lat" TargetFrameworkVersion="196613">
   <Platforms>
     <Platform Name="Win32" />
   </Platforms>

diff --git a/...svc/vs2008/c_local_thr/c_local_thr.vcproj → ...ds/msvc/vs2008/local_thr/local_thr.vcproj b/...svc/vs2008/c_local_thr/c_local_thr.vcproj → ...ds/msvc/vs2008/local_thr/local_thr.vcproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject ProjectType="Visual C++" Version="9.00" Name="local_thr" ProjectGUID="{8EF2DF6B-6646-460F-8032-913B70FE0E94}" RootNamespace="c_local_thr" TargetFrameworkVersion="196613">
+<VisualStudioProject ProjectType="Visual C++" Version="9.00" Name="local_thr" ProjectGUID="{8EF2DF6B-6646-460F-8032-913B70FE0E94}" RootNamespace="local_thr" TargetFrameworkVersion="196613">
   <Platforms>
     <Platform Name="Win32" />
   </Platforms>

diff --git a/...c/vs2008/c_remote_lat/c_remote_lat.vcproj → .../msvc/vs2008/remote_lat/remote_lat.vcproj b/...c/vs2008/c_remote_lat/c_remote_lat.vcproj → .../msvc/vs2008/remote_lat/remote_lat.vcproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject ProjectType="Visual C++" Version="9.00" Name="remote_lat" ProjectGUID="{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}" RootNamespace="c_remote_lat" TargetFrameworkVersion="196613">
+<VisualStudioProject ProjectType="Visual C++" Version="9.00" Name="remote_lat" ProjectGUID="{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}" RootNamespace="remote_lat" TargetFrameworkVersion="196613">
   <Platforms>
     <Platform Name="Win32" />
   </Platforms>

diff --git a/...c/vs2008/c_remote_thr/c_remote_thr.vcproj → .../msvc/vs2008/remote_thr/remote_thr.vcproj b/...c/vs2008/c_remote_thr/c_remote_thr.vcproj → .../msvc/vs2008/remote_thr/remote_thr.vcproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject ProjectType="Visual C++" Version="9.00" Name="remote_thr" ProjectGUID="{B15E059C-0CBB-4A82-8C42-6567FB650802}" RootNamespace="c_remote_thr" TargetFrameworkVersion="196613">
+<VisualStudioProject ProjectType="Visual C++" Version="9.00" Name="remote_thr" ProjectGUID="{B15E059C-0CBB-4A82-8C42-6567FB650802}" RootNamespace="remote_thr" TargetFrameworkVersion="196613">
   <Platforms>
     <Platform Name="Win32" />
   </Platforms>

diff --git a/builds/msvc/vs2010/c_local_lat/c_local_lat.vcxproj b/builds/msvc/vs2010/c_local_lat/c_local_lat.vcxproj
diff --git a/builds/msvc/vs2010/c_local_thr/c_local_thr.vcxproj b/builds/msvc/vs2010/c_local_thr/c_local_thr.vcxproj
diff --git a/builds/msvc/vs2010/c_remote_lat/c_remote_lat.vcxproj b/builds/msvc/vs2010/c_remote_lat/c_remote_lat.vcxproj