projects cleanup

git-svn-id: http://svn.miranda-ng.org/main/trunk@192 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

5 files changed, 114 insertions, 102 deletions

diff --git a/plugins/CountryFlags/Info_Src.txt b/plugins/CountryFlags/docs/Info_Src.txt
index 5c1b19be88..5c1b19be88 100644
--- a/plugins/CountryFlags/Info_Src.txt
+++ b/plugins/CountryFlags/docs/Info_Src.txt
diff --git a/plugins/CountryFlags/License_Appendix.txt b/plugins/CountryFlags/docs/License_Appendix.txt
index c590c3f5fb..c590c3f5fb 100644
--- a/plugins/CountryFlags/License_Appendix.txt
+++ b/plugins/CountryFlags/docs/License_Appendix.txt
diff --git a/plugins/CountryFlags/flags.def b/plugins/CountryFlags/flags.def
deleted file mode 100644
index fb2cd5c0ef..0000000000
--- a/plugins/CountryFlags/flags.def
+++ /dev/null
@@ -1,11 +0,0 @@
-LIBRARY flags BASE=0x24200000

-SECTIONS

-   ; obfuscated email address

-   .rdata READ WRITE

-EXPORTS

-   MirandaPluginInfo PRIVATE

-   Load PRIVATE

-   Unload PRIVATE

-   ; v0.8 support

-   MirandaPluginInfoEx PRIVATE

-   MirandaPluginInterfaces PRIVATE

diff --git a/plugins/CountryFlags/flags.vcxproj b/plugins/CountryFlags/flags.vcxproj
index ecc5b700e8..a960f38851 100644
--- a/plugins/CountryFlags/flags.vcxproj
+++ b/plugins/CountryFlags/flags.vcxproj
@@ -5,26 +5,39 @@
       <Configuration>Debug</Configuration>

       <Platform>Win32</Platform>

     </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

     <ProjectConfiguration Include="Release|Win32">

       <Configuration>Release</Configuration>

       <Platform>Win32</Platform>

     </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

   </ItemGroup>

   <PropertyGroup Label="Globals">

-    <SccProjectName />

-    <SccLocalPath />

     <ProjectName>Flags</ProjectName>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>Unicode</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

     <CharacterSet>Unicode</CharacterSet>

     <WholeProgramOptimization>true</WholeProgramOptimization>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

     <CharacterSet>Unicode</CharacterSet>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

@@ -34,64 +47,81 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

     <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />

   </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />

+  </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

     <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />

   </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />

+  </ImportGroup>

   <PropertyGroup Label="UserMacros" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <OutDir>$(SolutionDir)$(Configuration)/Plugins\</OutDir>

-    <IntDir>$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>

-    <IgnoreImportLibrary>true</IgnoreImportLibrary>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <OutDir>$(SolutionDir)$(Configuration)/Plugins\</OutDir>

-    <IntDir>$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>

-    <LinkIncremental>false</LinkIncremental>

-    <IgnoreImportLibrary>true</IgnoreImportLibrary>

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreImportLibrary>

+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</IgnoreImportLibrary>

+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary>

+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</IgnoreImportLibrary>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <FunctionLevelLinking>false</FunctionLevelLinking>

       <Optimization>Disabled</Optimization>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <WarningLevel>Level4</WarningLevel>

-      <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <WarningLevel>Level3</WarningLevel>

+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_DEBUG;UNICODE;WIN32;_WINDOWS;_USRDLL;STRICT;FLAGS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <UndefinePreprocessorDefinitions>_MBCS;NO_STRICT;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>

-      <BrowseInformation>true</BrowseInformation>

-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ResourceCompile>

+    <Link>

+      <LinkDLL>true</LinkDLL>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <BaseAddress>0x24200000</BaseAddress>

+      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <ClCompile>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <FunctionLevelLinking>false</FunctionLevelLinking>

+      <Optimization>Disabled</Optimization>

+      <WarningLevel>Level3</WarningLevel>

+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;UNICODE;WIN64;_WINDOWS;_USRDLL;STRICT;FLAGS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

     </ClCompile>

-    <Midl>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <TypeLibraryName>.\temp/Debug/Unicode\flags.tlb</TypeLibraryName>

-      <MkTypLibCompatible>true</MkTypLibCompatible>

-      <TargetEnvironment>Win32</TargetEnvironment>

-    </Midl>

     <ResourceCompile>

-      <Culture>0x0809</Culture>

-      <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_DEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

     </ResourceCompile>

-    <Bscmake>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <OutputFile>$(IntDir)$(TargetName).bsc</OutputFile>

-    </Bscmake>

     <Link>

       <LinkDLL>true</LinkDLL>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <IgnoreSpecificDefaultLibraries>uuid.lib;OLDNAMES;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

-      <ModuleDefinitionFile>flags.def</ModuleDefinitionFile>

+      <SubSystem>Windows</SubSystem>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <BaseAddress>0x24200000</BaseAddress>

       <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <AdditionalOptions>

