Skip to content

Commit e81699a

Browse files
opdenkampopdenkamp
committed
windows: moved project files into separate directories, cleaned up project files, updated README
1 parent b419626 commit e81699a

20 files changed

+206
-277
lines changed

Diff for: ‎.gitignore

+10-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
*.pdb
1515
*.suo
1616
*.user
17+
*.aps
1718

1819
*~
1920

@@ -63,8 +64,16 @@ project/libcec.sdf
6364
project/obj
6465
project/Properties
6566
project/_*
66-
6767
project/x64
68+
project/LibCecSharp/x64
69+
project/LibCecSharp/Debug
70+
project/LibCecSharp/Release
71+
project/libcec/x64
72+
project/libcec/Debug
73+
project/libcec/Release
74+
project/testclient/x64
75+
project/testclient/Debug
76+
project/testclient/Release
6877

6978
project/RPi/toolchain
7079
project/RPi/firmware

Diff for: ‎README

+7-3
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,13 @@ To compile, execute the following command:
5252
=== Windows ===
5353
===============================================================================
5454

55-
To compile libCEC on Windows, you'll need both Visual Studio 2008 and 2012.
56-
The installer needs the Windows DDK (Driver Development Kit) and Nullsoft's
57-
NSIS.
55+
To compile libCEC on Windows, you'll need Visual Studio 2012 and Visual Studio
56+
or Visual C++ 2008. The latter is needed to build LibCecSharp for .Net
57+
Framework 2.0.
58+
59+
The adapter detection code needs the Windows DDK (Driver Development Kit).
60+
61+
To create an installer, you'll need Nullsoft's NSIS.
5862

5963
To compile libCEC, follow these instructions:
6064
* open /project/libcec.sln with Visual Studio 2012.

Diff for: ‎project/LibCecSharp.rc renamed to ‎project/LibCecSharp/LibCecSharp.rc

4.48 KB
Binary file not shown.

Diff for: ‎project/LibCecSharp.vcxproj renamed to ‎project/LibCecSharp/LibCecSharp.vcxproj

+6-7
Original file line numberDiff line numberDiff line change
@@ -189,15 +189,14 @@
189189
</Reference>
190190
</ItemGroup>
191191
<ItemGroup>
192-
<ClCompile Include="..\src\LibCecSharp\AssemblyInfo.cpp" />
193-
<ClCompile Include="..\src\LibCecSharp\LibCecSharp.cpp" />
192+
<ClCompile Include="..\..\src\LibCecSharp\AssemblyInfo.cpp" />
193+
<ClCompile Include="..\..\src\LibCecSharp\LibCecSharp.cpp" />
194194
</ItemGroup>
195195
<ItemGroup>
196-
<ClInclude Include="..\include\cec.h" />
197-
<ClInclude Include="..\src\LibCecSharp\CecSharpTypes.h" />
198-
<ClInclude Include="..\include\cectypes.h" />
199-
<ClInclude Include="..\src\LibCecSharp\resource.h" />
200-
<ClInclude Include="..\src\lib\platform\windows\stdint.h" />
196+
<ClInclude Include="..\..\include\cec.h" />
197+
<ClInclude Include="..\..\src\LibCecSharp\CecSharpTypes.h" />
198+
<ClInclude Include="..\..\include\cectypes.h" />
199+
<ClInclude Include="..\..\src\lib\platform\windows\stdint.h" />
201200
<ClInclude Include="resource.h" />
202201
</ItemGroup>
203202
<ItemGroup>

Diff for: ‎project/LibCecSharp.vcxproj.filters renamed to ‎project/LibCecSharp/LibCecSharp.vcxproj.filters

