From e81699ac25f4ca8295be3202a54e70a920ef813a Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Sat, 6 Apr 2013 15:08:11 +0200 Subject: [PATCH] windows: moved project files into separate directories, cleaned up project files, updated README --- .gitignore | 11 +- README | 10 +- project/{ => LibCecSharp}/LibCecSharp.rc | Bin 4592 -> 5148 bytes project/{ => LibCecSharp}/LibCecSharp.vcxproj | 13 +- .../LibCecSharp.vcxproj.filters | 15 +- project/LibCecSharp/resource.h | Bin 0 -> 820 bytes project/libcec.filters | 63 ------- project/libcec.sln | 6 +- project/{ => libcec}/libcec.rc | Bin 3946 -> 5170 bytes project/{ => libcec}/libcec.vcxproj | 162 +++++++++--------- project/{ => libcec}/libcec.vcxproj.filters | 162 +++++++++--------- project/libcec/resource.h | Bin 0 -> 810 bytes project/resource.h | 14 -- project/testclient/resource.h | Bin 0 -> 810 bytes project/{ => testclient}/testclient.rc | Bin 3980 -> 5204 bytes project/{ => testclient}/testclient.vcxproj | 12 +- .../testclient.vcxproj.filters | 8 +- src/CecSharpTester/CecSharpTester.csproj | 2 +- src/LibCecSharp/resource.h | 3 - src/LibCecTray/LibCECTray.csproj | 2 +- 20 files changed, 206 insertions(+), 277 deletions(-) rename project/{ => LibCecSharp}/LibCecSharp.rc (81%) rename project/{ => LibCecSharp}/LibCecSharp.vcxproj (96%) rename project/{ => LibCecSharp}/LibCecSharp.vcxproj.filters (70%) create mode 100644 project/LibCecSharp/resource.h delete mode 100644 project/libcec.filters rename project/{ => libcec}/libcec.rc (70%) rename project/{ => libcec}/libcec.vcxproj (64%) rename project/{ => libcec}/libcec.vcxproj.filters (51%) create mode 100644 project/libcec/resource.h delete mode 100644 project/resource.h create mode 100644 project/testclient/resource.h rename project/{ => testclient}/testclient.rc (70%) rename project/{ => testclient}/testclient.vcxproj (93%) rename project/{ => testclient}/testclient.vcxproj.filters (75%) delete mode 100644 src/LibCecSharp/resource.h diff --git a/.gitignore b/.gitignore index 5e775cc..6336858 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 dc19737..3f2ee22 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 7c69374bc7e911b5ff9ae5da9cf1b2451e7d0b72..a5f6f8cbb2cc107322347e43a59e0a041f98e65e 100644 GIT binary patch delta 248 zcmeyMJV#^0I%Zx!hE#@9h7yJ%hD3&($$$AIC%<9NVRmH*ogB@gtnbGFWHE#=1Ti== z_%P@&C@=&A`A$H#BZD7L{c%Ck$Lsx9!9RsOdL0uxHB1Y88U%Jr!u5$zRxAg zIJtnAZ89IP$z%hbC=|(l9#19=hwPus#k@q)l_8HIogoKkPBB9U(0UD^^?E=@=uN)J f+{*3>v_6zUbMsP`wM>(j2}7Br@bNq%agSXim20k(_*u zH;dJe!H2 - - + + - - - - - + + + + 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 b669706..c879eb2 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 0000000000000000000000000000000000000000..69b5323749b0364653f8a26ad9256c724be821c8 GIT binary patch literal 820 zcmb7?-Acni5QWdR;5#gMDHsdBKumj4Oj2n~(W_wFL@T9{{P=_T>gu-}i`9!@8MZq! zojGUbY(76cd3wWQO_XVQ-x_ zK*yNTopNnB75RpHNp3}EK~+nX6BlIGcqcmyDOg?gT(8uG)XYK6=}dGFTBS!iD&p;2 z_TKu24RXD>$t+7jM+=Lc^vTWGlC2$k35s!3K697wJUE_)|9|kTcf=Hho4TOVN2x?t zO3`ZU)EmP(!@EGUq3i8BHa$I4YJI9F^oF|O4HAAMos$XiJKk;wtDIFV`{vH*8R?oC zGFhC2o)j;@&zQsqA;mX;Y@kyO{*4@f8eu+c!(LpYGmx$AhaR)R)a~0hwE=ZM>`qDh V7X7$ZpIuGtH@kFi-KqaO{sNYbb(H`B literal 0 HcmV?d00001 diff --git a/project/libcec.filters b/project/libcec.filters deleted file mode 100644 index efb6144..0000000 --- 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 d0aafd8..ea52210 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 2fe223a34754134a8b30d39b8ded603153a02f00..f73618f9a602f4436b2b446451ab48dd76223261 100644 GIT binary patch delta 689 zcmcIh%}N4c6g|zPsiOwbqFm%iK@;T9)T*VGxe*h8phaMjnt~aafkfc8b$1^@&@QNa zgXlGS0ax_~oiQCFkZ2K?;hs5j&wSsxr?>EIJbF}FQf?&Uob2dGql|O3(8M9?(Amp4 z!zsBYj{4XK53FYqHB>keLWz8ZZw>Ym48*a6Jrt2e0y*rWK(s|%#5Pi_6{;>-`cGxY zmgb4FNK%rfut14*WQuH>Y=J#VUbmUyT%M{p*;Rhaac*<$#Lz|*qmr0%%{^Q>O#UDy zZ_e-+>P}BBD_RXFG}*FD%7+$~s{2JX5s@d?yky)id3X6`-*YRoS|IpsmN!{L3??f) zK_-767#RcXPN)xx)E$B7AMb0qRhd@T^ld1gq@jMS delta 128 zcmdm_@k(w37xU&cz9meP*_fA2c3^E`HDJ(TFr0jnRTskA{F_ysiM50wg+Xt!BB$=; zD2_uw2|b_^Mb5M0MhpfFhCryx0AU$1C;-_Clj}Jo*?kxgx{|%9UTAw 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 b2af3ea..b8db0b1 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 1b1cb37..b9e41ed 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 0000000000000000000000000000000000000000..84edc7f7a649e894fda759475a1b8efac9045483 GIT binary patch literal 810 zcmb7?-Acni5QWdR;5!7o6dDV@KumiPY*T4W(W}s=iBv)ZP2vyYtE=DcimhG*%dpMN z^vs#FC;9yFY zQ0IiF2Nl|KcJy1GYkC_xIjD}Rpf2fDWP^hZDO?V{(kqw>%!;XkGk`7s!5US2Wif~s ztH*GcZ0(pe`kt(^j&5Uj*06Y1+cVD^_D9R!^8cRCWM}Lyt=1A`fIo?DmEurjJ&SN_ zL3WK(BRlIRwmma*umR{9vlHFpe8TTkS9B)iZm+w8@yqy>eeceg8S4%WnG8?DOiC7# zXDA6^NXflFG1P^I|7H$hof3il7W#NSUBYbQIQEzu% literal 0 HcmV?d00001 diff --git a/project/resource.h b/project/resource.h deleted file mode 100644 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 index 0000000000000000000000000000000000000000..84edc7f7a649e894fda759475a1b8efac9045483 GIT binary patch literal 810 zcmb7?-Acni5QWdR;5!7o6dDV@KumiPY*T4W(W}s=iBv)ZP2vyYtE=DcimhG*%dpMN z^vs#FC;9yFY zQ0IiF2Nl|KcJy1GYkC_xIjD}Rpf2fDWP^hZDO?V{(kqw>%!;XkGk`7s!5US2Wif~s ztH*GcZ0(pe`kt(^j&5Uj*06Y1+cVD^_D9R!^8cRCWM}Lyt=1A`fIo?DmEurjJ&SN_ zL3WK(BRlIRwmma*umR{9vlHFpe8TTkS9B)iZm+w8@yqy>eeceg8S4%WnG8?DOiC7# zXDA6^NXflFG1P^I|7H$hof3il7W#NSUBYbQIQEzu% literal 0 HcmV?d00001 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 GIT binary patch delta 684 zcmcIhO-lk%6g|F4%TWnhSp<$0G(mn9E!t&eZp6Y5XeX6g17=~i3*5Gd7TukTHbJ|f znAWZO13}yVOJ__+2qap>Ww>X~oHOs;d#)oN=98|;yt=M5fsoNN-7>tp?uq3H&xrZxnia$uo zr!V%6?8)&36|iu^A=}Q7^6p=iGyjX0LR_9Fre$4!l^cIJnxn#1@ea#KBE^dJ(F&b0 z`yiluTx&NtCEehgG`->IuiKZ1x|dn?&`&GFogXnLiy0mBIFlpCIe5Ics3`XIhOx*~QSB`T`~xd#3;Z delta 141 zcmcbj(IdZsi+OVg-x8+D8N!Pu+pu=98ZhWE7*0OPstaLl{>`e+#9G3T!k{;KKD+p2 z2QIP6A2>KBCvj{6D$oNeg^7A_t`Ie1FkmnQLR|(3%ZNdNL3i?7PFaKrn;p0m7?HHr Ma9`W3CZxv%0AE@o2><{9 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 2a143ad..9e910ac 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 75% rename from project/testclient.vcxproj.filters rename to project/testclient/testclient.vcxproj.filters index d1cdfda..dc4300d 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 9ac4261..158f9d5 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 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 a91e11c..bfa1d9f 100644 --- a/src/LibCecTray/LibCECTray.csproj +++ b/src/LibCecTray/LibCECTray.csproj @@ -222,7 +222,7 @@ - + {E54D4581-CD59-4687-BB10-694B8192EABA} LibCecSharp -- 2.34.1