win32: sync visual studio project files. increased warning level to 4. added Release...
authorLars Op den Kamp <lars.opdenkamp@pulse-eight.com>
Tue, 4 Oct 2011 21:16:59 +0000 (23:16 +0200)
committerLars Op den Kamp <lars.opdenkamp@pulse-eight.com>
Tue, 4 Oct 2011 21:16:59 +0000 (23:16 +0200)
project/libcec.sln
project/libcec.vcxproj
project/libcec.vcxproj.filters
project/testclient.vcxproj
project/testclient.vcxproj.filters

index 2284eec9447d6c03c32791c98276df9d329ca33d..2255a1b0f0f9362ea2ac5c53b70d8b2e0f5d2644 100644 (file)
@@ -1,6 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+# Visual C++ Express 2010
 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}"
@@ -11,12 +11,17 @@ EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
+               Release|Win32 = Release|Win32
        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}.Release|Win32.ActiveCfg = Release|Win32
+               {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Release|Win32.Build.0 = Release|Win32
                {F01222BF-6B3D-43BD-B254-434031CB9887}.Debug|Win32.ActiveCfg = Debug|Win32
                {F01222BF-6B3D-43BD-B254-434031CB9887}.Debug|Win32.Build.0 = Debug|Win32
+               {F01222BF-6B3D-43BD-B254-434031CB9887}.Release|Win32.ActiveCfg = Release|Win32
+               {F01222BF-6B3D-43BD-B254-434031CB9887}.Release|Win32.Build.0 = Release|Win32
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index a9edbba0b9cdd689cf745086cc18c2c0e6e8a9e1..65200d3fdc1604cbc064ff681cf11565f21ba94b 100644 (file)
     <ClInclude Include="..\src\lib\AdapterDetection.h" />
     <ClInclude Include="..\src\lib\CECProcessor.h" />
     <ClInclude Include="..\src\lib\LibCEC.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="..\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" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\lib\AdapterCommunication.cpp" />
     <ClCompile Include="..\src\lib\LibCEC.cpp" />
     <ClCompile Include="..\src\lib\LibCECC.cpp" />
     <ClCompile Include="..\src\lib\LibCECDll.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" />
-  </ItemGroup>
-  <ItemGroup>
-    <Library Include="..\src\lib\libPlatform\pthread_win32\pthreadVC2.lib" />
-    <Library Include="..\src\lib\libPlatform\pthread_win32\pthreadVC2d.lib" />
+    <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>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}</ProjectGuid>
   </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;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4996;4100;4309</DisableSpecificWarnings>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(SolutionDir)\..\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;..\src\lib\platform\pthread_win32\pthreadVC2d.lib</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>libcmtd</IgnoreSpecificDefaultLibraries>
       <Version>2</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>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\src\lib\platform\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>
+      <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>
+      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;..\src\lib\platform\pthread_win32\pthreadVC2.lib</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>libcmt</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
index 2bc976f0ed3022b908412c8265f91632b23dc6df..7bd7b5949287ff97c75f54b1c38065713340803e 100644 (file)
     <ClInclude Include="..\src\lib\util\buffer.h">
       <Filter>util</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\util\misc.h">
-      <Filter>util</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\lib\util\StdString.h">
       <Filter>util</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\util\threads.h">
-      <Filter>util</Filter>
+    <ClInclude Include="..\include\CECExports.h">
+      <Filter>exports</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\libPlatform\os-dependent.h">
-      <Filter>platform</Filter>
+    <ClInclude Include="..\include\CECExportsCpp.h">
+      <Filter>exports</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\libPlatform\windows\dlfcn-win32.h">
-      <Filter>platform</Filter>
+    <ClInclude Include="..\include\CECTypes.h">
+      <Filter>exports</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\libPlatform\windows\os_windows.h">
-      <Filter>platform</Filter>
+    <ClInclude Include="..\include\CECExportsC.h">
+      <Filter>exports</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\libPlatform\pthread_win32\pthread.h">
+    <ClInclude Include="..\src\lib\AdapterCommunication.h" />
+    <ClInclude Include="..\src\lib\AdapterDetection.h" />
+    <ClInclude Include="..\src\lib\CECProcessor.h" />
+    <ClInclude Include="..\src\lib\LibCEC.h" />
+    <ClInclude Include="..\src\lib\platform\baudrate.h">
       <Filter>platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\libPlatform\pthread_win32\sched.h">
+    <ClInclude Include="..\src\lib\platform\os-dependent.h">
       <Filter>platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\libPlatform\pthread_win32\semaphore.h">
+    <ClInclude Include="..\src\lib\platform\serialport.h">
       <Filter>platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\CECExports.h">
-      <Filter>exports</Filter>
+    <ClInclude Include="..\src\lib\platform\threads.h">
+      <Filter>platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\CECExportsCpp.h">
-      <Filter>exports</Filter>
+    <ClInclude Include="..\src\lib\platform\timeutils.h">
+      <Filter>platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\CECTypes.h">
-      <Filter>exports</Filter>
+    <ClInclude Include="..\src\lib\platform\windows\dlfcn-win32.h">
+      <Filter>platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\libPlatform\serialport.h">
+    <ClInclude Include="..\src\lib\platform\windows\os_windows.h">
       <Filter>platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\util\timeutils.h">
