X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=project%2Flibcec.vcxproj;h=9b459239b8922a771b642e9f63fd2bed596b23f8;hb=4bdea07d9e94c9a86e64ac3a2a4569e5ce73f8d9;hp=b41a3d3fee906d4250dfff15070928a1c36f16c6;hpb=b252e10403b0d3f445efc69ce9f50881125f1f9e;p=deb_libcec.git

diff --git a/project/libcec.vcxproj b/project/libcec.vcxproj
index b41a3d3..9b45923 100644
--- a/project/libcec.vcxproj
+++ b/project/libcec.vcxproj
@@ -11,42 +11,62 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\include\CECExports.h" />
-    <ClInclude Include="..\include\CECExportsC.h" />
-    <ClInclude Include="..\include\CECExportsCpp.h" />
-    <ClInclude Include="..\include\CECTypes.h" />
-    <ClInclude Include="..\src\lib\CECDetect.h" />
-    <ClInclude Include="..\src\lib\CECParser.h" />
-    <ClInclude Include="..\src\lib\Communication.h" />
-    <ClInclude Include="..\src\lib\libPlatform\baudrate.h" />
-    <ClInclude Include="..\src\lib\libPlatform\os-dependent.h" />
-    <ClInclude Include="..\src\lib\libPlatform\pthread_win32\pthread.h" />
-    <ClInclude Include="..\src\lib\libPlatform\pthread_win32\sched.h" />
-    <ClInclude Include="..\src\lib\libPlatform\pthread_win32\semaphore.h" />
-    <ClInclude Include="..\src\lib\libPlatform\serialport.h" />
-    <ClInclude Include="..\src\lib\libPlatform\windows\dlfcn-win32.h" />
-    <ClInclude Include="..\src\lib\libPlatform\windows\os_windows.h" />
+    <ClInclude Include="..\include\cec.h" />
+    <ClInclude Include="..\include\cecc.h" />
+    <ClInclude Include="..\include\cecloader.h" />
+    <ClInclude Include="..\include\cectypes.h" />
+    <ClInclude Include="..\src\lib\AdapterCommunication.h" />
+    <ClInclude Include="..\src\lib\AdapterDetection.h" />
+    <ClInclude Include="..\src\lib\CECProcessor.h" />
+    <ClInclude Include="..\src\lib\devices\CECAudioSystem.h" />
+    <ClInclude Include="..\src\lib\devices\CECBusDevice.h" />
+    <ClInclude Include="..\src\lib\devices\CECPlaybackDevice.h" />
+    <ClInclude Include="..\src\lib\devices\CECRecordingDevice.h" />
+    <ClInclude Include="..\src\lib\devices\CECTuner.h" />
+    <ClInclude Include="..\src\lib\devices\CECTV.h" />
+    <ClInclude Include="..\src\lib\implementations\ANCommandHandler.h" />
+    <ClInclude Include="..\src\lib\implementations\CECCommandHandler.h" />
+    <ClInclude Include="..\src\lib\implementations\SLCommandHandler.h" />
+    <ClInclude Include="..\src\lib\implementations\VLCommandHandler.h" />
+    <ClInclude Include="..\src\lib\LibCEC.h" />
+    <ClInclude Include="..\src\lib\platform\baudrate.h" />
+    <ClInclude Include="..\src\lib\platform\os-dependent.h" />
+    <ClInclude Include="..\src\lib\platform\pthread_win32\pthread.h" />
+    <ClInclude Include="..\src\lib\platform\pthread_win32\sched.h" />
+    <ClInclude Include="..\src\lib\platform\pthread_win32\semaphore.h" />
+    <ClInclude Include="..\src\lib\platform\serialport.h" />
+    <ClInclude Include="..\src\lib\platform\threads.h" />
+    <ClInclude Include="..\src\lib\platform\timeutils.h" />
+    <ClInclude Include="..\src\lib\platform\windows\dlfcn-win32.h" />
+    <ClInclude Include="..\src\lib\platform\windows\os_windows.h" />
     <ClInclude Include="..\src\lib\util\buffer.h" />
-    <ClInclude Include="..\src\lib\util\misc.h" />
     <ClInclude Include="..\src\lib\util\StdString.h" />
