windows: moved project files into separate directories, cleaned up pr…

…oject files, updated README
mk01 · Apr 7, 2013 · e81699a · e81699a
1 parent b419626
commit e81699a
Show file tree

Hide file tree

Showing 20 changed files with 206 additions and 277 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,6 +14,7 @@
 *.pdb
 *.suo
 *.user
+*.aps
 
 *~
 
@@ -63,8 +64,16 @@ project/libcec.sdf
 project/obj
 project/Properties
 project/_*
-
 project/x64
+project/LibCecSharp/x64
+project/LibCecSharp/Debug
+project/LibCecSharp/Release
+project/libcec/x64
+project/libcec/Debug
+project/libcec/Release
+project/testclient/x64
+project/testclient/Debug
+project/testclient/Release
 
 project/RPi/toolchain
 project/RPi/firmware

diff --git a/README b/README
@@ -52,9 +52,13 @@ To compile, execute the following command:
                               === Windows ===
 ===============================================================================
 
-To compile libCEC on Windows, you'll need both Visual Studio 2008 and 2012.
-The installer needs the Windows DDK (Driver Development Kit) and Nullsoft's
-NSIS.
+To compile libCEC on Windows, you'll need Visual Studio 2012 and Visual Studio
+or Visual C++ 2008. The latter is needed to build LibCecSharp for .Net
+Framework 2.0.
+
+The adapter detection code needs the Windows DDK (Driver Development Kit).
+
+To create an installer, you'll need Nullsoft's NSIS.
 
 To compile libCEC, follow these instructions:
 * open /project/libcec.sln with Visual Studio 2012.

diff --git a/project/LibCecSharp.rc → project/LibCecSharp/LibCecSharp.rc b/project/LibCecSharp.rc → project/LibCecSharp/LibCecSharp.rc
diff --git a/project/LibCecSharp.vcxproj → project/LibCecSharp/LibCecSharp.vcxproj b/project/LibCecSharp.vcxproj → project/LibCecSharp/LibCecSharp.vcxproj
@@ -189,15 +189,14 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\LibCecSharp\AssemblyInfo.cpp" />
-    <ClCompile Include="..\src\LibCecSharp\LibCecSharp.cpp" />
+    <ClCompile Include="..\..\src\LibCecSharp\AssemblyInfo.cpp" />
+    <ClCompile Include="..\..\src\LibCecSharp\LibCecSharp.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\include\cec.h" />
-    <ClInclude Include="..\src\LibCecSharp\CecSharpTypes.h" />
-    <ClInclude Include="..\include\cectypes.h" />
-    <ClInclude Include="..\src\LibCecSharp\resource.h" />
-    <ClInclude Include="..\src\lib\platform\windows\stdint.h" />
+    <ClInclude Include="..\..\include\cec.h" />
+    <ClInclude Include="..\..\src\LibCecSharp\CecSharpTypes.h" />
+    <ClInclude Include="..\..\include\cectypes.h" />
+    <ClInclude Include="..\..\src\lib\platform\windows\stdint.h" />
     <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>

diff --git a/project/LibCecSharp.vcxproj.filters → ...t/LibCecSharp/LibCecSharp.vcxproj.filters b/project/LibCecSharp.vcxproj.filters → ...t/LibCecSharp/LibCecSharp.vcxproj.filters
@@ -11,27 +11,24 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\LibCecSharp\AssemblyInfo.cpp">
+    <ClCompile Include="..\..\src\LibCecSharp\AssemblyInfo.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\LibCecSharp\LibCecSharp.cpp">
+    <ClCompile Include="..\..\src\LibCecSharp\LibCecSharp.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\include\cec.h">
+    <ClInclude Include="..\..\include\cec.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\LibCecSharp\CecSharpTypes.h">
+    <ClInclude Include="..\..\src\LibCecSharp\CecSharpTypes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\cectypes.h">
+    <ClInclude Include="..\..\include\cectypes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\LibCecSharp\resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\lib\platform\windows\stdint.h">
+    <ClInclude Include="..\..\src\lib\platform\windows\stdint.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="resource.h">

