Revert "Revert "removing mm-fw-update placeholder demo to enable Ostr…

…o build"" This reverts commit ccb94db. Conflicts: examples/cpp-mm-fw-update.cpp
seer-it · Aug 24, 2016 · 593b984 · 593b984
1 parent e7d9d37
commit 593b984
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 440 deletions.
diff --git a/examples/cpp-mm-fw-update.cpp b/examples/cpp-mm-fw-update.cpp
diff --git a/librealsense.qtcreator/all.pro b/librealsense.qtcreator/all.pro
@@ -9,7 +9,6 @@ SUBDIRS += \
    ./cpp-tutorial-2-streams.pro \
    ./cpp-tutorial-3-pointcloud.pro \
    ./cpp-capture.pro \
-   ./cpp-mm-fw-update.pro \
    ./cpp-motion-module.pro \
    ./cpp-callback.pro \
    ./cpp-callback-2.pro \

diff --git a/librealsense.qtcreator/cpp-mm-fw-update.pro b/librealsense.qtcreator/cpp-mm-fw-update.pro
diff --git a/librealsense.vc12/cpp-mm-fw-update/cpp-mm-fw-update.vcxproj b/librealsense.vc12/cpp-mm-fw-update/cpp-mm-fw-update.vcxproj
diff --git a/librealsense.vc12/cpp-mm-fw-update/cpp-mm-fw-update.vcxproj.filters b/librealsense.vc12/cpp-mm-fw-update/cpp-mm-fw-update.vcxproj.filters
diff --git a/librealsense.vc12/realsense.sln b/librealsense.vc12/realsense.sln
@@ -119,8 +119,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-callback-2", "cpp-callb
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-stride", "cpp-stride\cpp-stride.vcxproj", "{78B5B485-34B9-4462-A284-B19118D3D0DA}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-mm-fw-update", "cpp-mm-fw-update\cpp-mm-fw-update.vcxproj", "{AC49E319-FABD-46FF-8952-37C072E65E87}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unit-tests-live-lr200", "unit-tests-live-lr200\unit-tests-live-lr200.vcxproj", "{9D0CA8E1-96E2-4A56-9000-F52035256190}"
 	ProjectSection(ProjectDependencies) = postProject
 		{1AE4CEB5-9A0B-4B9F-9505-824FD56BB41F} = {1AE4CEB5-9A0B-4B9F-9505-824FD56BB41F}
@@ -341,14 +339,6 @@ Global
 		{78B5B485-34B9-4462-A284-B19118D3D0DA}.Release|Win32.Build.0 = Release|Win32
 		{78B5B485-34B9-4462-A284-B19118D3D0DA}.Release|x64.ActiveCfg = Release|x64
 		{78B5B485-34B9-4462-A284-B19118D3D0DA}.Release|x64.Build.0 = Release|x64
-		{AC49E319-FABD-46FF-8952-37C072E65E87}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AC49E319-FABD-46FF-8952-37C072E65E87}.Debug|Win32.Build.0 = Debug|Win32
-		{AC49E319-FABD-46FF-8952-37C072E65E87}.Debug|x64.ActiveCfg = Debug|x64
-		{AC49E319-FABD-46FF-8952-37C072E65E87}.Debug|x64.Build.0 = Debug|x64
-		{AC49E319-FABD-46FF-8952-37C072E65E87}.Release|Win32.ActiveCfg = Release|Win32
-		{AC49E319-FABD-46FF-8952-37C072E65E87}.Release|Win32.Build.0 = Release|Win32
-		{AC49E319-FABD-46FF-8952-37C072E65E87}.Release|x64.ActiveCfg = Release|x64
-		{AC49E319-FABD-46FF-8952-37C072E65E87}.Release|x64.Build.0 = Release|x64
 		{9D0CA8E1-96E2-4A56-9000-F52035256190}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9D0CA8E1-96E2-4A56-9000-F52035256190}.Debug|Win32.Build.0 = Debug|Win32
 		{9D0CA8E1-96E2-4A56-9000-F52035256190}.Debug|x64.ActiveCfg = Debug|x64
@@ -395,7 +385,6 @@ Global
 		{D1A726B7-DF03-4F04-AEC8-936AB88FC372} = {9CE5B9D5-05C7-4288-99B3-13ABFBE7B60C}
 		{C3CB58F0-844A-4B8F-B3C6-159A9677E868} = {9CE5B9D5-05C7-4288-99B3-13ABFBE7B60C}
 		{78B5B485-34B9-4462-A284-B19118D3D0DA} = {9CE5B9D5-05C7-4288-99B3-13ABFBE7B60C}
-		{AC49E319-FABD-46FF-8952-37C072E65E87} = {9CE5B9D5-05C7-4288-99B3-13ABFBE7B60C}
 		{9D0CA8E1-96E2-4A56-9000-F52035256190} = {EA2793EE-C590-43D0-A11D-02F93DA139AC}
 		{1B6AC368-20CD-4016-9452-8621E06349CE} = {EA2793EE-C590-43D0-A11D-02F93DA139AC}
 	EndGlobalSection