Fixed compilation of standalone plugins (thx robyer)

Xfire protocol added to solutions (no 64-bit yet)

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

2 files changed, 110 insertions, 15 deletions

diff --git a/protocols/Xfire/res/resource.rc b/protocols/Xfire/res/resource.rc
index 928c9d8383..e95dd6af2f 100644
--- a/protocols/Xfire/res/resource.rc
+++ b/protocols/Xfire/res/resource.rc
@@ -28,11 +28,9 @@
 #define IDC_GRP10 1001

 #define IDC_STC27 1002

 #define IDC_GRP11 1005

-#define IDC_STC15 1003

 #define IDC_STC34 1001

 #define IDC_IMG2 1002

 #define IDC_STC35 1003

-#define IDC_STC14 1001

 #define IDC_STC36 1001

 #define IDC_STC37 1003

 #define IDC_STC38 1005

diff --git a/protocols/Xfire/xfire.vcxproj b/protocols/Xfire/xfire.vcxproj
index 473b44fb20..98cb364a5d 100644
--- a/protocols/Xfire/xfire.vcxproj
+++ b/protocols/Xfire/xfire.vcxproj
@@ -5,13 +5,21 @@
       <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">

-    <ProjectName>xfire</ProjectName>

+    <ProjectName>Xfire</ProjectName>

     <ProjectGuid>{E4CD8BBA-B580-4584-AC3E-B4E9915026AE}</ProjectGuid>

     <RootNamespace>xFire</RootNamespace>

     <Keyword>Win32Proj</Keyword>

@@ -20,29 +28,53 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

     <CharacterSet>NotSet</CharacterSet>

-    <WholeProgramOptimization>false</WholeProgramOptimization>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>NotSet</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

   </PropertyGroup>

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

     <ConfigurationType>DynamicLibrary</ConfigurationType>

     <CharacterSet>NotSet</CharacterSet>

   </PropertyGroup>

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>NotSet</CharacterSet>

+  </PropertyGroup>

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

   <ImportGroup Label="ExtensionSettings">

   </ImportGroup>

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

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

   </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" />

+  </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" />

   </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" />

+  </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>

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

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

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

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>

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

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

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

     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

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

     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>

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

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

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

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

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

   </PropertyGroup>

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

     <ClCompile>

@@ -51,7 +83,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;PTW32_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

@@ -61,21 +93,49 @@
       <AdditionalDependencies>kernel32.lib</AdditionalDependencies>

       <OutputFile>$(OutDir)XFire.dll</OutputFile>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

+      <SubSystem>Windows</SubSystem>

       <TargetMachine>MachineX86</TargetMachine>

-      <AdditionalLibraryDirectories>$(SolutionDir)\lib;..\..\bin10\lib</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

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

     </Link>

+    <ResourceCompile>

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

+    </ResourceCompile>

+  </ItemDefinitionGroup>

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

+    <ClCompile>

+      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>

+      <Optimization>Disabled</Optimization>

+      <PreprocessorDefinitions>WIN64;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;PTW32_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

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

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>kernel32.lib</AdditionalDependencies>

+      <OutputFile>$(OutDir)XFire.dll</OutputFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

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

+    </Link>

+    <ResourceCompile>

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

+    </ResourceCompile>

   </ItemDefinitionGroup>

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

     <ClCompile>

       <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>

       <Optimization>Full</Optimization>

-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <WholeProgramOptimization>true</WholeProgramOptimization>

       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;PTW32_STATIC_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <ExceptionHandling>Sync</ExceptionHandling>

       <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <BufferSecurityCheck>true</BufferSecurityCheck>

       <FloatingPointModel>Fast</FloatingPointModel>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -88,17 +148,52 @@
       <AdditionalDependencies>kernel32.lib</AdditionalDependencies>

       <OutputFile>$(OutDir)XFire.dll</OutputFile>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <GenerateMapFile>true</GenerateMapFile>

-      <MapExports>true</MapExports>

       <SubSystem>Windows</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <BaseAddress>

       </BaseAddress>

-      <ImportLibrary>$(TargetDir)$XFire.lib</ImportLibrary>

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

       <TargetMachine>MachineX86</TargetMachine>

-      <AdditionalLibraryDirectories>$(SolutionDir)\lib;..\..\bin10\lib</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

+    </Link>

+    <ResourceCompile>

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

+    </ResourceCompile>

+  </ItemDefinitionGroup>

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

+    <ClCompile>

+      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>

+      <Optimization>Full</Optimization>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <WholeProgramOptimization>true</WholeProgramOptimization>

+      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;PTW32_STATIC_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <ExceptionHandling>Sync</ExceptionHandling>

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <BufferSecurityCheck>true</BufferSecurityCheck>

+      <FloatingPointModel>Fast</FloatingPointModel>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>OldStyle</DebugInformationFormat>

+      <ErrorReporting>None</ErrorReporting>

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

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>kernel32.lib</AdditionalDependencies>

+      <OutputFile>$(OutDir)XFire.dll</OutputFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <BaseAddress>

+      </BaseAddress>

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

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

     </Link>

+    <ResourceCompile>

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

+    </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

     <ResourceCompile Include="res\resource.rc" />

@@ -174,7 +269,9 @@
     <ClCompile Include="src\socket.cpp" />

     <ClCompile Include="src\stdafx.cpp">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>

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

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>

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

     </ClCompile>

     <ClCompile Include="src\variablevalue.cpp" />

     <ClCompile Include="src\xfireclanpacket.cpp" />