From 7879fa15cd1d00d3334a258ae0fce065c92f6e39 Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Fri, 13 Jan 2012 14:25:52 +0100 Subject: [PATCH] cec: added a .NET framework 2.0 version of LibCecSharp: LibCecSharp.Net2.dll --- .gitignore | 9 +- project/LibCecSharp.Net2.sln | 20 +++ project/LibCecSharp.Net2.vcproj | 227 +++++++++++++++++++++++++++ project/create-installer.cmd | 53 +++++-- project/libCEC.nsi | 7 +- src/lib/platform/windows/stdint.h | 247 ++++++++++++++++++++++++++++++ 6 files changed, 543 insertions(+), 20 deletions(-) create mode 100644 project/LibCecSharp.Net2.sln create mode 100644 project/LibCecSharp.Net2.vcproj create mode 100644 src/lib/platform/windows/stdint.h diff --git a/.gitignore b/.gitignore index 2ad44d5..9abd286 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ .project .cproject +*.ilk *.manifest +*.metagen +*.pdb aclocal.m4 autom4te.cache @@ -32,6 +35,7 @@ CecSharpClient.vshost.exe CecSharpClient.vshost.exe.manifest LibCecSharp.dll +LibCecSharp.Net2.dll LibCecSharp.ilk LibCecSharp.pdb @@ -41,12 +45,15 @@ include/boost project/bin project/Debug/ +project/*.exe project/Release/ project/ipch/ project/libcec.sdf -project/libcec.suo +project/*.ncb project/obj +project/*.opensdf project/Properties +project/*.suo project/*.user src/lib/.deps diff --git a/project/LibCecSharp.Net2.sln b/project/LibCecSharp.Net2.sln new file mode 100644 index 0000000..b50b423 --- /dev/null +++ b/project/LibCecSharp.Net2.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibCecSharp.Net2", "LibCecSharp.Net2.vcproj", "{E54D4581-CD59-4687-BB10-694B8192EABA}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E54D4581-CD59-4687-BB10-694B8192EABA}.Debug|Win32.ActiveCfg = Debug|Win32 + {E54D4581-CD59-4687-BB10-694B8192EABA}.Debug|Win32.Build.0 = Debug|Win32 + {E54D4581-CD59-4687-BB10-694B8192EABA}.Release|Win32.ActiveCfg = Release|Win32 + {E54D4581-CD59-4687-BB10-694B8192EABA}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/project/LibCecSharp.Net2.vcproj b/project/LibCecSharp.Net2.vcproj new file mode 100644 index 0000000..8ed9b39 --- /dev/null +++ b/project/LibCecSharp.Net2.vcproj @@ -0,0 +1,227 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/create-installer.cmd b/project/create-installer.cmd index f82db3d..78daa7e 100644 --- a/project/create-installer.cmd +++ b/project/create-installer.cmd @@ -1,34 +1,59 @@ @echo off -set NSIS="C:\Program Files (x86)\NSIS\makensis.exe" -set DDK=C:\WinDDK\7600.16385.1 +IF EXIST "%ProgramFiles%\NSIS\makensis.exe" ( + set NSIS="%ProgramFiles%\NSIS\makensis.exe" +) ELSE IF EXIST "%ProgramFiles(x86)%\NSIS\makensis.exe" ( + set NSIS="%ProgramFiles(x86)%\NSIS\makensis.exe" +) ELSE GOTO NONSIS + +IF NOT EXIST "C:\WinDDK\7600.16385.1" GOTO NODDK +set DDK="C:\WinDDK\7600.16385.1" IF "%VS100COMNTOOLS%"=="" ( - set COMPILER="%ProgramFiles%\Microsoft Visual Studio 10.0\Common7\IDE\VCExpress.exe" + set COMPILER10="%ProgramFiles%\Microsoft Visual Studio 10.0\Common7\IDE\VCExpress.exe" ) ELSE IF EXIST "%VS100COMNTOOLS%\..\IDE\VCExpress.exe" ( - set COMPILER="%VS100COMNTOOLS%\..\IDE\VCExpress.exe" + set COMPILER10="%VS100COMNTOOLS%\..\IDE\VCExpress.exe" ) ELSE IF EXIST "%VS100COMNTOOLS%\..\IDE\devenv.exe" ( - set COMPILER="%VS100COMNTOOLS%\..\IDE\devenv.exe" + set COMPILER10="%VS100COMNTOOLS%\..\IDE\devenv.exe" ) -rem Compile libCEC echo Cleaning libCEC -%COMPILER% libcec.sln /clean Release - +%COMPILER10% libcec.sln /clean Release echo Compiling libCEC -%COMPILER% libcec.sln /build Release /project libcec +%COMPILER10% libcec.sln /build Release /project libcec echo Compiling cec-client -%COMPILER% libcec.sln /build Release /project testclient +%COMPILER10% libcec.sln /build Release /project testclient echo Compiling LibCecSharp -%COMPILER% libcec.sln /build Release /project LibCecSharp +%COMPILER10% libcec.sln /build Release /project LibCecSharp + +IF "%VS90COMNTOOLS%"=="" ( + set COMPILER9="%ProgramFiles%\Microsoft Visual Studio 9.0\Common7\IDE\VCExpress.exe" +) ELSE IF EXIST "%VS90COMNTOOLS%\..\IDE\VCExpress.exe" ( + set COMPILER9="%VS90COMNTOOLS%\..\IDE\VCExpress.exe" +) ELSE IF EXIST "%VS90COMNTOOLS%\..\IDE\devenv.exe" ( + set COMPILER9="%VS90COMNTOOLS%\..\IDE\devenv.exe" +) ELSE GOTO NOSDK9 + +echo Compiling LibCecSharp.Net2 +%COMPILER9% LibCecSharp.Net2.sln /build Release -rem Copy driver installer +:NOSDK9 echo Copying driver installer copy "%DDK%\redist\DIFx\dpinst\MultiLin\amd64\dpinst.exe" ..\dpinst-amd64.exe copy "%DDK%\redist\DIFx\dpinst\MultiLin\x86\dpinst.exe" ..\dpinst-x86.exe -rem Run the NSIS installer echo Creating the installer %NSIS% /V1 /X"SetCompressor /FINAL lzma" "libCEC.nsi" -echo The installer can be found here: libCEC-installer.exe \ No newline at end of file +echo The installer can be found here: libCEC-installer.exe + +GOTO EXIT + +:NOSIS +echo NSIS could not be found on your system. +GOTO EXIT + +:NODDK +echo Windows DDK could not be found on your system + +:EXIT \ No newline at end of file diff --git a/project/libCEC.nsi b/project/libCEC.nsi index 36cd65b..065544a 100644 --- a/project/libCEC.nsi +++ b/project/libCEC.nsi @@ -50,10 +50,9 @@ Section "libCEC" SecLibCEC File "..\cec-client.exe" File "..\ChangeLog" File "..\COPYING" - File "..\libcec.dll" + File "..\*.dll" File "..\libcec.lib" File "Release\LibCecSharp.dll" - File "..\pthreadVC2.dll" File "..\README" ; Copy to XBMC\system @@ -135,11 +134,9 @@ Section "Uninstall" Delete "$INSTDIR\cec-client.exe" Delete "$INSTDIR\ChangeLog" Delete "$INSTDIR\COPYING" - Delete "$INSTDIR\libcec.dll" + Delete "$INSTDIR\*.dll" Delete "$INSTDIR\libcec.lib" Delete "$INSTDIR\libcec.pdb" - Delete "$INSTDIR\LibCecSharp.dll" - Delete "$INSTDIR\pthreadVC2.dll" Delete "$INSTDIR\README" Delete "$INSTDIR\driver\OEM001.inf" Delete "$INSTDIR\driver\dpinst-amd64.exe" diff --git a/src/lib/platform/windows/stdint.h b/src/lib/platform/windows/stdint.h new file mode 100644 index 0000000..d02608a --- /dev/null +++ b/src/lib/platform/windows/stdint.h @@ -0,0 +1,247 @@ +// ISO C9x compliant stdint.h for Microsoft Visual Studio +// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 +// +// Copyright (c) 2006-2008 Alexander Chemeris +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are met: +// +// 1. Redistributions of source code must retain the above copyright notice, +// this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. The name of the author may be used to endorse or promote products +// derived from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _MSC_VER // [ +#error "Use this header only with Microsoft Visual C++ compilers!" +#endif // _MSC_VER ] + +#ifndef _MSC_STDINT_H_ // [ +#define _MSC_STDINT_H_ + +#if _MSC_VER > 1000 +#pragma once +#endif + +#include + +// For Visual Studio 6 in C++ mode and for many Visual Studio versions when +// compiling for ARM we should wrap include with 'extern "C++" {}' +// or compiler give many errors like this: +// error C2733: second C linkage of overloaded function 'wmemchr' not allowed +#ifdef __cplusplus +extern "C" { +#endif +# include +#ifdef __cplusplus +} +#endif + +// Define _W64 macros to mark types changing their size, like intptr_t. +#ifndef _W64 +# if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300 +# define _W64 __w64 +# else +# define _W64 +# endif +#endif + + +// 7.18.1 Integer types + +// 7.18.1.1 Exact-width integer types + +// Visual Studio 6 and Embedded Visual C++ 4 doesn't +// realize that, e.g. char has the same size as __int8 +// so we give up on __intX for them. +#if (_MSC_VER < 1300) + typedef signed char int8_t; + typedef signed short int16_t; + typedef signed int int32_t; + typedef unsigned char uint8_t; + typedef unsigned short uint16_t; + typedef unsigned int uint32_t; +#else + typedef signed __int8 int8_t; + typedef signed __int16 int16_t; + typedef signed __int32 int32_t; + typedef unsigned __int8 uint8_t; + typedef unsigned __int16 uint16_t; + typedef unsigned __int32 uint32_t; +#endif +typedef signed __int64 int64_t; +typedef unsigned __int64 uint64_t; + + +// 7.18.1.2 Minimum-width integer types +typedef int8_t int_least8_t; +typedef int16_t int_least16_t; +typedef int32_t int_least32_t; +typedef int64_t int_least64_t; +typedef uint8_t uint_least8_t; +typedef uint16_t uint_least16_t; +typedef uint32_t uint_least32_t; +typedef uint64_t uint_least64_t; + +// 7.18.1.3 Fastest minimum-width integer types +typedef int8_t int_fast8_t; +typedef int16_t int_fast16_t; +typedef int32_t int_fast32_t; +typedef int64_t int_fast64_t; +typedef uint8_t uint_fast8_t; +typedef uint16_t uint_fast16_t; +typedef uint32_t uint_fast32_t; +typedef uint64_t uint_fast64_t; + +// 7.18.1.4 Integer types capable of holding object pointers +#ifdef _WIN64 // [ + typedef signed __int64 intptr_t; + typedef unsigned __int64 uintptr_t; +#else // _WIN64 ][ + typedef _W64 signed int intptr_t; + typedef _W64 unsigned int uintptr_t; +#endif // _WIN64 ] + +// 7.18.1.5 Greatest-width integer types +typedef int64_t intmax_t; +typedef uint64_t uintmax_t; + + +// 7.18.2 Limits of specified-width integer types + +#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [ See footnote 220 at page 257 and footnote 221 at page 259 + +// 7.18.2.1 Limits of exact-width integer types +#define INT8_MIN ((int8_t)_I8_MIN) +#define INT8_MAX _I8_MAX +#define INT16_MIN ((int16_t)_I16_MIN) +#define INT16_MAX _I16_MAX +#define INT32_MIN ((int32_t)_I32_MIN) +#define INT32_MAX _I32_MAX +#define INT64_MIN ((int64_t)_I64_MIN) +#define INT64_MAX _I64_MAX +#define UINT8_MAX _UI8_MAX +#define UINT16_MAX _UI16_MAX +#define UINT32_MAX _UI32_MAX +#define UINT64_MAX _UI64_MAX + +// 7.18.2.2 Limits of minimum-width integer types +#define INT_LEAST8_MIN INT8_MIN +#define INT_LEAST8_MAX INT8_MAX +#define INT_LEAST16_MIN INT16_MIN +#define INT_LEAST16_MAX INT16_MAX +#define INT_LEAST32_MIN INT32_MIN +#define INT_LEAST32_MAX INT32_MAX +#define INT_LEAST64_MIN INT64_MIN +#define INT_LEAST64_MAX INT64_MAX +#define UINT_LEAST8_MAX UINT8_MAX +#define UINT_LEAST16_MAX UINT16_MAX +#define UINT_LEAST32_MAX UINT32_MAX +#define UINT_LEAST64_MAX UINT64_MAX + +// 7.18.2.3 Limits of fastest minimum-width integer types +#define INT_FAST8_MIN INT8_MIN +#define INT_FAST8_MAX INT8_MAX +#define INT_FAST16_MIN INT16_MIN +#define INT_FAST16_MAX INT16_MAX +#define INT_FAST32_MIN INT32_MIN +#define INT_FAST32_MAX INT32_MAX +#define INT_FAST64_MIN INT64_MIN +#define INT_FAST64_MAX INT64_MAX +#define UINT_FAST8_MAX UINT8_MAX +#define UINT_FAST16_MAX UINT16_MAX +#define UINT_FAST32_MAX UINT32_MAX +#define UINT_FAST64_MAX UINT64_MAX + +// 7.18.2.4 Limits of integer types capable of holding object pointers +#ifdef _WIN64 // [ +# define INTPTR_MIN INT64_MIN +# define INTPTR_MAX INT64_MAX +# define UINTPTR_MAX UINT64_MAX +#else // _WIN64 ][ +# define INTPTR_MIN INT32_MIN +# define INTPTR_MAX INT32_MAX +# define UINTPTR_MAX UINT32_MAX +#endif // _WIN64 ] + +// 7.18.2.5 Limits of greatest-width integer types +#define INTMAX_MIN INT64_MIN +#define INTMAX_MAX INT64_MAX +#define UINTMAX_MAX UINT64_MAX + +// 7.18.3 Limits of other integer types + +#ifdef _WIN64 // [ +# define PTRDIFF_MIN _I64_MIN +# define PTRDIFF_MAX _I64_MAX +#else // _WIN64 ][ +# define PTRDIFF_MIN _I32_MIN +# define PTRDIFF_MAX _I32_MAX +#endif // _WIN64 ] + +#define SIG_ATOMIC_MIN INT_MIN +#define SIG_ATOMIC_MAX INT_MAX + +#ifndef SIZE_MAX // [ +# ifdef _WIN64 // [ +# define SIZE_MAX _UI64_MAX +# else // _WIN64 ][ +# define SIZE_MAX _UI32_MAX +# endif // _WIN64 ] +#endif // SIZE_MAX ] + +// WCHAR_MIN and WCHAR_MAX are also defined in +#ifndef WCHAR_MIN // [ +# define WCHAR_MIN 0 +#endif // WCHAR_MIN ] +#ifndef WCHAR_MAX // [ +# define WCHAR_MAX _UI16_MAX +#endif // WCHAR_MAX ] + +#define WINT_MIN 0 +#define WINT_MAX _UI16_MAX + +#endif // __STDC_LIMIT_MACROS ] + + +// 7.18.4 Limits of other integer types + +#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [ See footnote 224 at page 260 + +// 7.18.4.1 Macros for minimum-width integer constants + +#define INT8_C(val) val##i8 +#define INT16_C(val) val##i16 +#define INT32_C(val) val##i32 +#define INT64_C(val) val##i64 + +#define UINT8_C(val) val##ui8 +#define UINT16_C(val) val##ui16 +#define UINT32_C(val) val##ui32 +#define UINT64_C(val) val##ui64 + +// 7.18.4.2 Macros for greatest-width integer constants +#define INTMAX_C INT64_C +#define UINTMAX_C UINT64_C + +#endif // __STDC_CONSTANT_MACROS ] + + +#endif // _MSC_STDINT_H_ ] -- 2.34.1