repositories
/
deb_libcec.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
30a57ee
)
win32: sync visual studio project files. fixed: accidently included windows.h within...
author
Lars Op den Kamp
<lars.opdenkamp@pulse-eight.com>
Thu, 13 Oct 2011 17:52:34 +0000
(19:52 +0200)
committer
Lars Op den Kamp
<lars.opdenkamp@pulse-eight.com>
Thu, 13 Oct 2011 17:52:34 +0000
(19:52 +0200)
include/cectypes.h
patch
|
blob
|
blame
|
history
project/libcec.vcxproj
patch
|
blob
|
blame
|
history
project/libcec.vcxproj.filters
patch
|
blob
|
blame
|
history
project/testclient.vcxproj
patch
|
blob
|
blame
|
history
project/testclient.vcxproj.filters
patch
|
blob
|
blame
|
history
src/lib/LibCECDll.cpp
patch
|
blob
|
blame
|
history
diff --git
a/include/cectypes.h
b/include/cectypes.h
index f2d8e6710f2ff511e6b446531a67a8406c3af574..eee055264b8fbc7a2854bab53465dc3fd721a4de 100644
(file)
--- a/
include/cectypes.h
+++ b/
include/cectypes.h
@@
-36,11
+36,9
@@
#include <stdint.h>
#include <string.h>
#include <stdint.h>
#include <string.h>
-#include <stdbool.h>
-#ifdef __cplusplus
-extern "C" {
-namespace CEC {
+#if !defined(_WIN32) && !defined(_WIN64)
+#include <stdbool.h>
#endif
#if !defined(DECLSPEC)
#endif
#if !defined(DECLSPEC)
@@
-56,6
+54,11
@@
namespace CEC {
#endif
#endif
#endif
#endif
+#ifdef __cplusplus
+extern "C" {
+namespace CEC {
+#endif
+
typedef enum
{
CEC_ABORT_REASON_UNRECOGNIZED_OPCODE = 0,
typedef enum
{
CEC_ABORT_REASON_UNRECOGNIZED_OPCODE = 0,
diff --git
a/project/libcec.vcxproj
b/project/libcec.vcxproj
index 34f7817e9ba7612a1cffe9cd400222ec3fd2dea7..4ab6438800448b77ddd7d5eeabb51648f1b3e46c 100644
(file)
--- a/
project/libcec.vcxproj
+++ b/
project/libcec.vcxproj
@@
-11,10
+11,10
@@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\include\
CECExports
.h" />
- <ClInclude Include="..\include\
CECExportsC
.h" />
- <ClInclude Include="..\include\
CECExportsCpp
.h" />
- <ClInclude Include="..\include\
CECT
ypes.h" />
+ <ClInclude Include="..\include\
cec
.h" />
+ <ClInclude Include="..\include\
cecc
.h" />
+ <ClInclude Include="..\include\
cecloader
.h" />
+ <ClInclude Include="..\include\
cect
ypes.h" />
<ClInclude Include="..\src\lib\AdapterCommunication.h" />
<ClInclude Include="..\src\lib\AdapterDetection.h" />
<ClInclude Include="..\src\lib\CECProcessor.h" />
<ClInclude Include="..\src\lib\AdapterCommunication.h" />
<ClInclude Include="..\src\lib\AdapterDetection.h" />
<ClInclude Include="..\src\lib\CECProcessor.h" />
@@
-96,7
+96,7
@@
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE_32BIT_TIME_T;_WINSOCKAPI_;__STDC_CONSTANT_MACROS;__WINDOWS__;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE_32BIT_TIME_T;_WINSOCKAPI_;__STDC_CONSTANT_MACROS;__WINDOWS__;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>$(SolutionDir)..\src\lib\platform\pthread_win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)..\src\lib\platform\pthread_win32;
$(SolutionDir)..\include;
%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4996;4100;4309;4505</DisableSpecificWarnings>
<TreatWarningAsError>true</TreatWarningAsError>
</ClCompile>
<DisableSpecificWarnings>4996;4100;4309;4505</DisableSpecificWarnings>
<TreatWarningAsError>true</TreatWarningAsError>
</ClCompile>
@@
-105,7
+105,7
@@
<OutputFile>$(SolutionDir)..\libcec.dll</OutputFile>
<AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;$(SolutionDir)..\src\lib\platform\pthread_win32\pthreadVC2.lib</AdditionalDependencies>
<IgnoreSpecificDefaultLibraries>libcmtd</IgnoreSpecificDefaultLibraries>
<OutputFile>$(SolutionDir)..\libcec.dll</OutputFile>
<AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;$(SolutionDir)..\src\lib\platform\pthread_win32\pthreadVC2.lib</AdditionalDependencies>
<IgnoreSpecificDefaultLibraries>libcmtd</IgnoreSpecificDefaultLibraries>
- <Version>
6
</Version>
+ <Version>
7
</Version>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git
a/project/libcec.vcxproj.filters
b/project/libcec.vcxproj.filters
index 7bd7b5949287ff97c75f54b1c38065713340803e..c677d84c1ef1045bda334fca4ff4bd5d89b30490 100644
(file)
--- a/
project/libcec.vcxproj.filters
+++ b/
project/libcec.vcxproj.filters
@@
-18,18
+18,6
@@
<ClInclude Include="..\src\lib\util\StdString.h">
<Filter>util</Filter>
</ClInclude>
<ClInclude Include="..\src\lib\util\StdString.h">
<Filter>util</Filter>
</ClInclude>
- <ClInclude Include="..\include\CECExports.h">
- <Filter>exports</Filter>
- </ClInclude>
- <ClInclude Include="..\include\CECExportsCpp.h">
- <Filter>exports</Filter>
- </ClInclude>
- <ClInclude Include="..\include\CECTypes.h">
- <Filter>exports</Filter>
- </ClInclude>
- <ClInclude Include="..\include\CECExportsC.h">
- <Filter>exports</Filter>
- </ClInclude>
<ClInclude Include="..\src\lib\AdapterCommunication.h" />
<ClInclude Include="..\src\lib\AdapterDetection.h" />
<ClInclude Include="..\src\lib\CECProcessor.h" />
<ClInclude Include="..\src\lib\AdapterCommunication.h" />
<ClInclude Include="..\src\lib\AdapterDetection.h" />
<ClInclude Include="..\src\lib\CECProcessor.h" />
@@
-64,6
+52,18
@@
<ClInclude Include="..\src\lib\platform\pthread_win32\semaphore.h">
<Filter>platform</Filter>
</ClInclude>
<ClInclude Include="..\src\lib\platform\pthread_win32\semaphore.h">
<Filter>platform</Filter>
</ClInclude>
+ <ClInclude Include="..\include\cec.h">
+ <Filter>exports</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\cecc.h">
+ <Filter>exports</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\cecloader.h">
+ <Filter>exports</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\cectypes.h">
+ <Filter>exports</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\lib\AdapterCommunication.cpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\lib\AdapterCommunication.cpp" />
diff --git
a/project/testclient.vcxproj
b/project/testclient.vcxproj
index 13b32a7b2c8bb97128dfa4c14f08978a3399d672..d091b7dd9dd348cc61259fef96593aeed7bdf5b1 100644
(file)
--- a/
project/testclient.vcxproj
+++ b/
project/testclient.vcxproj
@@
-56,12
+56,14
@@
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE_32BIT_TIME_T;_WINSOCKAPI_;__STDC_CONSTANT_MACROS;__WINDOWS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<TreatWarningAsError>true</TreatWarningAsError>
<DisableSpecificWarnings>4100;4309;4505</DisableSpecificWarnings>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE_32BIT_TIME_T;_WINSOCKAPI_;__STDC_CONSTANT_MACROS;__WINDOWS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<TreatWarningAsError>true</TreatWarningAsError>
<DisableSpecificWarnings>4100;4309;4505</DisableSpecificWarnings>
+ <AdditionalIncludeDirectories>$(SolutiontDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>$(ProjectDir)..\src\lib\platform\pthread_win32\pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(SolutionDir)..\cec-client.exe</OutputFile>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>$(ProjectDir)..\src\lib\platform\pthread_win32\pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(SolutionDir)..\cec-client.exe</OutputFile>
+ <Version>7</Version>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@
-85,8
+87,8
@@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClInclude Include="..\include\
CECExports
.h" />
- <ClInclude Include="..\include\
CECExportsCpp
.h" />
+ <ClInclude Include="..\include\
cec
.h" />
+ <ClInclude Include="..\include\
cecloader
.h" />
<ClInclude Include="..\src\lib\platform\os-dependent.h" />
<ClInclude Include="..\src\lib\platform\threads.h" />
<ClInclude Include="..\src\lib\platform\windows\os_windows.h" />
<ClInclude Include="..\src\lib\platform\os-dependent.h" />
<ClInclude Include="..\src\lib\platform\threads.h" />
<ClInclude Include="..\src\lib\platform\windows\os_windows.h" />
diff --git
a/project/testclient.vcxproj.filters
b/project/testclient.vcxproj.filters
index 76735fba1074b00476c70608ea3ef1e7fac80a84..88bab57d33b96d527d9302d92fa3c12a1ddaff2c 100644
(file)
--- a/
project/testclient.vcxproj.filters
+++ b/
project/testclient.vcxproj.filters
@@
-15,12
+15,6
@@
</Filter>
</ItemGroup>
<ItemGroup>
</Filter>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\include\CECExports.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\include\CECExportsCpp.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\src\lib\util\StdString.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\lib\util\StdString.h">
<Filter>Header Files</Filter>
</ClInclude>
@@
-33,6
+27,12
@@
<ClInclude Include="..\src\lib\platform\windows\os_windows.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\lib\platform\windows\os_windows.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\include\cec.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\cecloader.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\testclient\main.cpp">
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\testclient\main.cpp">
diff --git
a/src/lib/LibCECDll.cpp
b/src/lib/LibCECDll.cpp
index fb0ed9ad7362c0ef585c440d018f7289ffff9086..14d9776aa43dfef386965f65009488a191306a44 100644
(file)
--- a/
src/lib/LibCECDll.cpp
+++ b/
src/lib/LibCECDll.cpp
@@
-30,6
+30,8
@@
* http://www.pulse-eight.net/
*/
* http://www.pulse-eight.net/
*/
+#include <windows.h>
+
int WINAPI DllEntryPoint(HINSTANCE hinst, unsigned long reason, void*)
{
return 1;
int WINAPI DllEntryPoint(HINSTANCE hinst, unsigned long reason, void*)
{
return 1;