windows: moved project files into separate directories, cleaned up project files...

diff --git a/.gitignore b/.gitignore
index 5e775ccbca3a0a76f8c3f39027834da0f73e8a40..633685896c761dc9838718bc993eeb607805405a 100644 (file)
--- 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
index dc19737a65433afa9a464d5e62c841a6a2179874..3f2ee2214009c741e1bf2ccb2a7cc4e37b0104fe 100644 (file)
--- 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 b/project/LibCecSharp/LibCecSharp.rc
similarity index 81%
rename from project/LibCecSharp.rc
rename to project/LibCecSharp/LibCecSharp.rc
index 7c69374bc7e911b5ff9ae5da9cf1b2451e7d0b72..a5f6f8cbb2cc107322347e43a59e0a041f98e65e 100644 (file)
Binary files a/project/LibCecSharp.rc and b/project/LibCecSharp/LibCecSharp.rc differ

diff --git a/project/LibCecSharp.vcxproj b/project/LibCecSharp/LibCecSharp.vcxproj
similarity index 96%
rename from project/LibCecSharp.vcxproj
rename to project/LibCecSharp/LibCecSharp.vcxproj
index 96ffaed3e3730c0f4d905a1da84138f00be25296..b909be65baeea4c5051dc0a1bc944cf7c4b6c321 100644 (file)
--- a/project/LibCecSharp.vcxproj
+++ b/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 b/project/LibCecSharp/LibCecSharp.vcxproj.filters
similarity index 70%
rename from project/LibCecSharp.vcxproj.filters
rename to project/LibCecSharp/LibCecSharp.vcxproj.filters
index b66970697c621a85477b5c259c6bf44eca0f2ccc..c879eb294ed672678e0745e7dd7346a86cfe5bb0 100644 (file)
--- a/project/LibCecSharp.vcxproj.filters
+++ b/project/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
new file mode 100644 (file)
index 0000000..69b5323
Binary files /dev/null and b/project/LibCecSharp/resource.h differ

diff --git a/project/libcec.filters b/project/libcec.filters
deleted file mode 100644 (file)
index efb6144..0000000
--- a/project/libcec.filters
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\tools.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\client.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\HTSPData.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\HTSPDemux.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\thread.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\..\addons\library.xbmc.addon\dlfcn-win32.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\HTSPConnection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\..\addons\library.xbmc.addon\dlfcn-win32.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\thread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\tools.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\client.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\HTSPData.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\HTSPDemux.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\HTSPConnection.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file

diff --git a/project/libcec.sln b/project/libcec.sln
index d0aafd8a937c45c01b980af542b95ee57acd1b5d..ea5221042ffcc3ef9dd1063f19a2f6120f7ad9ef 100644 (file)
--- 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 b/project/libcec/libcec.rc
similarity index 70%
rename from project/libcec.rc
rename to project/libcec/libcec.rc
index 2fe223a34754134a8b30d39b8ded603153a02f00..f73618f9a602f4436b2b446451ab48dd76223261 100644 (file)
Binary files a/project/libcec.rc and b/project/libcec/libcec.rc differ

diff --git a/project/libcec.vcxproj b/project/libcec/libcec.vcxproj
similarity index 64%
rename from project/libcec.vcxproj
rename to project/libcec/libcec.vcxproj
index b2af3eaf02db00a4eabeff950dc52269be73d2c9..b8db0b1366f7a436291396a3b505b026f0f9a279 100644 (file)
--- a/project/libcec.vcxproj
+++ b/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" />

diff --git a/project/libcec.vcxproj.filters b/project/libcec/libcec.vcxproj.filters
similarity index 51%
rename from project/libcec.vcxproj.filters
rename to project/libcec/libcec.vcxproj.filters
index 1b1cb3729ffb43a5365fc55ea803a618a0d7fa6a..b9e41ed1a4d96b407495f927d4338bd2d8e05787 100644 (file)
--- a/project/libcec.vcxproj.filters
+++ b/project/libcec/libcec.vcxproj.filters
@@ -39,227 +39,227 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\src\lib\CECProcessor.h" />
-    <ClInclude Include="..\src\lib\LibCEC.h" />
-    <ClInclude Include="..\include\cec.h">
+    <ClInclude Include="..\..\src\lib\CECProcessor.h" />
+    <ClInclude Include="..\..\src\lib\LibCEC.h" />
+    <ClInclude Include="..\..\include\cec.h">
       <Filter>exports</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\cecc.h">
+    <ClInclude Include="..\..\include\cecc.h">
       <Filter>exports</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\cecloader.h">
+    <ClInclude Include="..\..\include\cecloader.h">
       <Filter>exports</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\cectypes.h">
+    <ClInclude Include="..\..\include\cectypes.h">
       <Filter>exports</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\implementations\ANCommandHandler.h">
+    <ClInclude Include="..\..\src\lib\implementations\ANCommandHandler.h">
       <Filter>implementations</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\implementations\CECCommandHandler.h">
+    <ClInclude Include="..\..\src\lib\implementations\CECCommandHandler.h">
       <Filter>implementations</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\implementations\SLCommandHandler.h">
+    <ClInclude Include="..\..\src\lib\implementations\SLCommandHandler.h">
       <Filter>implementations</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\devices\CECBusDevice.h">
+    <ClInclude Include="..\..\src\lib\devices\CECBusDevice.h">
       <Filter>devices</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\implementations\VLCommandHandler.h">
+    <ClInclude Include="..\..\src\lib\implementations\VLCommandHandler.h">
       <Filter>implementations</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\devices\CECAudioSystem.h">
+    <ClInclude Include="..\..\src\lib\devices\CECAudioSystem.h">
       <Filter>devices</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\devices\CECPlaybackDevice.h">
+    <ClInclude Include="..\..\src\lib\devices\CECPlaybackDevice.h">
       <Filter>devices</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\devices\CECRecordingDevice.h">
+    <ClInclude Include="..\..\src\lib\devices\CECRecordingDevice.h">
       <Filter>devices</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\devices\CECTuner.h">
+    <ClInclude Include="..\..\src\lib\devices\CECTuner.h">
       <Filter>devices</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\devices\CECTV.h">
+    <ClInclude Include="..\..\src\lib\devices\CECTV.h">
       <Filter>devices</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\platform\os.h">
+    <ClInclude Include="..\..\src\lib\platform\os.h">
       <Filter>platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\platform\sockets\serialport.h">
+    <ClInclude Include="..\..\src\lib\platform\sockets\serialport.h">
       <Filter>platform\sockets</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\platform\sockets\socket.h">
+    <ClInclude Include="..\..\src\lib\platform\sockets\socket.h">
       <Filter>platform\sockets</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\platform\sockets\tcp.h">
+    <ClInclude Include="..\..\src\lib\platform\sockets\tcp.h">
       <Filter>platform\sockets</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\platform\util\baudrate.h">
+    <ClInclude Include="..\..\src\lib\platform\util\baudrate.h">
       <Filter>platform\util</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\platform\util\buffer.h">
+    <ClInclude Include="..\..\src\lib\platform\util\buffer.h">
       <Filter>platform\util</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\platform\util\StdString.h">
+    <ClInclude Include="..\..\src\lib\platform\util\StdString.h">
       <Filter>platform\util</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\platform\util\timeutils.h">
+    <ClInclude Include="..\..\src\lib\platform\util\timeutils.h">
       <Filter>platform\util</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\platform\threads\mutex.h">
+    <ClInclude Include="..\..\src\lib\platform\threads\mutex.h">
       <Filter>platform\threads</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\platform\threads\threads.h">
+    <ClInclude Include="..\..\src\lib\platform\threads\threads.h">
       <Filter>platform\threads</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\platform\windows\os-socket.h">
+    <ClInclude Include="..\..\src\lib\platform\windows\os-socket.h">
       <Filter>platform\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\platform\windows\os-threads.h">
+    <ClInclude Include="..\..\src\lib\platform\windows\os-threads.h">
       <Filter>platform\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\platform\windows\os-types.h">
+    <ClInclude Include="..\..\src\lib\platform\windows\os-types.h">
       <Filter>platform\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\platform\windows\stdint.h">
+    <ClInclude Include="..\..\src\lib\platform\windows\stdint.h">
       <Filter>platform\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\implementations\RLCommandHandler.h">
+    <ClInclude Include="..\..\src\lib\implementations\RLCommandHandler.h">
       <Filter>implementations</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\implementations\PHCommandHandler.h">
+    <ClInclude Include="..\..\src\lib\implementations\PHCommandHandler.h">
       <Filter>implementations</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\CECClient.h" />
