Merge pull request #10 from LeoColomb/update2013

Update for Visual Studio 2013
ofTheo · Feb 7, 2014 · a682113 · a682113
2 parents 6f73c3a + 84a5bc3
commit a682113
Show file tree

Hide file tree

Showing 15 changed files with 14 additions and 514 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,11 +12,15 @@ obj/
 *.obj
 *.tlog
 *.dep
+*.lastbuildstate
+*.ncb
+
+#vs files
+[Dd]ebug/
+[Rr]elease/
 *.opensdf
 *.pdb
 *.idb
-*.lastbuildstate
-*.ncb
 *.ipch
 *.suo
 

diff --git a/videoInputSrcAndDemos/VS-videoInputDemoWithSrc/Debug/vc100.idb b/videoInputSrcAndDemos/VS-videoInputDemoWithSrc/Debug/vc100.idb
diff --git a/videoInputSrcAndDemos/VS-videoInputDemoWithSrc/Debug/vc100.pdb b/videoInputSrcAndDemos/VS-videoInputDemoWithSrc/Debug/vc100.pdb
diff --git a/videoInputSrcAndDemos/VS-videoInputDemoWithSrc/Debug/videoInputBasicDemo.exe.embed.manifest b/videoInputSrcAndDemos/VS-videoInputDemoWithSrc/Debug/videoInputBasicDemo.exe.embed.manifest
diff --git a/...nputSrcAndDemos/VS-videoInputDemoWithSrc/Debug/videoInputBasicDemo.exe.embed.manifest.res b/...nputSrcAndDemos/VS-videoInputDemoWithSrc/Debug/videoInputBasicDemo.exe.embed.manifest.res
diff --git a/...tSrcAndDemos/VS-videoInputDemoWithSrc/Debug/videoInputBasicDemo.exe.intermediate.manifest b/...tSrcAndDemos/VS-videoInputDemoWithSrc/Debug/videoInputBasicDemo.exe.intermediate.manifest
diff --git a/videoInputSrcAndDemos/VS-videoInputDemoWithSrc/Debug/videoInputBasicDemo_manifest.rc b/videoInputSrcAndDemos/VS-videoInputDemoWithSrc/Debug/videoInputBasicDemo_manifest.rc
diff --git a/videoInputSrcAndDemos/VS-videoInputDemoWithSrc/Release/vc100.pdb b/videoInputSrcAndDemos/VS-videoInputDemoWithSrc/Release/vc100.pdb
diff --git a/...rcAndDemos/VS-videoInputDemoWithSrc/Release/videoInputBasicDemo.exe.intermediate.manifest b/...rcAndDemos/VS-videoInputDemoWithSrc/Release/videoInputBasicDemo.exe.intermediate.manifest
diff --git a/videoInputSrcAndDemos/VS-videoInputDemoWithSrc/videoInputBasicDemo.v11.suo b/videoInputSrcAndDemos/VS-videoInputDemoWithSrc/videoInputBasicDemo.v11.suo
diff --git a/videoInputSrcAndDemos/VS-videoInputDemoWithSrc/videoInputBasicDemo.vcproj b/videoInputSrcAndDemos/VS-videoInputDemoWithSrc/videoInputBasicDemo.vcproj
diff --git a/videoInputSrcAndDemos/VS-videoInputcompileAsLib/Release/videoInput.lib b/videoInputSrcAndDemos/VS-videoInputcompileAsLib/Release/videoInput.lib
diff --git a/videoInputSrcAndDemos/VS-videoInputcompileAsLib/videoInput.sln b/videoInputSrcAndDemos/VS-videoInputcompileAsLib/videoInput.sln
@@ -1,6 +1,5 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "videoInput", "videoInput.vcxproj", "{0D49DFE2-6BF1-4AA3-95B7-010FB9273F5F}"
 EndProject
 Global