-      </AdditionalOptions>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

@@ -101,70 +131,63 @@
       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <Optimization>Full</Optimization>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <WarningLevel>Level4</WarningLevel>

-      <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <WarningLevel>Level3</WarningLevel>

+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>NDEBUG;UNICODE;WIN32;_WINDOWS;_USRDLL;STRICT;ASSOCMGR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <UndefinePreprocessorDefinitions>_MBCS;NO_STRICT;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>

-      <BrowseInformation>true</BrowseInformation>

-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>

-      <AdditionalOptions> /opt:nowin98 </AdditionalOptions>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

-    <Midl>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <TypeLibraryName>.\temp/Release/Unicode\flags.tlb</TypeLibraryName>

-      <MkTypLibCompatible>false</MkTypLibCompatible>

-      <TargetEnvironment>Win32</TargetEnvironment>

-    </Midl>

     <ResourceCompile>

-      <Culture>0x0809</Culture>

-      <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>NDEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

     </ResourceCompile>

-    <Bscmake>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <OutputFile>$(IntDir)$(TargetName).bsc</OutputFile>

-    </Bscmake>

     <Link>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

       <LinkDLL>true</LinkDLL>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <IgnoreSpecificDefaultLibraries>uuid.lib;OLDNAMES;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

-      <ModuleDefinitionFile>flags.def</ModuleDefinitionFile>

+      <SubSystem>Windows</SubSystem>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

-      <SetChecksum>true</SetChecksum>

       <BaseAddress>0x24200000</BaseAddress>

       <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <AdditionalOptions>/ignore:4078 </AdditionalOptions>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

   </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="countrylistext.c">

-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /opt:ref /opt:nowin98   /opt:ref /opt:nowin98 </AdditionalOptions>

-    </ClCompile>

-    <ClCompile Include="extraimg.c">

-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /opt:ref /opt:nowin98   /opt:ref /opt:nowin98 </AdditionalOptions>

-    </ClCompile>

-    <ClCompile Include="huffman.c">

-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /opt:ref /opt:nowin98   /opt:ref /opt:nowin98 </AdditionalOptions>

-    </ClCompile>

-    <ClCompile Include="icons.c">

-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /opt:ref /opt:nowin98   /opt:ref /opt:nowin98 </AdditionalOptions>

-    </ClCompile>

-    <ClCompile Include="ip2country.c">

-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /opt:ref /opt:nowin98   /opt:ref /opt:nowin98 </AdditionalOptions>

-    </ClCompile>

-    <ClCompile Include="main.c">

-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /opt:ref /opt:nowin98   /opt:ref /opt:nowin98 </AdditionalOptions>

-    </ClCompile>

-    <ClCompile Include="utils.c">

-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /opt:ref /opt:nowin98   /opt:ref /opt:nowin98 </AdditionalOptions>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <ClCompile>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <StringPooling>true</StringPooling>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <Optimization>Full</Optimization>

+      <WarningLevel>Level3</WarningLevel>

+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;UNICODE;WIN64;_WINDOWS;_USRDLL;STRICT;ASSOCMGR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

+    <ResourceCompile>

+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ResourceCompile>

+    <Link>

+      <LinkDLL>true</LinkDLL>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <BaseAddress>0x24200000</BaseAddress>

+      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="countrylistext.c" />

+    <ClCompile Include="extraimg.c" />

+    <ClCompile Include="huffman.c" />

+    <ClCompile Include="icons.c" />

+    <ClCompile Include="ip2country.c" />

+    <ClCompile Include="main.c" />

+    <ClCompile Include="utils.c" />

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="flags.h" />

@@ -180,8 +203,8 @@
     <CustomBuild Include="docs\Flags-License.txt" />

     <CustomBuild Include="docs\Flags-Readme.txt" />

     <CustomBuild Include="docs\Flags-Translation.txt" />

-    <CustomBuild Include="Info_Src.txt" />

-    <CustomBuild Include="License_Appendix.txt" />

+    <CustomBuild Include="docs\Info_Src.txt" />

+    <CustomBuild Include="docs\License_Appendix.txt" />

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="resource.rc" />

diff --git a/plugins/CountryFlags/flags.vcxproj.filters b/plugins/CountryFlags/flags.vcxproj.filters
index 6c8dd783f4..0b799465fd 100644
--- a/plugins/CountryFlags/flags.vcxproj.filters
+++ b/plugins/CountryFlags/flags.vcxproj.filters
@@ -76,10 +76,10 @@
     <CustomBuild Include="docs\Flags-Translation.txt">

       <Filter>Documentation</Filter>

     </CustomBuild>

-    <CustomBuild Include="Info_Src.txt">

+    <CustomBuild Include="docs\Info_Src.txt">

       <Filter>Documentation</Filter>

     </CustomBuild>

-    <CustomBuild Include="License_Appendix.txt">

+    <CustomBuild Include="docs\License_Appendix.txt">

       <Filter>Documentation</Filter>

     </CustomBuild>

   </ItemGroup>