-    <ClInclude Include="..\src\lib\CECInputBuffer.h" />
-    <ClInclude Include="..\src\lib\devices\CECDeviceMap.h">
+    <ClInclude Include="..\..\src\lib\CECClient.h" />
+    <ClInclude Include="..\..\src\lib\CECInputBuffer.h" />
+    <ClInclude Include="..\..\src\lib\devices\CECDeviceMap.h">
       <Filter>devices</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\CECTypeUtils.h" />
-    <ClInclude Include="..\src\lib\platform\util\edid.h">
+    <ClInclude Include="..\..\src\lib\CECTypeUtils.h" />
+    <ClInclude Include="..\..\src\lib\platform\util\edid.h">
       <Filter>platform\util</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\platform\adl\adl_defines.h">
+    <ClInclude Include="..\..\src\lib\platform\adl\adl_defines.h">
       <Filter>platform\adl</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\platform\adl\adl_sdk.h">
+    <ClInclude Include="..\..\src\lib\platform\adl\adl_sdk.h">
       <Filter>platform\adl</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\platform\adl\adl_structures.h">
+    <ClInclude Include="..\..\src\lib\platform\adl\adl_structures.h">
       <Filter>platform\adl</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\platform\adl\adl-edid.h">
+    <ClInclude Include="..\..\src\lib\platform\adl\adl-edid.h">
       <Filter>platform\adl</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\platform\windows\dlfcn-win32.h">
+    <ClInclude Include="..\..\src\lib\platform\windows\dlfcn-win32.h">
       <Filter>platform\windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\platform\nvidia\nv-edid.h">
+    <ClInclude Include="..\..\src\lib\platform\nvidia\nv-edid.h">
       <Filter>platform\nvidia</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\adapter\AdapterCommunication.h">
+    <ClInclude Include="..\..\src\lib\adapter\AdapterCommunication.h">
       <Filter>adapter</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommands.h">
+    <ClInclude Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommands.h">
       <Filter>adapter\Pulse-Eight</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommunication.h">
+    <ClInclude Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommunication.h">
       <Filter>adapter\Pulse-Eight</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterDetection.h">
+    <ClInclude Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterDetection.h">
       <Filter>adapter\Pulse-Eight</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessage.h">
+    <ClInclude Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessage.h">
       <Filter>adapter\Pulse-Eight</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessageQueue.h">
+    <ClInclude Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessageQueue.h">
       <Filter>adapter\Pulse-Eight</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\adapter\AdapterFactory.h">
+    <ClInclude Include="..\..\src\lib\adapter\AdapterFactory.h">
       <Filter>adapter</Filter>
     </ClInclude>
-    <ClInclude Include="resource1.h" />
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\lib\CECProcessor.cpp" />
-    <ClCompile Include="..\src\lib\LibCEC.cpp" />
-    <ClCompile Include="..\src\lib\LibCECC.cpp" />
-    <ClCompile Include="..\src\lib\LibCECDll.cpp" />
-    <ClCompile Include="..\src\lib\implementations\ANCommandHandler.cpp">
+    <ClCompile Include="..\..\src\lib\CECProcessor.cpp" />
+    <ClCompile Include="..\..\src\lib\LibCEC.cpp" />
+    <ClCompile Include="..\..\src\lib\LibCECC.cpp" />
+    <ClCompile Include="..\..\src\lib\LibCECDll.cpp" />
+    <ClCompile Include="..\..\src\lib\implementations\ANCommandHandler.cpp">
       <Filter>implementations</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lib\implementations\CECCommandHandler.cpp">
+    <ClCompile Include="..\..\src\lib\implementations\CECCommandHandler.cpp">
       <Filter>implementations</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lib\implementations\SLCommandHandler.cpp">
+    <ClCompile Include="..\..\src\lib\implementations\SLCommandHandler.cpp">
       <Filter>implementations</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lib\devices\CECBusDevice.cpp">
+    <ClCompile Include="..\..\src\lib\devices\CECBusDevice.cpp">
       <Filter>devices</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lib\implementations\VLCommandHandler.cpp">
+    <ClCompile Include="..\..\src\lib\implementations\VLCommandHandler.cpp">
       <Filter>implementations</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lib\devices\CECAudioSystem.cpp">