-    <ClInclude Include="..\src\lib\util\threads.h" />
-    <ClInclude Include="..\src\lib\util\timeutils.h" />
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\lib\CECDetect.cpp" />
-    <ClCompile Include="..\src\lib\CECDll.cpp" />
-    <ClCompile Include="..\src\lib\CECParser.cpp" />
-    <ClCompile Include="..\src\lib\CECParserC.cpp" />
-    <ClCompile Include="..\src\lib\Communication.cpp" />
-    <ClCompile Include="..\src\lib\libPlatform\windows\dlfcn-win32.cpp" />
-    <ClCompile Include="..\src\lib\libPlatform\windows\os_windows.cpp" />
-    <ClCompile Include="..\src\lib\libPlatform\windows\serialport.cpp" />
-    <ClCompile Include="..\src\lib\util\misc.cpp" />
-    <ClCompile Include="..\src\lib\util\threads.cpp" />
+    <ClCompile Include="..\src\lib\AdapterCommunication.cpp" />
+    <ClCompile Include="..\src\lib\AdapterDetection.cpp" />
+    <ClCompile Include="..\src\lib\CECProcessor.cpp" />
+    <ClCompile Include="..\src\lib\devices\CECAudioSystem.cpp" />
+    <ClCompile Include="..\src\lib\devices\CECBusDevice.cpp" />
+    <ClCompile Include="..\src\lib\devices\CECPlaybackDevice.cpp" />
+    <ClCompile Include="..\src\lib\devices\CECRecordingDevice.cpp" />
+    <ClCompile Include="..\src\lib\devices\CECTuner.cpp" />
+    <ClCompile Include="..\src\lib\devices\CECTV.cpp" />
+    <ClCompile Include="..\src\lib\implementations\ANCommandHandler.cpp" />
+    <ClCompile Include="..\src\lib\implementations\CECCommandHandler.cpp" />
+    <ClCompile Include="..\src\lib\implementations\SLCommandHandler.cpp" />
+    <ClCompile Include="..\src\lib\implementations\VLCommandHandler.cpp" />
+    <ClCompile Include="..\src\lib\LibCEC.cpp" />
+    <ClCompile Include="..\src\lib\LibCECC.cpp" />
+    <ClCompile Include="..\src\lib\LibCECDll.cpp" />
+    <ClCompile Include="..\src\lib\platform\threads.cpp" />
+    <ClCompile Include="..\src\lib\platform\windows\dlfcn-win32.cpp" />
+    <ClCompile Include="..\src\lib\platform\windows\os_windows.cpp" />
+    <ClCompile Include="..\src\lib\platform\windows\serialport.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <Library Include="..\src\lib\libPlatform\pthread_win32\pthreadVC2.lib" />
-    <Library Include="..\src\lib\libPlatform\pthread_win32\pthreadVC2d.lib" />
+    <ResourceCompile Include="libcec.rc" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}</ProjectGuid>
@@ -76,7 +96,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)\..\</OutDir>
+    <OutDir>$(SolutionDir)..\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <TargetName>libcec</TargetName>
@@ -84,49 +104,57 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ExtensionsToDeleteOnClean>*.cdf;*.cache;*.obj;*.ilk;*.resources;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.tlog;*.manifest;*.res;*.pch;*.exp;*.idb;*.rep;*.xdc;*.pdb;*_manifest.rc;*.bsc;*.sbr;*.xml;*.dll</ExtensionsToDeleteOnClean>
-    <IncludePath>$(SolutionDir)\..\include;$(IncludePath)</IncludePath>
-    <IgnoreImportLibrary>true</IgnoreImportLibrary>
+    <IncludePath>$(SolutionDir)..\include;$(IncludePath)</IncludePath>
+    <IgnoreImportLibrary>false</IgnoreImportLibrary>
+    <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(SolutionDir)..\</OutDir>
     <TargetName>libcec</TargetName>
     <TargetExt>.dll</TargetExt>
     <ExtensionsToDeleteOnClean>*.cdf;*.cache;*.obj;*.ilk;*.resources;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.tlog;*.manifest;*.res;*.pch;*.exp;*.idb;*.rep;*.xdc;*.pdb;*_manifest.rc;*.bsc;*.sbr;*.xml;*.dll</ExtensionsToDeleteOnClean>
-    <IncludePath>$(SolutionDir)\..\include;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)..\include;$(IncludePath)</IncludePath>
+    <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
+      <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\libPlatform\pthread_win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\src\lib\platform\pthread_win32;$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4996;4100;4309;4505</DisableSpecificWarnings>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(SolutionDir)\..\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib</AdditionalDependencies>
+      <OutputFile>$(SolutionDir)..\libcec.dll</OutputFile>
+      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;$(SolutionDir)..\src\lib\platform\pthread_win32\pthreadVC2.lib</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>libcmtd</IgnoreSpecificDefaultLibraries>
-      <Version>2</Version>
+      <Version>
+      </Version>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\src\lib\libPlatform\pthread_win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_WIN32;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE_32BIT_TIME_T;_WINSOCKAPI_;__STDC_CONSTANT_MACROS;__WINDOWS__;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\src\lib\platform\pthread_win32;$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE_32BIT_TIME_T;_WINSOCKAPI_;__STDC_CONSTANT_MACROS;__WINDOWS__;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4100;4309</DisableSpecificWarnings>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>$(SolutionDir)\..\libcec.dll</OutputFile>
-      <AdditionalDependencies>ws2_32.lib;$(SolutionDir)\..\src\lib\libPlatform\pthread_win32\pthreadVC2d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(SolutionDir)..\libcec.dll</OutputFile>
+      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;$(SolutionDir)..\src\lib\platform\pthread_win32\pthreadVC2.lib</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>libcmt</IgnoreSpecificDefaultLibraries>
+      <Version>
+      </Version>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />