From: Lars Op den Kamp Date: Fri, 15 Mar 2013 01:44:01 +0000 (+0100) Subject: converted to vs2012 X-Git-Tag: upstream/2.2.0~1^2~4^2~12 X-Git-Url: https://git.piment-noir.org/?p=deb_libcec.git;a=commitdiff_plain;h=58f3d0a97838820bb4d2b787cb717f6d8a8f55b8 converted to vs2012 --- diff --git a/README b/README index f25c539..dc19737 100644 --- a/README +++ b/README @@ -52,15 +52,12 @@ To compile, execute the following command: === Windows === =============================================================================== -To compile libCEC on Windows, you'll need Visual C++ 2010 or Visual Studio 2010 +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 LibCecSharp on Windows, you'll need Visual C++ 2008 or Visual Studio -2008, because it is compiled against .NET 2.0. - To compile libCEC, follow these instructions: -* open /project/libcec.sln with Visual C++ 2010 or Visual Studio 2010. +* open /project/libcec.sln with Visual Studio 2012. * build the project. To build an installer on Windows: @@ -68,12 +65,6 @@ To build an installer on Windows: * go to /project and execute create-installer.bat to create the installer. * the installer is stored as /build/libCEC-installer.exe -You will need both Visual Studio 2008 and Visual Studio 2010 to build the -installer from the command line. To build with Visual C++ 2008 and 2010, -you will need to manually build libcec with Visual C++ 2010 and then -build LibCecSharp.sln with Visual Studio 2008. See create-installer.bat -for the required steps. - =============================================================================== === Raspberry Pi === =============================================================================== diff --git a/project/LibCecSharp.sln b/project/LibCecSharp.sln deleted file mode 100644 index 7b9b1db..0000000 --- a/project/LibCecSharp.sln +++ /dev/null @@ -1,46 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CecSharpTester", "..\src\CecSharpTester\CecSharpTester.csproj", "{B6A7F3A9-F47C-41E5-9754-0BFF233B1172}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibCecSharp", "LibCecSharp.vcproj", "{E54D4581-CD59-4687-BB10-694B8192EABA}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibCECTray", "..\src\LibCecTray\LibCECTray.csproj", "{58C106FE-C159-46D3-97E1-73AB83232670}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Debug|x64.ActiveCfg = Debug|x64 - {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Debug|x64.Build.0 = Debug|x64 - {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Debug|x86.ActiveCfg = Debug|x86 - {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Debug|x86.Build.0 = Debug|x86 - {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Release|x64.ActiveCfg = Release|x64 - {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Release|x64.Build.0 = Release|x64 - {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Release|x86.ActiveCfg = Release|x86 - {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Release|x86.Build.0 = Release|x86 - {E54D4581-CD59-4687-BB10-694B8192EABA}.Debug|x64.ActiveCfg = Debug|x64 - {E54D4581-CD59-4687-BB10-694B8192EABA}.Debug|x64.Build.0 = Debug|x64 - {E54D4581-CD59-4687-BB10-694B8192EABA}.Debug|x86.ActiveCfg = Debug|Win32 - {E54D4581-CD59-4687-BB10-694B8192EABA}.Debug|x86.Build.0 = Debug|Win32 - {E54D4581-CD59-4687-BB10-694B8192EABA}.Release|x64.ActiveCfg = Release|x64 - {E54D4581-CD59-4687-BB10-694B8192EABA}.Release|x64.Build.0 = Release|x64 - {E54D4581-CD59-4687-BB10-694B8192EABA}.Release|x86.ActiveCfg = Release|Win32 - {E54D4581-CD59-4687-BB10-694B8192EABA}.Release|x86.Build.0 = Release|Win32 - {58C106FE-C159-46D3-97E1-73AB83232670}.Debug|x64.ActiveCfg = Debug|x64 - {58C106FE-C159-46D3-97E1-73AB83232670}.Debug|x64.Build.0 = Debug|x64 - {58C106FE-C159-46D3-97E1-73AB83232670}.Debug|x86.ActiveCfg = Debug|x86 - {58C106FE-C159-46D3-97E1-73AB83232670}.Debug|x86.Build.0 = Debug|x86 - {58C106FE-C159-46D3-97E1-73AB83232670}.Release|x64.ActiveCfg = Release|x64 - {58C106FE-C159-46D3-97E1-73AB83232670}.Release|x64.Build.0 = Release|x64 - {58C106FE-C159-46D3-97E1-73AB83232670}.Release|x86.ActiveCfg = Release|x86 - {58C106FE-C159-46D3-97E1-73AB83232670}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/project/LibCecSharp.vcxproj b/project/LibCecSharp.vcxproj new file mode 100644 index 0000000..5516b98 --- /dev/null +++ b/project/LibCecSharp.vcxproj @@ -0,0 +1,206 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {E54D4581-CD59-4687-BB10-694B8192EABA} + LibCecSharp + ManagedCProj + v2.0 + + + + DynamicLibrary + v90 + Unicode + true + true + + + DynamicLibrary + v90 + Unicode + true + + + DynamicLibrary + v90 + Unicode + true + true + + + DynamicLibrary + v90 + Unicode + true + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.50727.1 + + + $(SolutionDir)..;$(ReferencePath) + $(SolutionDir)..\build\ + $(Configuration)\ + + + $(SolutionDir)..;$(ReferencePath) + $(SolutionDir)..\build\x64\ + $(Platform)\$(Configuration)\ + true + + + $(SolutionDir)..;$(ReferencePath) + $(SolutionDir)..\build\ + $(Configuration)\ + false + + + $(SolutionDir)..;$(ReferencePath) + $(SolutionDir)..\build\x64\ + $(Platform)\$(Configuration)\ + + + + X64 + + + Disabled + $(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\lib\platform\windows;%(AdditionalIncludeDirectories) + _DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + + true + Level3 + true + ProgramDatabase + + + $(OutDir)libcec.lib;%(AdditionalDependencies) + true + true + MachineX86 + + + + + X64 + + + Disabled + $(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\lib\platform\windows;%(AdditionalIncludeDirectories) + _DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + + true + Level3 + true + ProgramDatabase + + + $(OutDir)libcec.lib;%(AdditionalDependencies) + "$(OutDir)$(ProjectName).dll" + true + true + MachineX64 + + + + + X64 + + + $(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\lib\platform\windows;%(AdditionalIncludeDirectories) + NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + + true + Level3 + true + ProgramDatabase + + + $(OutDir)libcec.lib;%(AdditionalDependencies) + true + MachineX86 + + + + + X64 + + + $(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\lib\platform\windows;%(AdditionalIncludeDirectories) + NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + + true + Level3 + true + ProgramDatabase + + + $(OutDir)libcec.lib;%(AdditionalDependencies) + + + + + true + true + + + true + true + + + true + true + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/project/LibCecSharp.vcxproj.filters b/project/LibCecSharp.vcxproj.filters new file mode 100644 index 0000000..8b00571 --- /dev/null +++ b/project/LibCecSharp.vcxproj.filters @@ -0,0 +1,38 @@ + + + + + {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 + + + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/project/libCEC.nsi b/project/libCEC.nsi index a7516d6..ee5a12e 100644 --- a/project/libCEC.nsi +++ b/project/libCEC.nsi @@ -160,8 +160,8 @@ Section "CEC Debug Client" SecCecClient CreateDirectory "$SMPROGRAMS\$StartMenuFolder" ${If} ${RunningX64} - CreateShortCut "$SMPROGRAMS\$StartMenuFolder\CEC Test client (x64).lnk" "$INSTDIR\x64\cec-client.x64.exe" \ - "" "$INSTDIR\cec-client.x64.exe" 0 SW_SHOWNORMAL \ + CreateShortCut "$SMPROGRAMS\$StartMenuFolder\CEC Test client (x64).lnk" "$INSTDIR\x64\cec-client.exe" \ + "" "$INSTDIR\x64\cec-client.exe" 0 SW_SHOWNORMAL \ "" "Start the CEC Test client (x64)." ${Else} CreateShortCut "$SMPROGRAMS\$StartMenuFolder\CEC Test client.lnk" "$INSTDIR\cec-client.exe" \ diff --git a/project/libcec.sln b/project/libcec.sln index 83d6d89..01073bf 100644 --- a/project/libcec.sln +++ b/project/libcec.sln @@ -1,6 +1,6 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +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}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testclient", "testclient.vcxproj", "{F01222BF-6B3D-43BD-B254-434031CB9887}" @@ -8,30 +8,68 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testclient", "testclient.vc {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}" + ProjectSection(ProjectDependencies) = postProject + {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0} = {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0} + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B119505D-5CD1-48E4-BED1-9C2BF26153D5}" + ProjectSection(SolutionItems) = preProject + ..\src\CecSharpTester\CecSharpTester.csproj = ..\src\CecSharpTester\CecSharpTester.csproj + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CecSharpTester", "..\src\CecSharpTester\CecSharpTester.csproj", "{B6A7F3A9-F47C-41E5-9754-0BFF233B1172}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibCECTray", "..\src\LibCecTray\LibCECTray.csproj", "{58C106FE-C159-46D3-97E1-73AB83232670}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 + Debug|x86 = Debug|x86 Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Debug|Win32.ActiveCfg = Debug|Win32 - {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Debug|Win32.Build.0 = Debug|Win32 {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Debug|x64.ActiveCfg = Debug|x64 {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Debug|x64.Build.0 = Debug|x64 - {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Release|Win32.ActiveCfg = Release|Win32 - {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Release|Win32.Build.0 = Release|Win32 + {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Debug|x86.ActiveCfg = Debug|Win32 + {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Debug|x86.Build.0 = Debug|Win32 {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Release|x64.ActiveCfg = Release|x64 {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Release|x64.Build.0 = Release|x64 - {F01222BF-6B3D-43BD-B254-434031CB9887}.Debug|Win32.ActiveCfg = Debug|Win32 - {F01222BF-6B3D-43BD-B254-434031CB9887}.Debug|Win32.Build.0 = Debug|Win32 + {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Release|x86.ActiveCfg = Release|Win32 + {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Release|x86.Build.0 = Release|Win32 {F01222BF-6B3D-43BD-B254-434031CB9887}.Debug|x64.ActiveCfg = Debug|x64 {F01222BF-6B3D-43BD-B254-434031CB9887}.Debug|x64.Build.0 = Debug|x64 - {F01222BF-6B3D-43BD-B254-434031CB9887}.Release|Win32.ActiveCfg = Release|Win32 - {F01222BF-6B3D-43BD-B254-434031CB9887}.Release|Win32.Build.0 = Release|Win32 + {F01222BF-6B3D-43BD-B254-434031CB9887}.Debug|x86.ActiveCfg = Debug|Win32 + {F01222BF-6B3D-43BD-B254-434031CB9887}.Debug|x86.Build.0 = Debug|Win32 {F01222BF-6B3D-43BD-B254-434031CB9887}.Release|x64.ActiveCfg = Release|x64 {F01222BF-6B3D-43BD-B254-434031CB9887}.Release|x64.Build.0 = Release|x64 + {F01222BF-6B3D-43BD-B254-434031CB9887}.Release|x86.ActiveCfg = Release|Win32 + {F01222BF-6B3D-43BD-B254-434031CB9887}.Release|x86.Build.0 = Release|Win32 + {E54D4581-CD59-4687-BB10-694B8192EABA}.Debug|x64.ActiveCfg = Debug|x64 + {E54D4581-CD59-4687-BB10-694B8192EABA}.Debug|x64.Build.0 = Debug|x64 + {E54D4581-CD59-4687-BB10-694B8192EABA}.Debug|x86.ActiveCfg = Debug|Win32 + {E54D4581-CD59-4687-BB10-694B8192EABA}.Debug|x86.Build.0 = Debug|Win32 + {E54D4581-CD59-4687-BB10-694B8192EABA}.Release|x64.ActiveCfg = Release|x64 + {E54D4581-CD59-4687-BB10-694B8192EABA}.Release|x64.Build.0 = Release|x64 + {E54D4581-CD59-4687-BB10-694B8192EABA}.Release|x86.ActiveCfg = Release|Win32 + {E54D4581-CD59-4687-BB10-694B8192EABA}.Release|x86.Build.0 = Release|Win32 + {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Debug|x64.ActiveCfg = Debug|x64 + {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Debug|x64.Build.0 = Debug|x64 + {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Debug|x86.ActiveCfg = Debug|x86 + {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Debug|x86.Build.0 = Debug|x86 + {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Release|x64.ActiveCfg = Release|x64 + {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Release|x64.Build.0 = Release|x64 + {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Release|x86.ActiveCfg = Release|x86 + {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Release|x86.Build.0 = Release|x86 + {58C106FE-C159-46D3-97E1-73AB83232670}.Debug|x64.ActiveCfg = Debug|x64 + {58C106FE-C159-46D3-97E1-73AB83232670}.Debug|x64.Build.0 = Debug|x64 + {58C106FE-C159-46D3-97E1-73AB83232670}.Debug|x86.ActiveCfg = Debug|x86 + {58C106FE-C159-46D3-97E1-73AB83232670}.Debug|x86.Build.0 = Debug|x86 + {58C106FE-C159-46D3-97E1-73AB83232670}.Release|x64.ActiveCfg = Release|x64 + {58C106FE-C159-46D3-97E1-73AB83232670}.Release|x64.Build.0 = Release|x64 + {58C106FE-C159-46D3-97E1-73AB83232670}.Release|x86.ActiveCfg = Release|x86 + {58C106FE-C159-46D3-97E1-73AB83232670}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/project/libcec.vcxproj b/project/libcec.vcxproj index 271d0df..9d2bb9a 100644 --- a/project/libcec.vcxproj +++ b/project/libcec.vcxproj @@ -115,21 +115,25 @@ DynamicLibrary true MultiByte + v110 DynamicLibrary true MultiByte + v110 DynamicLibrary false MultiByte + v110 DynamicLibrary false MultiByte + v110 @@ -151,13 +155,13 @@ $(SolutionDir)..\build\ - $(SolutionDir)..\build\ + $(SolutionDir)..\build\x64\ libcec - $(ProjectName).x64 + $(ProjectName) $(SolutionDir)..\include;$(IncludePath) @@ -174,8 +178,8 @@ C:\WinDDK\7600.16385.1\lib\win7\i386;$(LibraryPath) - $(SolutionDir)..\build\ - $(ProjectName).x64 + $(SolutionDir)..\build\x64\ + $(ProjectName) $(SolutionDir)..\include;$(IncludePath) C:\WinDDK\7600.16385.1\lib\win7\amd64;$(LibraryPath) @@ -269,4 +273,4 @@ - + \ No newline at end of file diff --git a/project/testclient.vcxproj b/project/testclient.vcxproj index 53cebe5..4ca804f 100644 --- a/project/testclient.vcxproj +++ b/project/testclient.vcxproj @@ -28,21 +28,25 @@ Application true MultiByte + v110 Application true MultiByte + v110 Application false MultiByte + v110 Application false MultiByte + v110 @@ -65,16 +69,16 @@ cec-client - $(SolutionDir)..\build\ - cec-client.x64 + $(SolutionDir)..\build\x64\ + cec-client $(SolutionDir)..\build\ cec-client - $(SolutionDir)..\build\ - cec-client.x64 + $(SolutionDir)..\build\x64\ + cec-client diff --git a/src/CecSharpTester/CecSharpTester.csproj b/src/CecSharpTester/CecSharpTester.csproj index eb00508..a02548f 100644 --- a/src/CecSharpTester/CecSharpTester.csproj +++ b/src/CecSharpTester/CecSharpTester.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -12,17 +12,22 @@ CecSharpTester v2.0 512 + + + + + 3.5 true - ..\..\build\ + ..\..\build\x64\ DEBUG;TRACE full x64 prompt - ..\..\build\ + ..\..\build\x64\ TRACE true pdbonly @@ -54,7 +59,7 @@ - + {E54D4581-CD59-4687-BB10-694B8192EABA} LibCecSharp diff --git a/src/LibCecTray/LibCECTray.csproj b/src/LibCecTray/LibCECTray.csproj index 430ae9c..22d9252 100644 --- a/src/LibCecTray/LibCECTray.csproj +++ b/src/LibCecTray/LibCECTray.csproj @@ -1,15 +1,15 @@  - + true - ..\..\build\ + ..\..\build\x64\ DEBUG;TRACE full x64 prompt - ..\..\build\ + ..\..\build\x64\ TRACE true pdbonly @@ -62,6 +62,11 @@ false true ..\..\project\favicon.ico + + + + + 3.5 @@ -215,7 +220,7 @@ - + {E54D4581-CD59-4687-BB10-694B8192EABA} LibCecSharp diff --git a/src/LibCecTray/Properties/Resources.Designer.cs b/src/LibCecTray/Properties/Resources.Designer.cs index e43f856..67e8678 100644 --- a/src/LibCecTray/Properties/Resources.Designer.cs +++ b/src/LibCecTray/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.5466 +// Runtime Version:4.0.30319.17929 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace LibCECTray.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp index d9fadb0..2aa81ca 100644 --- a/src/lib/CECProcessor.cpp +++ b/src/lib/CECProcessor.cpp @@ -706,7 +706,7 @@ bool CCECProcessor::AllocateLogicalAddresses(CCECClient* client) // replace a previous client CLockObject lock(m_mutex); m_clients.erase((*it)->GetLogicalAddress()); - m_clients.insert(make_pair((*it)->GetLogicalAddress(), client)); + m_clients.insert(make_pair((*it)->GetLogicalAddress(), client)); } // set the new ackmask diff --git a/support/create-installer.bat b/support/create-installer.bat index 90012c2..e0a28a0 100644 --- a/support/create-installer.bat +++ b/support/create-installer.bat @@ -9,13 +9,13 @@ IF EXIST "%ProgramFiles%\NSIS\makensis.exe" ( set NSIS="%ProgramFiles(x86)%\NSIS\makensis.exe" ) ELSE GOTO NONSIS -rem Check for VC10 -IF "%VS100COMNTOOLS%"=="" ( - set COMPILER10="%ProgramFiles%\Microsoft Visual Studio 10.0\Common7\IDE\VCExpress.exe" -) ELSE IF EXIST "%VS100COMNTOOLS%\..\IDE\VCExpress.exe" ( - set COMPILER10="%VS100COMNTOOLS%\..\IDE\VCExpress.exe" -) ELSE IF EXIST "%VS100COMNTOOLS%\..\IDE\devenv.exe" ( - set COMPILER10="%VS100COMNTOOLS%\..\IDE\devenv.exe" +rem Check for VC11 +IF "%VS110COMNTOOLS%"=="" ( + set COMPILER11="%ProgramFiles%\Microsoft Visual Studio 11.0\Common7\IDE\VCExpress.exe" +) ELSE IF EXIST "%VS110COMNTOOLS%\..\IDE\VCExpress.exe" ( + set COMPILER11="%VS110COMNTOOLS%\..\IDE\VCExpress.exe" +) ELSE IF EXIST "%VS110COMNTOOLS%\..\IDE\devenv.exe" ( + set COMPILER11="%VS110COMNTOOLS%\..\IDE\devenv.exe" ) ELSE GOTO NOSDK10 del /s /f /q ..\build @@ -40,65 +40,28 @@ if "%PROCESSOR_ARCHITECTURE%"=="x86" if "%PROCESSOR_ARCHITEW6432%"=="" goto libc rem Compile libCEC and cec-client x64 echo. Cleaning libCEC (x64) -%COMPILER10% libcec.sln /clean "Release|x64" +%COMPILER11% libcec.sln /clean "Release|x64" echo. Compiling libCEC (x64) -%COMPILER10% libcec.sln /build "Release|x64" /project libcec -echo. Compiling cec-client (x64) -%COMPILER10% libcec.sln /build "Release|x64" /project testclient +%COMPILER11% libcec.sln /build "Release|x64" :libcecx86 rem Compile libCEC and cec-client Win32 echo. Cleaning libCEC (x86) -%COMPILER10% libcec.sln /clean "Release|Win32" +%COMPILER11% libcec.sln /clean "Release|x86" echo. Compiling libCEC (x86) -%COMPILER10% libcec.sln /build "Release|Win32" /project libcec -echo. Compiling cec-client (x86) -%COMPILER10% libcec.sln /build "Release|Win32" /project testclient +%COMPILER11% libcec.sln /build "Release|x86" -rem Check for VC9 -IF "%VS90COMNTOOLS%"=="" ( - set COMPILER9="%ProgramFiles%\Microsoft Visual Studio 9.0\Common7\IDE\VCExpress.exe" -) ELSE IF EXIST "%VS90COMNTOOLS%\..\IDE\devenv.exe" ( - set COMPILER9="%VS90COMNTOOLS%\..\IDE\devenv.exe" -) ELSE GOTO NOSDK9 - -rem Skip to libCEC/x86 when we're running on win32 -if "%PROCESSOR_ARCHITECTURE%"=="x86" if "%PROCESSOR_ARCHITEW6432%"=="" goto libcecsharpx86 - -rem Compile LibCecSharp (x64) -echo. Cleaning LibCecSharp (x64) -%COMPILER9% LibCecSharp.Net2.sln /clean "Release|x64" -echo. Compiling LibCecSharp (x64) -%COMPILER9% LibCecSharp.sln /build "Release|x64" /project LibCecSharp -%COMPILER9% LibCecSharp.sln /build "Release|x64" /project CecSharpTester -%COMPILER9% LibCecSharp.sln /build "Release|x64" /project LibCecTray - -copy ..\build\LibCecSharp.dll ..\build\x64\LibCecSharp.dll -copy ..\build\CecSharpTester.exe ..\build\x64\CecSharpTester.exe -copy ..\build\cec-tray.exe ..\build\x64\cec-tray.exe - -:libcecsharpx86 -rem Compile LibCecSharp (x86) -echo. Cleaning LibCecSharp (x86) -%COMPILER9% LibCecSharp.sln /clean "Release|x86" -echo. Compiling LibCecSharp (x86) -%COMPILER9% LibCecSharp.sln /build "Release|x86" /project LibCecSharp -%COMPILER9% LibCecSharp.sln /build "Release|x86" /project CecSharpTester -%COMPILER9% LibCecSharp.sln /build "Release|x86" /project LibCecTray - -:NOSDK9 rem Clean things up before creating the installer del /q /f ..\build\LibCecSharp.pdb del /q /f ..\build\CecSharpTester.pdb del /q /f ..\build\cec-tray.pdb del /q /f ..\build\cec-tray.vshost.exe.manifest del /q /f ..\build\cec-.vshost.exe -copy ..\build\cec-client.x64.exe ..\build\x64\cec-client.x64.exe -del /q /f ..\build\cec-client.x64.exe -copy ..\build\libcec.x64.dll ..\build\x64\libcec.x64.dll -del /q /f ..\build\libcec.x64.dll -copy ..\build\libcec.x64.lib ..\build\x64\libcec.x64.lib -del /q /f ..\build\libcec.x64.lib +del /q /f ..\build\x64\LibCecSharp.pdb +del /q /f ..\build\x64\CecSharpTester.pdb +del /q /f ..\build\x64\cec-tray.pdb +del /q /f ..\build\x64\cec-tray.vshost.exe.manifest +del /q /f ..\build\x64\cec-.vshost.exe rem Check for sign-binary.cmd, only present on the Pulse-Eight production build system rem Calls signtool.exe and signs the DLLs with Pulse-Eight's code signing key @@ -109,9 +72,9 @@ CALL ..\support\private\sign-binary.cmd ..\build\CecSharpTester.exe CALL ..\support\private\sign-binary.cmd ..\build\libcec.dll CALL ..\support\private\sign-binary.cmd ..\build\LibCecSharp.dll CALL ..\support\private\sign-binary.cmd ..\build\cec-tray.exe -CALL ..\support\private\sign-binary.cmd ..\build\x64\cec-client.x64.exe +CALL ..\support\private\sign-binary.cmd ..\build\x64\cec-client.exe CALL ..\support\private\sign-binary.cmd ..\build\x64\CecSharpTester.exe -CALL ..\support\private\sign-binary.cmd ..\build\x64\libcec.x64.dll +CALL ..\support\private\sign-binary.cmd ..\build\x64\libcec.dll CALL ..\support\private\sign-binary.cmd ..\build\x64\LibCecSharp.dll CALL ..\support\private\sign-binary.cmd ..\build\x64\cec-tray.exe