diff --git a/project/LibCecSharp/resource.h b/project/LibCecSharp/resource.h
diff --git a/project/libcec.filters b/project/libcec.filters
diff --git a/project/libcec.sln b/project/libcec.sln
@@ -1,14 +1,14 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcec", "libcec.vcxproj", "{C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcec", "libcec\libcec.vcxproj", "{C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testclient", "testclient.vcxproj", "{F01222BF-6B3D-43BD-B254-434031CB9887}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testclient", "testclient\testclient.vcxproj", "{F01222BF-6B3D-43BD-B254-434031CB9887}"
 	ProjectSection(ProjectDependencies) = postProject
 		{C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0} = {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibCecSharp", "LibCecSharp.vcxproj", "{E54D4581-CD59-4687-BB10-694B8192EABA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibCecSharp", "LibCecSharp\LibCecSharp.vcxproj", "{E54D4581-CD59-4687-BB10-694B8192EABA}"
 	ProjectSection(ProjectDependencies) = postProject
 		{C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0} = {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}
 	EndProjectSection

diff --git a/project/libcec.rc → project/libcec/libcec.rc b/project/libcec.rc → project/libcec/libcec.rc
diff --git a/project/libcec.vcxproj → project/libcec/libcec.vcxproj b/project/libcec.vcxproj → project/libcec/libcec.vcxproj
@@ -19,89 +19,89 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\include\cec.h" />
-    <ClInclude Include="..\include\cecc.h" />
-    <ClInclude Include="..\include\cecloader.h" />
-    <ClInclude Include="..\include\cectypes.h" />
-    <ClInclude Include="..\src\lib\adapter\AdapterCommunication.h" />
-    <ClInclude Include="..\src\lib\adapter\AdapterFactory.h" />
-    <ClInclude Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommands.h" />
-    <ClInclude Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommunication.h" />
-    <ClInclude Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterDetection.h" />
-    <ClInclude Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessage.h" />
-    <ClInclude Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessageQueue.h" />
-    <ClInclude Include="..\src\lib\CECClient.h" />
-    <ClInclude Include="..\src\lib\CECInputBuffer.h" />
-    <ClInclude Include="..\src\lib\CECProcessor.h" />
-    <ClInclude Include="..\src\lib\CECTypeUtils.h" />
-    <ClInclude Include="..\src\lib\devices\CECAudioSystem.h" />
-    <ClInclude Include="..\src\lib\devices\CECBusDevice.h" />
-    <ClInclude Include="..\src\lib\devices\CECDeviceMap.h" />
-    <ClInclude Include="..\src\lib\devices\CECPlaybackDevice.h" />
-    <ClInclude Include="..\src\lib\devices\CECRecordingDevice.h" />
-    <ClInclude Include="..\src\lib\devices\CECTuner.h" />
-    <ClInclude Include="..\src\lib\devices\CECTV.h" />
-    <ClInclude Include="..\src\lib\implementations\ANCommandHandler.h" />
-    <ClInclude Include="..\src\lib\implementations\CECCommandHandler.h" />
-    <ClInclude Include="..\src\lib\implementations\PHCommandHandler.h" />
-    <ClInclude Include="..\src\lib\implementations\RLCommandHandler.h" />
-    <ClInclude Include="..\src\lib\implementations\SLCommandHandler.h" />
-    <ClInclude Include="..\src\lib\implementations\VLCommandHandler.h" />
-    <ClInclude Include="..\src\lib\LibCEC.h" />
-    <ClInclude Include="..\src\lib\platform\adl\adl-edid.h" />
-    <ClInclude Include="..\src\lib\platform\adl\adl_defines.h" />
-    <ClInclude Include="..\src\lib\platform\adl\adl_sdk.h" />
-    <ClInclude Include="..\src\lib\platform\adl\adl_structures.h" />
-    <ClInclude Include="..\src\lib\platform\nvidia\nv-edid.h" />
-    <ClInclude Include="..\src\lib\platform\os.h" />
-    <ClInclude Include="..\src\lib\platform\sockets\serialport.h" />
-    <ClInclude Include="..\src\lib\platform\sockets\socket.h" />
-    <ClInclude Include="..\src\lib\platform\sockets\tcp.h" />
-    <ClInclude Include="..\src\lib\platform\threads\mutex.h" />
-    <ClInclude Include="..\src\lib\platform\threads\threads.h" />
-    <ClInclude Include="..\src\lib\platform\util\baudrate.h" />
-    <ClInclude Include="..\src\lib\platform\util\buffer.h" />
-    <ClInclude Include="..\src\lib\platform\util\edid.h" />
-    <ClInclude Include="..\src\lib\platform\util\StdString.h" />
-    <ClInclude Include="..\src\lib\platform\util\timeutils.h" />
-    <ClInclude Include="..\src\lib\platform\windows\dlfcn-win32.h" />
-    <ClInclude Include="..\src\lib\platform\windows\os-socket.h" />
-    <ClInclude Include="..\src\lib\platform\windows\os-threads.h" />
-    <ClInclude Include="..\src\lib\platform\windows\os-types.h" />
-    <ClInclude Include="..\src\lib\platform\windows\stdint.h" />
-    <ClInclude Include="resource1.h" />
+    <ClInclude Include="..\..\include\cec.h" />
+    <ClInclude Include="..\..\include\cecc.h" />
+    <ClInclude Include="..\..\include\cecloader.h" />
+    <ClInclude Include="..\..\include\cectypes.h" />
+    <ClInclude Include="..\..\src\lib\adapter\AdapterCommunication.h" />
+    <ClInclude Include="..\..\src\lib\adapter\AdapterFactory.h" />
+    <ClInclude Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommands.h" />
+    <ClInclude Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommunication.h" />
+    <ClInclude Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterDetection.h" />
+    <ClInclude Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessage.h" />
+    <ClInclude Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessageQueue.h" />
+    <ClInclude Include="..\..\src\lib\CECClient.h" />
+    <ClInclude Include="..\..\src\lib\CECInputBuffer.h" />
+    <ClInclude Include="..\..\src\lib\CECProcessor.h" />
+    <ClInclude Include="..\..\src\lib\CECTypeUtils.h" />
+    <ClInclude Include="..\..\src\lib\devices\CECAudioSystem.h" />
+    <ClInclude Include="..\..\src\lib\devices\CECBusDevice.h" />
+    <ClInclude Include="..\..\src\lib\devices\CECDeviceMap.h" />
+    <ClInclude Include="..\..\src\lib\devices\CECPlaybackDevice.h" />
+    <ClInclude Include="..\..\src\lib\devices\CECRecordingDevice.h" />
+    <ClInclude Include="..\..\src\lib\devices\CECTuner.h" />
+    <ClInclude Include="..\..\src\lib\devices\CECTV.h" />
+    <ClInclude Include="..\..\src\lib\implementations\ANCommandHandler.h" />
+    <ClInclude Include="..\..\src\lib\implementations\CECCommandHandler.h" />
+    <ClInclude Include="..\..\src\lib\implementations\PHCommandHandler.h" />
+    <ClInclude Include="..\..\src\lib\implementations\RLCommandHandler.h" />
+    <ClInclude Include="..\..\src\lib\implementations\SLCommandHandler.h" />
+    <ClInclude Include="..\..\src\lib\implementations\VLCommandHandler.h" />
+    <ClInclude Include="..\..\src\lib\LibCEC.h" />
+    <ClInclude Include="..\..\src\lib\platform\adl\adl-edid.h" />
+    <ClInclude Include="..\..\src\lib\platform\adl\adl_defines.h" />
+    <ClInclude Include="..\..\src\lib\platform\adl\adl_sdk.h" />
+    <ClInclude Include="..\..\src\lib\platform\adl\adl_structures.h" />
+    <ClInclude Include="..\..\src\lib\platform\nvidia\nv-edid.h" />
+    <ClInclude Include="..\..\src\lib\platform\os.h" />
+    <ClInclude Include="..\..\src\lib\platform\sockets\serialport.h" />
+    <ClInclude Include="..\..\src\lib\platform\sockets\socket.h" />
+    <ClInclude Include="..\..\src\lib\platform\sockets\tcp.h" />
+    <ClInclude Include="..\..\src\lib\platform\threads\mutex.h" />
+    <ClInclude Include="..\..\src\lib\platform\threads\threads.h" />
+    <ClInclude Include="..\..\src\lib\platform\util\baudrate.h" />
+    <ClInclude Include="..\..\src\lib\platform\util\buffer.h" />
+    <ClInclude Include="..\..\src\lib\platform\util\edid.h" />
+    <ClInclude Include="..\..\src\lib\platform\util\StdString.h" />
+    <ClInclude Include="..\..\src\lib\platform\util\timeutils.h" />
+    <ClInclude Include="..\..\src\lib\platform\windows\dlfcn-win32.h" />
+    <ClInclude Include="..\..\src\lib\platform\windows\os-socket.h" />
+    <ClInclude Include="..\..\src\lib\platform\windows\os-threads.h" />
+    <ClInclude Include="..\..\src\lib\platform\windows\os-types.h" />
+    <ClInclude Include="..\..\src\lib\platform\windows\stdint.h" />
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\lib\adapter\AdapterFactory.cpp" />
-    <ClCompile Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommands.cpp" />
-    <ClCompile Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommunication.cpp" />
-    <ClCompile Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterDetection.cpp" />
-    <ClCompile Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessage.cpp" />
-    <ClCompile Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessageQueue.cpp" />
-    <ClCompile Include="..\src\lib\CECClient.cpp" />
-    <ClCompile Include="..\src\lib\CECProcessor.cpp" />
-    <ClCompile Include="..\src\lib\devices\CECAudioSystem.cpp" />
-    <ClCompile Include="..\src\lib\devices\CECBusDevice.cpp" />
-    <ClCompile Include="..\src\lib\devices\CECDeviceMap.cpp" />
-    <ClCompile Include="..\src\lib\devices\CECPlaybackDevice.cpp" />
-    <ClCompile Include="..\src\lib\devices\CECRecordingDevice.cpp" />
-    <ClCompile Include="..\src\lib\devices\CECTuner.cpp" />
-    <ClCompile Include="..\src\lib\devices\CECTV.cpp" />
-    <ClCompile Include="..\src\lib\implementations\ANCommandHandler.cpp" />
-    <ClCompile Include="..\src\lib\implementations\CECCommandHandler.cpp" />
-    <ClCompile Include="..\src\lib\implementations\PHCommandHandler.cpp" />
-    <ClCompile Include="..\src\lib\implementations\RLCommandHandler.cpp" />
-    <ClCompile Include="..\src\lib\implementations\SLCommandHandler.cpp" />
-    <ClCompile Include="..\src\lib\implementations\VLCommandHandler.cpp" />
-    <ClCompile Include="..\src\lib\LibCEC.cpp" />
-    <ClCompile Include="..\src\lib\LibCECC.cpp" />
-    <ClCompile Include="..\src\lib\LibCECDll.cpp" />
-    <ClCompile Include="..\src\lib\platform\adl\adl-edid.cpp" />
-    <ClCompile Include="..\src\lib\platform\nvidia\nv-edid.cpp" />
-    <ClCompile Include="..\src\lib\platform\windows\dlfcn-win32.cpp" />
-    <ClCompile Include="..\src\lib\platform\windows\os-edid.cpp" />
-    <ClCompile Include="..\src\lib\platform\windows\os-threads.cpp" />
-    <ClCompile Include="..\src\lib\platform\windows\serialport.cpp" />
+    <ClCompile Include="..\..\src\lib\adapter\AdapterFactory.cpp" />
+    <ClCompile Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommands.cpp" />
+    <ClCompile Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommunication.cpp" />
+    <ClCompile Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterDetection.cpp" />
+    <ClCompile Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessage.cpp" />
+    <ClCompile Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessageQueue.cpp" />
+    <ClCompile Include="..\..\src\lib\CECClient.cpp" />
+    <ClCompile Include="..\..\src\lib\CECProcessor.cpp" />
+    <ClCompile Include="..\..\src\lib\devices\CECAudioSystem.cpp" />
+    <ClCompile Include="..\..\src\lib\devices\CECBusDevice.cpp" />
+    <ClCompile Include="..\..\src\lib\devices\CECDeviceMap.cpp" />
+    <ClCompile Include="..\..\src\lib\devices\CECPlaybackDevice.cpp" />
+    <ClCompile Include="..\..\src\lib\devices\CECRecordingDevice.cpp" />
+    <ClCompile Include="..\..\src\lib\devices\CECTuner.cpp" />
+    <ClCompile Include="..\..\src\lib\devices\CECTV.cpp" />
+    <ClCompile Include="..\..\src\lib\implementations\ANCommandHandler.cpp" />
+    <ClCompile Include="..\..\src\lib\implementations\CECCommandHandler.cpp" />
+    <ClCompile Include="..\..\src\lib\implementations\PHCommandHandler.cpp" />
+    <ClCompile Include="..\..\src\lib\implementations\RLCommandHandler.cpp" />
+    <ClCompile Include="..\..\src\lib\implementations\SLCommandHandler.cpp" />
+    <ClCompile Include="..\..\src\lib\implementations\VLCommandHandler.cpp" />
+    <ClCompile Include="..\..\src\lib\LibCEC.cpp" />
+    <ClCompile Include="..\..\src\lib\LibCECC.cpp" />
+    <ClCompile Include="..\..\src\lib\LibCECDll.cpp" />
+    <ClCompile Include="..\..\src\lib\platform\adl\adl-edid.cpp" />
+    <ClCompile Include="..\..\src\lib\platform\nvidia\nv-edid.cpp" />
+    <ClCompile Include="..\..\src\lib\platform\windows\dlfcn-win32.cpp" />
+    <ClCompile Include="..\..\src\lib\platform\windows\os-edid.cpp" />
+    <ClCompile Include="..\..\src\lib\platform\windows\os-threads.cpp" />
+    <ClCompile Include="..\..\src\lib\platform\windows\serialport.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="libcec.rc" />