diff --git a/.gitignore b/.gitignore index 5e775ccb..63368589 100644 --- 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 dc19737a..3f2ee221 100644 --- 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 7c69374b..a5f6f8cb 100644 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 96ffaed3..b909be65 100644 --- a/project/LibCecSharp.vcxproj +++ b/project/LibCecSharp/LibCecSharp.vcxproj @@ -189,15 +189,14 @@ - - + + - - - - - + + + + diff --git a/project/LibCecSharp.vcxproj.filters b/project/LibCecSharp/LibCecSharp.vcxproj.filters similarity index 71% rename from project/LibCecSharp.vcxproj.filters rename to project/LibCecSharp/LibCecSharp.vcxproj.filters index b6697069..c879eb29 100644 --- a/project/LibCecSharp.vcxproj.filters +++ b/project/LibCecSharp/LibCecSharp.vcxproj.filters @@ -11,27 +11,24 @@ - + Source Files - + Source Files - + Header Files - + Header Files - + Header Files - - Header Files - - + Header Files diff --git a/project/LibCecSharp/resource.h b/project/LibCecSharp/resource.h new file mode 100644 index 00000000..69b53237 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 index efb61443..00000000 --- a/project/libcec.filters +++ /dev/null @@ -1,63 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/project/libcec.sln b/project/libcec.sln index d0aafd8a..ea522104 100644 --- 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 2fe223a3..f73618f9 100644 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 b2af3eaf..b8db0b13 100644 --- a/project/libcec.vcxproj +++ b/project/libcec/libcec.vcxproj @@ -19,89 +19,89 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 1b1cb372..b9e41ed1 100644 --- a/project/libcec.vcxproj.filters +++ b/project/libcec/libcec.vcxproj.filters @@ -39,227 +39,227 @@ - - - + + + exports - + exports - + exports - + exports - + implementations - + implementations - + implementations - + devices - + implementations - + devices - + devices - + devices - + devices - + devices - + platform - + platform\sockets - + platform\sockets - + platform\sockets - + platform\util - + platform\util - + platform\util - + platform\util - + platform\threads - + platform\threads - + platform\windows - + platform\windows - + platform\windows - + platform\windows - + implementations - + implementations - - - + + + devices - - + + platform\util - + platform\adl - + platform\adl - + platform\adl - + platform\adl - + platform\windows - + platform\nvidia - + adapter - + adapter\Pulse-Eight - + adapter\Pulse-Eight - + adapter\Pulse-Eight - + adapter\Pulse-Eight - + adapter\Pulse-Eight - + adapter - + - - - - - + + + + + implementations - + implementations - + implementations - + devices - + implementations - + devices - + devices - + devices - + devices - + devices - + platform\windows - + platform\windows - + implementations - + implementations - - + + devices - + platform\windows - + platform\adl - + platform\windows - + platform\nvidia - + adapter\Pulse-Eight - + adapter\Pulse-Eight - + adapter\Pulse-Eight - + adapter\Pulse-Eight - + adapter\Pulse-Eight - + adapter diff --git a/project/libcec/resource.h b/project/libcec/resource.h new file mode 100644 index 00000000..84edc7f7 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 index 33017f8e..00000000 --- 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 index 00000000..84edc7f7 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 acf44e07..ae1bb767 100644 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 94% rename from project/testclient.vcxproj rename to project/testclient/testclient.vcxproj index 2a143ad9..9e910ac7 100644 --- a/project/testclient.vcxproj +++ b/project/testclient/testclient.vcxproj @@ -90,7 +90,7 @@ true - $(SolutiontDir)..\include;$(SolutionDir)..\src;%(AdditionalIncludeDirectories) + $(SolutiontDir)..\..\include;$(SolutionDir)..\src;%(AdditionalIncludeDirectories) Console @@ -109,7 +109,7 @@ true - $(SolutiontDir)..\include;$(SolutionDir)..\src;%(AdditionalIncludeDirectories) + $(SolutiontDir)..\..\include;$(SolutionDir)..\src;%(AdditionalIncludeDirectories) Console @@ -170,13 +170,13 @@ - - + + - - + + diff --git a/project/testclient.vcxproj.filters b/project/testclient/testclient.vcxproj.filters similarity index 76% rename from project/testclient.vcxproj.filters rename to project/testclient/testclient.vcxproj.filters index d1cdfdaf..dc4300d9 100644 --- a/project/testclient.vcxproj.filters +++ b/project/testclient/testclient.vcxproj.filters @@ -9,17 +9,17 @@ - + exports - + exports - - + + platform diff --git a/src/CecSharpTester/CecSharpTester.csproj b/src/CecSharpTester/CecSharpTester.csproj index 9ac4261d..158f9d55 100644 --- a/src/CecSharpTester/CecSharpTester.csproj +++ b/src/CecSharpTester/CecSharpTester.csproj @@ -60,7 +60,7 @@ - + {E54D4581-CD59-4687-BB10-694B8192EABA} LibCecSharp diff --git a/src/LibCecSharp/resource.h b/src/LibCecSharp/resource.h deleted file mode 100644 index d5ac7c42..00000000 --- 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 a91e11cc..bfa1d9f8 100644 --- a/src/LibCecTray/LibCECTray.csproj +++ b/src/LibCecTray/LibCECTray.csproj @@ -222,7 +222,7 @@ - + {E54D4581-CD59-4687-BB10-694B8192EABA} LibCecSharp