+    <ClCompile Include="..\..\src\lib\devices\CECAudioSystem.cpp">
       <Filter>devices</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lib\devices\CECPlaybackDevice.cpp">
+    <ClCompile Include="..\..\src\lib\devices\CECPlaybackDevice.cpp">
       <Filter>devices</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lib\devices\CECRecordingDevice.cpp">
+    <ClCompile Include="..\..\src\lib\devices\CECRecordingDevice.cpp">
       <Filter>devices</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lib\devices\CECTuner.cpp">
+    <ClCompile Include="..\..\src\lib\devices\CECTuner.cpp">
       <Filter>devices</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lib\devices\CECTV.cpp">
+    <ClCompile Include="..\..\src\lib\devices\CECTV.cpp">
       <Filter>devices</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lib\platform\windows\os-threads.cpp">
+    <ClCompile Include="..\..\src\lib\platform\windows\os-threads.cpp">
       <Filter>platform\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lib\platform\windows\serialport.cpp">
+    <ClCompile Include="..\..\src\lib\platform\windows\serialport.cpp">
       <Filter>platform\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lib\implementations\RLCommandHandler.cpp">
+    <ClCompile Include="..\..\src\lib\implementations\RLCommandHandler.cpp">
       <Filter>implementations</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lib\implementations\PHCommandHandler.cpp">
+    <ClCompile Include="..\..\src\lib\implementations\PHCommandHandler.cpp">
       <Filter>implementations</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lib\CECClient.cpp" />
-    <ClCompile Include="..\src\lib\devices\CECDeviceMap.cpp">
+    <ClCompile Include="..\..\src\lib\CECClient.cpp" />
+    <ClCompile Include="..\..\src\lib\devices\CECDeviceMap.cpp">
       <Filter>devices</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lib\platform\windows\os-edid.cpp">
+    <ClCompile Include="..\..\src\lib\platform\windows\os-edid.cpp">
       <Filter>platform\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lib\platform\adl\adl-edid.cpp">
+    <ClCompile Include="..\..\src\lib\platform\adl\adl-edid.cpp">
       <Filter>platform\adl</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lib\platform\windows\dlfcn-win32.cpp">
+    <ClCompile Include="..\..\src\lib\platform\windows\dlfcn-win32.cpp">
       <Filter>platform\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lib\platform\nvidia\nv-edid.cpp">
+    <ClCompile Include="..\..\src\lib\platform\nvidia\nv-edid.cpp">
       <Filter>platform\nvidia</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommands.cpp">
+    <ClCompile Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommands.cpp">
       <Filter>adapter\Pulse-Eight</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommunication.cpp">
+    <ClCompile Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommunication.cpp">
       <Filter>adapter\Pulse-Eight</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterDetection.cpp">
+    <ClCompile Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterDetection.cpp">
       <Filter>adapter\Pulse-Eight</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessage.cpp">
+    <ClCompile Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessage.cpp">
       <Filter>adapter\Pulse-Eight</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessageQueue.cpp">
+    <ClCompile Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessageQueue.cpp">
       <Filter>adapter\Pulse-Eight</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lib\adapter\AdapterFactory.cpp">
+    <ClCompile Include="..\..\src\lib\adapter\AdapterFactory.cpp">
       <Filter>adapter</Filter>
     </ClCompile>
   </ItemGroup>

diff --git a/project/libcec/resource.h b/project/libcec/resource.h
new file mode 100644 (file)
index 0000000..84edc7f
Binary files /dev/null and b/project/libcec/resource.h differ

diff --git a/project/resource.h b/project/resource.h
deleted file mode 100644 (file)
index 33017f8..0000000
--- a/project/resource.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by testclient.rc
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1001
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif

diff --git a/project/testclient/resource.h b/project/testclient/resource.h
new file mode 100644 (file)
index 0000000..84edc7f
Binary files /dev/null and b/project/testclient/resource.h differ

diff --git a/project/testclient.rc b/project/testclient/testclient.rc
similarity index 70%
rename from project/testclient.rc
rename to project/testclient/testclient.rc
index acf44e0717bf1ce81fe02934fe0aa2c0142992ea..ae1bb7673c526c67a1a9c892f2e1d2c4061080ba 100644 (file)
Binary files a/project/testclient.rc and b/project/testclient/testclient.rc differ