-      <Filter>util</Filter>
+    <ClInclude Include="..\src\lib\platform\pthread_win32\pthread.h">
+      <Filter>platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\libPlatform\baudrate.h">
+    <ClInclude Include="..\src\lib\platform\pthread_win32\sched.h">
       <Filter>platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\CECExportsC.h">
-      <Filter>exports</Filter>
+    <ClInclude Include="..\src\lib\platform\pthread_win32\semaphore.h">
+      <Filter>platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\AdapterCommunication.h" />
-    <ClInclude Include="..\src\lib\AdapterDetection.h" />
-    <ClInclude Include="..\src\lib\CECProcessor.h" />
-    <ClInclude Include="..\src\lib\LibCEC.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\lib\util\misc.cpp">
-      <Filter>util</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\lib\util\threads.cpp">
-      <Filter>util</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\lib\libPlatform\windows\dlfcn-win32.cpp">
-      <Filter>platform</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\lib\libPlatform\windows\os_windows.cpp">
-      <Filter>platform</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\lib\libPlatform\windows\serialport.cpp">
-      <Filter>platform</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\lib\AdapterCommunication.cpp" />
     <ClCompile Include="..\src\lib\AdapterDetection.cpp" />
     <ClCompile Include="..\src\lib\CECProcessor.cpp" />
     <ClCompile Include="..\src\lib\LibCEC.cpp" />
     <ClCompile Include="..\src\lib\LibCECC.cpp" />
     <ClCompile Include="..\src\lib\LibCECDll.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Library Include="..\src\lib\libPlatform\pthread_win32\pthreadVC2.lib">
+    <ClCompile Include="..\src\lib\platform\threads.cpp">
       <Filter>platform</Filter>
-    </Library>
-    <Library Include="..\src\lib\libPlatform\pthread_win32\pthreadVC2d.lib">
+    </ClCompile>
+    <ClCompile Include="..\src\lib\platform\windows\dlfcn-win32.cpp">
+      <Filter>platform</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\lib\platform\windows\os_windows.cpp">
       <Filter>platform</Filter>
-    </Library>
+    </ClCompile>
+    <ClCompile Include="..\src\lib\platform\windows\serialport.cpp">
+      <Filter>platform</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
index caa2a0346fa1974ceee6d40bb6d8c415bfaff7b5..94c7f24c445f0fd7dd2d7a79ef451f5d2e67e3bb 100644 (file)
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <Optimization>Disabled</Optimization>
       <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</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\src\lib\platform\pthread_win32\pthreadVC2d.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)\..\$(TargetName)$(TargetExt)</OutputFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <Optimization>Full</Optimization>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <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</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>$(SolutionDir)\..\src\lib\platform\pthread_win32\pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\include\CECExports.h" />
     <ClInclude Include="..\include\CECExportsCpp.h" />
-    <ClInclude Include="..\src\lib\libPlatform\os-dependent.h" />
-    <ClInclude Include="..\src\lib\libPlatform\windows\os_windows.h" />
-    <ClInclude Include="..\src\lib\util\misc.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\util\StdString.h" />
-    <ClInclude Include="..\src\lib\util\threads.h" />
-    <ClInclude Include="..\src\lib\util\timeutils.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\lib\libPlatform\windows\os_windows.cpp" />
-    <ClCompile Include="..\src\lib\util\misc.cpp" />
-    <ClCompile Include="..\src\lib\util\threads.cpp" />
+    <ClCompile Include="..\src\lib\platform\threads.cpp" />
+    <ClCompile Include="..\src\lib\platform\windows\os_windows.cpp" />
     <ClCompile Include="..\src\testclient\main.cpp" />
   </ItemGroup>
-  <ItemGroup>
-    <Library Include="..\src\lib\libPlatform\pthread_win32\pthreadVC2.lib" />
-    <Library Include="..\src\lib\libPlatform\pthread_win32\pthreadVC2d.lib" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
index a6fda369cd14bc3c0c8831b4148258c32ceab5c9..76735fba1074b00476c70608ea3ef1e7fac80a84 100644 (file)
     <ClInclude Include="..\include\CECExportsCpp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\util\misc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\lib\util\threads.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\lib\util\StdString.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\util\timeutils.h">
+    <ClInclude Include="..\src\lib\platform\threads.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\libPlatform\os-dependent.h">
+    <ClInclude Include="..\src\lib\platform\os-dependent.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lib\libPlatform\windows\os_windows.h">
+    <ClInclude Include="..\src\lib\platform\windows\os_windows.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
     <ClCompile Include="..\src\testclient\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lib\util\misc.cpp">
+    <ClCompile Include="..\src\lib\platform\threads.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lib\util\threads.cpp">
+    <ClCompile Include="..\src\lib\platform\windows\os_windows.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lib\libPlatform\windows\os_windows.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Library Include="..\src\lib\libPlatform\pthread_win32\pthreadVC2.lib">
-      <Filter>Resource Files</Filter>
-    </Library>
-    <Library Include="..\src\lib\libPlatform\pthread_win32\pthreadVC2d.lib">
-      <Filter>Resource Files</Filter>
-    </Library>
   </ItemGroup>
 </Project>
\ No newline at end of file