+6-9
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,24 @@
1111
</Filter>
1212
</ItemGroup>
1313
<ItemGroup>
14-
<ClCompile Include="..\src\LibCecSharp\AssemblyInfo.cpp">
14+
<ClCompile Include="..\..\src\LibCecSharp\AssemblyInfo.cpp">
1515
<Filter>Source Files</Filter>
1616
</ClCompile>
17-
<ClCompile Include="..\src\LibCecSharp\LibCecSharp.cpp">
17+
<ClCompile Include="..\..\src\LibCecSharp\LibCecSharp.cpp">
1818
<Filter>Source Files</Filter>
1919
</ClCompile>
2020
</ItemGroup>
2121
<ItemGroup>
22-
<ClInclude Include="..\include\cec.h">
22+
<ClInclude Include="..\..\include\cec.h">
2323
<Filter>Header Files</Filter>
2424
</ClInclude>
25-
<ClInclude Include="..\src\LibCecSharp\CecSharpTypes.h">
25+
<ClInclude Include="..\..\src\LibCecSharp\CecSharpTypes.h">
2626
<Filter>Header Files</Filter>
2727
</ClInclude>
28-
<ClInclude Include="..\include\cectypes.h">
28+
<ClInclude Include="..\..\include\cectypes.h">
2929
<Filter>Header Files</Filter>
3030
</ClInclude>
31-
<ClInclude Include="..\src\LibCecSharp\resource.h">
32-
<Filter>Header Files</Filter>
33-
</ClInclude>
34-
<ClInclude Include="..\src\lib\platform\windows\stdint.h">
31+
<ClInclude Include="..\..\src\lib\platform\windows\stdint.h">
3532
<Filter>Header Files</Filter>
3633
</ClInclude>
3734
<ClInclude Include="resource.h">

Diff for: ‎project/LibCecSharp/resource.h

820 Bytes
Binary file not shown.

Diff for: ‎project/libcec.filters

-63
This file was deleted.

Diff for: ‎project/libcec.sln

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 2012
4-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcec", "libcec.vcxproj", "{C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}"
4+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcec", "libcec\libcec.vcxproj", "{C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}"
55
EndProject
6-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testclient", "testclient.vcxproj", "{F01222BF-6B3D-43BD-B254-434031CB9887}"
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testclient", "testclient\testclient.vcxproj", "{F01222BF-6B3D-43BD-B254-434031CB9887}"
77
ProjectSection(ProjectDependencies) = postProject
88
{C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0} = {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}
99
EndProjectSection
1010
EndProject
11-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibCecSharp", "LibCecSharp.vcxproj", "{E54D4581-CD59-4687-BB10-694B8192EABA}"
11+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibCecSharp", "LibCecSharp\LibCecSharp.vcxproj", "{E54D4581-CD59-4687-BB10-694B8192EABA}"
1212
ProjectSection(ProjectDependencies) = postProject
1313
{C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0} = {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}
1414
EndProjectSection

Diff for: ‎project/libcec.rc renamed to ‎project/libcec/libcec.rc

3.85 KB
Binary file not shown.

Diff for: ‎project/libcec.vcxproj renamed to ‎project/libcec/libcec.vcxproj

+81-81
Original file line numberDiff line numberDiff line change
@@ -19,89 +19,89 @@
1919
</ProjectConfiguration>
2020
</ItemGroup>
2121
<ItemGroup>
22-
<ClInclude Include="..\include\cec.h" />
23-
<ClInclude Include="..\include\cecc.h" />
24-
<ClInclude Include="..\include\cecloader.h" />
25-
<ClInclude Include="..\include\cectypes.h" />
26-
<ClInclude Include="..\src\lib\adapter\AdapterCommunication.h" />
27-
<ClInclude Include="..\src\lib\adapter\AdapterFactory.h" />
28-
<ClInclude Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommands.h" />
29-
<ClInclude Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommunication.h" />
30-
<ClInclude Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterDetection.h" />
31-
<ClInclude Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessage.h" />
32-
<ClInclude Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessageQueue.h" />
33-
<ClInclude Include="..\src\lib\CECClient.h" />
34-
<ClInclude Include="..\src\lib\CECInputBuffer.h" />
35-
<ClInclude Include="..\src\lib\CECProcessor.h" />
36-
<ClInclude Include="..\src\lib\CECTypeUtils.h" />
37-
<ClInclude Include="..\src\lib\devices\CECAudioSystem.h" />
38-
<ClInclude Include="..\src\lib\devices\CECBusDevice.h" />
39-
<ClInclude Include="..\src\lib\devices\CECDeviceMap.h" />
40-
<ClInclude Include="..\src\lib\devices\CECPlaybackDevice.h" />
41-
<ClInclude Include="..\src\lib\devices\CECRecordingDevice.h" />
42-
<ClInclude Include="..\src\lib\devices\CECTuner.h" />
43-
<ClInclude Include="..\src\lib\devices\CECTV.h" />
44-
<ClInclude Include="..\src\lib\implementations\ANCommandHandler.h" />
45-
<ClInclude Include="..\src\lib\implementations\CECCommandHandler.h" />
46-
<ClInclude Include="..\src\lib\implementations\PHCommandHandler.h" />
47-
<ClInclude Include="..\src\lib\implementations\RLCommandHandler.h" />
48-
<ClInclude Include="..\src\lib\implementations\SLCommandHandler.h" />
49-
<ClInclude Include="..\src\lib\implementations\VLCommandHandler.h" />
50-
<ClInclude Include="..\src\lib\LibCEC.h" />
51-
<ClInclude Include="..\src\lib\platform\adl\adl-edid.h" />
52-
<ClInclude Include="..\src\lib\platform\adl\adl_defines.h" />
53-
<ClInclude Include="..\src\lib\platform\adl\adl_sdk.h" />
54-
<ClInclude Include="..\src\lib\platform\adl\adl_structures.h" />
55-
<ClInclude Include="..\src\lib\platform\nvidia\nv-edid.h" />
56-
<ClInclude Include="..\src\lib\platform\os.h" />
57-
<ClInclude Include="..\src\lib\platform\sockets\serialport.h" />
58-
<ClInclude Include="..\src\lib\platform\sockets\socket.h" />
59-
<ClInclude Include="..\src\lib\platform\sockets\tcp.h" />
60-
<ClInclude Include="..\src\lib\platform\threads\mutex.h" />
61-
<ClInclude Include="..\src\lib\platform\threads\threads.h" />
62-
<ClInclude Include="..\src\lib\platform\util\baudrate.h" />
63-
<ClInclude Include="..\src\lib\platform\util\buffer.h" />
64-
<ClInclude Include="..\src\lib\platform\util\edid.h" />
65-
<ClInclude Include="..\src\lib\platform\util\StdString.h" />
66-
<ClInclude Include="..\src\lib\platform\util\timeutils.h" />
67-
<ClInclude Include="..\src\lib\platform\windows\dlfcn-win32.h" />
68-
<ClInclude Include="..\src\lib\platform\windows\os-socket.h" />
69-
<ClInclude Include="..\src\lib\platform\windows\os-threads.h" />
70-
<ClInclude Include="..\src\lib\platform\windows\os-types.h" />
71-
<ClInclude Include="..\src\lib\platform\windows\stdint.h" />
72-
<ClInclude Include="resource1.h" />
22+
<ClInclude Include="..\..\include\cec.h" />
23+
<ClInclude Include="..\..\include\cecc.h" />
24+
<ClInclude Include="..\..\include\cecloader.h" />
25+
<ClInclude Include="..\..\include\cectypes.h" />
26+
<ClInclude Include="..\..\src\lib\adapter\AdapterCommunication.h" />
27+
<ClInclude Include="..\..\src\lib\adapter\AdapterFactory.h" />
28+
<ClInclude Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommands.h" />
29+
<ClInclude Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommunication.h" />
30+
<ClInclude Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterDetection.h" />
31+
<ClInclude Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessage.h" />
32+
<ClInclude Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessageQueue.h" />
33+
<ClInclude Include="..\..\src\lib\CECClient.h" />
34+
<ClInclude Include="..\..\src\lib\CECInputBuffer.h" />
35+
<ClInclude Include="..\..\src\lib\CECProcessor.h" />
36+
<ClInclude Include="..\..\src\lib\CECTypeUtils.h" />
37+
<ClInclude Include="..\..\src\lib\devices\CECAudioSystem.h" />
38+
<ClInclude Include="..\..\src\lib\devices\CECBusDevice.h" />
39+
<ClInclude Include="..\..\src\lib\devices\CECDeviceMap.h" />
40+
<ClInclude Include="..\..\src\lib\devices\CECPlaybackDevice.h" />
41+
<ClInclude Include="..\..\src\lib\devices\CECRecordingDevice.h" />
42+
<ClInclude Include="..\..\src\lib\devices\CECTuner.h" />
43+
<ClInclude Include="..\..\src\lib\devices\CECTV.h" />
44+
<ClInclude Include="..\..\src\lib\implementations\ANCommandHandler.h" />
45+
<ClInclude Include="..\..\src\lib\implementations\CECCommandHandler.h" />
46+
<ClInclude Include="..\..\src\lib\implementations\PHCommandHandler.h" />
47+
<ClInclude Include="..\..\src\lib\implementations\RLCommandHandler.h" />
48+
<ClInclude Include="..\..\src\lib\implementations\SLCommandHandler.h" />
49+
<ClInclude Include="..\..\src\lib\implementations\VLCommandHandler.h" />
50+
<ClInclude Include="..\..\src\lib\LibCEC.h" />
51+
<ClInclude Include="..\..\src\lib\platform\adl\adl-edid.h" />
52+
<ClInclude Include="..\..\src\lib\platform\adl\adl_defines.h" />
53+
<ClInclude Include="..\..\src\lib\platform\adl\adl_sdk.h" />
54+
<ClInclude Include="..\..\src\lib\platform\adl\adl_structures.h" />
55+
<ClInclude Include="..\..\src\lib\platform\nvidia\nv-edid.h" />
56+
<ClInclude Include="..\..\src\lib\platform\os.h" />
57+
<ClInclude Include="..\..\src\lib\platform\sockets\serialport.h" />
58+
<ClInclude Include="..\..\src\lib\platform\sockets\socket.h" />
59+
<ClInclude Include="..\..\src\lib\platform\sockets\tcp.h" />
60+
<ClInclude Include="..\..\src\lib\platform\threads\mutex.h" />
61+
<ClInclude Include="..\..\src\lib\platform\threads\threads.h" />
62+
<ClInclude Include="..\..\src\lib\platform\util\baudrate.h" />
63+
<ClInclude Include="..\..\src\lib\platform\util\buffer.h" />
64+
<ClInclude Include="..\..\src\lib\platform\util\edid.h" />
65+
<ClInclude Include="..\..\src\lib\platform\util\StdString.h" />
66+
<ClInclude Include="..\..\src\lib\platform\util\timeutils.h" />
67+
<ClInclude Include="..\..\src\lib\platform\windows\dlfcn-win32.h" />
68+
<ClInclude Include="..\..\src\lib\platform\windows\os-socket.h" />
69+
<ClInclude Include="..\..\src\lib\platform\windows\os-threads.h" />
70+
<ClInclude Include="..\..\src\lib\platform\windows\os-types.h" />
71+
<ClInclude Include="..\..\src\lib\platform\windows\stdint.h" />
72+
<ClInclude Include="resource.h" />
7373
</ItemGroup>
7474
<ItemGroup>
75-
<ClCompile Include="..\src\lib\adapter\AdapterFactory.cpp" />
76-
<ClCompile Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommands.cpp" />
77-
<ClCompile Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommunication.cpp" />
78-
<ClCompile Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterDetection.cpp" />
79-
<ClCompile Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessage.cpp" />
80-
<ClCompile Include="..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessageQueue.cpp" />
81-
<ClCompile Include="..\src\lib\CECClient.cpp" />
82-
<ClCompile Include="..\src\lib\CECProcessor.cpp" />
83-
<ClCompile Include="..\src\lib\devices\CECAudioSystem.cpp" />
84-
<ClCompile Include="..\src\lib\devices\CECBusDevice.cpp" />
85-
<ClCompile Include="..\src\lib\devices\CECDeviceMap.cpp" />
86-
<ClCompile Include="..\src\lib\devices\CECPlaybackDevice.cpp" />
87-
<ClCompile Include="..\src\lib\devices\CECRecordingDevice.cpp" />
88-
<ClCompile Include="..\src\lib\devices\CECTuner.cpp" />
89-
<ClCompile Include="..\src\lib\devices\CECTV.cpp" />
90-
<ClCompile Include="..\src\lib\implementations\ANCommandHandler.cpp" />
91-
<ClCompile Include="..\src\lib\implementations\CECCommandHandler.cpp" />
92-
<ClCompile Include="..\src\lib\implementations\PHCommandHandler.cpp" />
93-
<ClCompile Include="..\src\lib\implementations\RLCommandHandler.cpp" />
94-
<ClCompile Include="..\src\lib\implementations\SLCommandHandler.cpp" />
95-
<ClCompile Include="..\src\lib\implementations\VLCommandHandler.cpp" />
96-
<ClCompile Include="..\src\lib\LibCEC.cpp" />
97-
<ClCompile Include="..\src\lib\LibCECC.cpp" />
98-
<ClCompile Include="..\src\lib\LibCECDll.cpp" />
99-
<ClCompile Include="..\src\lib\platform\adl\adl-edid.cpp" />
100-
<ClCompile Include="..\src\lib\platform\nvidia\nv-edid.cpp" />
101-
<ClCompile Include="..\src\lib\platform\windows\dlfcn-win32.cpp" />
102-
<ClCompile Include="..\src\lib\platform\windows\os-edid.cpp" />
103-
<ClCompile Include="..\src\lib\platform\windows\os-threads.cpp" />
104-
<ClCompile Include="..\src\lib\platform\windows\serialport.cpp" />
75+
<ClCompile Include="..\..\src\lib\adapter\AdapterFactory.cpp" />
76+
<ClCompile Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommands.cpp" />
77+
<ClCompile Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterCommunication.cpp" />
78+
<ClCompile Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterDetection.cpp" />
79+
<ClCompile Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessage.cpp" />
80+
<ClCompile Include="..\..\src\lib\adapter\Pulse-Eight\USBCECAdapterMessageQueue.cpp" />
81+
<ClCompile Include="..\..\src\lib\CECClient.cpp" />
82+
<ClCompile Include="..\..\src\lib\CECProcessor.cpp" />
83+
<ClCompile Include="..\..\src\lib\devices\CECAudioSystem.cpp" />
84+
<ClCompile Include="..\..\src\lib\devices\CECBusDevice.cpp" />
85+
<ClCompile Include="..\..\src\lib\devices\CECDeviceMap.cpp" />
86+
<ClCompile Include="..\..\src\lib\devices\CECPlaybackDevice.cpp" />
87+
<ClCompile Include="..\..\src\lib\devices\CECRecordingDevice.cpp" />
88+
<ClCompile Include="..\..\src\lib\devices\CECTuner.cpp" />
89+
<ClCompile Include="..\..\src\lib\devices\CECTV.cpp" />
90+
<ClCompile Include="..\..\src\lib\implementations\ANCommandHandler.cpp" />
91+
<ClCompile Include="..\..\src\lib\implementations\CECCommandHandler.cpp" />
92+
<ClCompile Include="..\..\src\lib\implementations\PHCommandHandler.cpp" />
93+
<ClCompile Include="..\..\src\lib\implementations\RLCommandHandler.cpp" />
94+
<ClCompile Include="..\..\src\lib\implementations\SLCommandHandler.cpp" />
95+
<ClCompile Include="..\..\src\lib\implementations\VLCommandHandler.cpp" />
96+
<ClCompile Include="..\..\src\lib\LibCEC.cpp" />
97+
<ClCompile Include="..\..\src\lib\LibCECC.cpp" />
98+
<ClCompile Include="..\..\src\lib\LibCECDll.cpp" />
99+
<ClCompile Include="..\..\src\lib\platform\adl\adl-edid.cpp" />
100+
<ClCompile Include="..\..\src\lib\platform\nvidia\nv-edid.cpp" />
101+
<ClCompile Include="..\..\src\lib\platform\windows\dlfcn-win32.cpp" />
102+
<ClCompile Include="..\..\src\lib\platform\windows\os-edid.cpp" />
103+
<ClCompile Include="..\..\src\lib\platform\windows\os-threads.cpp" />
104+
<ClCompile Include="..\..\src\lib\platform\windows\serialport.cpp" />
105105
</ItemGroup>
106106
<ItemGroup>
107107
<ResourceCompile Include="libcec.rc" />

0 commit comments

Comments
 (0)