diff --git a/project/testclient.vcxproj b/project/testclient/testclient.vcxproj
similarity index 93%
rename from project/testclient.vcxproj
rename to project/testclient/testclient.vcxproj
index 2a143ad905a934d0c1d5ede1c4d92430b318362d..9e910ac7dd123d1aee1a5be462a0fa01bdaef38b 100644 (file)
--- a/project/testclient.vcxproj
+++ b/project/testclient/testclient.vcxproj
@@ -90,7 +90,7 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <DisableSpecificWarnings>
       </DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>$(SolutiontDir)..\include;$(SolutionDir)..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutiontDir)..\..\include;$(SolutionDir)..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -109,7 +109,7 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <DisableSpecificWarnings>
       </DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>$(SolutiontDir)..\include;$(SolutionDir)..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutiontDir)..\..\include;$(SolutionDir)..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -170,13 +170,13 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\include\cec.h" />
-    <ClInclude Include="..\include\cecloader.h" />
+    <ClInclude Include="..\..\include\cec.h" />
+    <ClInclude Include="..\..\include\cecloader.h" />
     <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\lib\platform\windows\os-threads.cpp" />
-    <ClCompile Include="..\src\testclient\main.cpp" />
+    <ClCompile Include="..\..\src\lib\platform\windows\os-threads.cpp" />
+    <ClCompile Include="..\..\src\testclient\main.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="testclient.rc" />

diff --git a/project/testclient.vcxproj.filters b/project/testclient/testclient.vcxproj.filters
similarity index 75%
rename from project/testclient.vcxproj.filters
rename to project/testclient/testclient.vcxproj.filters
index d1cdfdafb77c975c021f251473b2ef049d67c922..dc4300d999ab3bb295e4a3188974d53488aa7ff2 100644 (file)
--- a/project/testclient.vcxproj.filters
+++ b/project/testclient/testclient.vcxproj.filters
@@ -9,17 +9,17 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\include\cec.h">
+    <ClInclude Include="..\..\include\cec.h">
       <Filter>exports</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\cecloader.h">
+    <ClInclude Include="..\..\include\cecloader.h">
       <Filter>exports</Filter>
     </ClInclude>
     <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\testclient\main.cpp" />
-    <ClCompile Include="..\src\lib\platform\windows\os-threads.cpp">
+    <ClCompile Include="..\..\src\testclient\main.cpp" />
+    <ClCompile Include="..\..\src\lib\platform\windows\os-threads.cpp">
       <Filter>platform</Filter>
     </ClCompile>
   </ItemGroup>

diff --git a/src/CecSharpTester/CecSharpTester.csproj b/src/CecSharpTester/CecSharpTester.csproj
index 9ac4261d6376ba872c417c49d839dbd57c08ab3a..158f9d55fc39b6dac56f75bd9494b36e3768aeb8 100644 (file)
--- a/src/CecSharpTester/CecSharpTester.csproj
+++ b/src/CecSharpTester/CecSharpTester.csproj
@@ -60,7 +60,7 @@
     <Compile Include="CecSharpClient.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\project\LibCecSharp.vcxproj">
+    <ProjectReference Include="..\..\project\LibCecSharp\LibCecSharp.vcxproj">
       <Project>{E54D4581-CD59-4687-BB10-694B8192EABA}</Project>
       <Name>LibCecSharp</Name>
     </ProjectReference>

diff --git a/src/LibCecSharp/resource.h b/src/LibCecSharp/resource.h
deleted file mode 100644 (file)
index d5ac7c4..0000000
--- a/src/LibCecSharp/resource.h
+++ /dev/null
@@ -1,3 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by app.rc

diff --git a/src/LibCecTray/LibCECTray.csproj b/src/LibCecTray/LibCECTray.csproj
index a91e11ccf7fb1803b32e3da0b456a71e7af58c7f..bfa1d9f81533752c5af000eab71e1b47979775bd 100644 (file)
--- a/src/LibCecTray/LibCECTray.csproj
+++ b/src/LibCecTray/LibCECTray.csproj
@@ -222,7 +222,7 @@
     <Content Include="project\favicon.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\project\LibCecSharp.vcxproj">
+    <ProjectReference Include="..\..\project\LibCecSharp\LibCecSharp.vcxproj">
       <Project>{E54D4581-CD59-4687-BB10-694B8192EABA}</Project>
       <Name>LibCecSharp</Name>
     </ProjectReference>