- EmLanProto: added to full solution files

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

3 files changed, 39 insertions, 4 deletions

diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index 7d0e02d7aa..f10c9b7cbc 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -355,6 +355,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NoHistory", "..\plugins\NoH
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NotesReminders", "..\plugins\NotesAndReminders\NotesReminders.vcxproj", "{EEB57129-946C-4B98-8856-FDA501AE2A5E}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EmLanProto", "..\protocols\EmLanProto\amdproto.vcxproj", "{2115FEBC-1EC4-4F95-A058-A523ED5295A4}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -1571,6 +1573,14 @@ Global
 		{EEB57129-946C-4B98-8856-FDA501AE2A5E}.Release|Win32.Build.0 = Release|Win32

 		{EEB57129-946C-4B98-8856-FDA501AE2A5E}.Release|x64.ActiveCfg = Release|x64

 		{EEB57129-946C-4B98-8856-FDA501AE2A5E}.Release|x64.Build.0 = Release|x64

+		{2115FEBC-1EC4-4F95-A058-A523ED5295A4}.Debug|Win32.ActiveCfg = Debug|Win32

+		{2115FEBC-1EC4-4F95-A058-A523ED5295A4}.Debug|Win32.Build.0 = Debug|Win32

+		{2115FEBC-1EC4-4F95-A058-A523ED5295A4}.Debug|x64.ActiveCfg = Debug|x64

+		{2115FEBC-1EC4-4F95-A058-A523ED5295A4}.Debug|x64.Build.0 = Debug|x64

+		{2115FEBC-1EC4-4F95-A058-A523ED5295A4}.Release|Win32.ActiveCfg = Release|Win32

+		{2115FEBC-1EC4-4F95-A058-A523ED5295A4}.Release|Win32.Build.0 = Release|Win32

+		{2115FEBC-1EC4-4F95-A058-A523ED5295A4}.Release|x64.ActiveCfg = Release|x64

+		{2115FEBC-1EC4-4F95-A058-A523ED5295A4}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln
index 3cf696c838..11d9aca170 100644
--- a/bin10/mir_full_pro.sln
+++ b/bin10/mir_full_pro.sln
@@ -391,6 +391,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NoHistory", "..\plugins\NoH
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NotesReminders", "..\plugins\NotesAndReminders\NotesReminders.vcxproj", "{EEB57129-946C-4B98-8856-FDA501AE2A5E}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EmLanProto", "..\protocols\EmLanProto\amdproto.vcxproj", "{2115FEBC-1EC4-4F95-A058-A523ED5295A4}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -1607,6 +1609,14 @@ Global
 		{EEB57129-946C-4B98-8856-FDA501AE2A5E}.Release|Win32.Build.0 = Release|Win32

 		{EEB57129-946C-4B98-8856-FDA501AE2A5E}.Release|x64.ActiveCfg = Release|x64

 		{EEB57129-946C-4B98-8856-FDA501AE2A5E}.Release|x64.Build.0 = Release|x64

+		{2115FEBC-1EC4-4F95-A058-A523ED5295A4}.Debug|Win32.ActiveCfg = Debug|Win32

+		{2115FEBC-1EC4-4F95-A058-A523ED5295A4}.Debug|Win32.Build.0 = Debug|Win32

+		{2115FEBC-1EC4-4F95-A058-A523ED5295A4}.Debug|x64.ActiveCfg = Debug|x64

+		{2115FEBC-1EC4-4F95-A058-A523ED5295A4}.Debug|x64.Build.0 = Debug|x64

+		{2115FEBC-1EC4-4F95-A058-A523ED5295A4}.Release|Win32.ActiveCfg = Release|Win32

+		{2115FEBC-1EC4-4F95-A058-A523ED5295A4}.Release|Win32.Build.0 = Release|Win32

+		{2115FEBC-1EC4-4F95-A058-A523ED5295A4}.Release|x64.ActiveCfg = Release|x64

+		{2115FEBC-1EC4-4F95-A058-A523ED5295A4}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

@@ -1687,6 +1697,7 @@ Global
 		{736E59E5-CDCE-4C88-9C3A-E7913D45C9EC} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}

 		{F3208C96-3C21-46AA-8695-C794E28CDC34} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}

 		{E4CD8BBA-B580-4584-AC3E-B4E9915026AE} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}

+		{2115FEBC-1EC4-4F95-A058-A523ED5295A4} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}

 		{987F026D-EB1F-4013-ADA8-2406ACCDA526} = {0D22875F-6B96-49C3-BA4F-D7E573A1515B}

 		{D9057E63-AAAA-4FE7-800A-20C02F4761F3} = {0D22875F-6B96-49C3-BA4F-D7E573A1515B}

 		{56997126-0098-407A-94E1-7C5748C1C9EF} = {0D22875F-6B96-49C3-BA4F-D7E573A1515B}

diff --git a/protocols/EmLanProto/amdproto.vcxproj b/protocols/EmLanProto/amdproto.vcxproj
index 331d399c02..ee087a870e 100644
--- a/protocols/EmLanProto/amdproto.vcxproj
+++ b/protocols/EmLanProto/amdproto.vcxproj
@@ -92,10 +92,13 @@
       <ProgramDatabaseFile>$(OutDir)amdproto.pdb</ProgramDatabaseFile>

       <SubSystem>Windows</SubSystem>

       <BaseAddress>0x22000000</BaseAddress>

-      <ImportLibrary>$(OutDir)amdproto.lib</ImportLibrary>

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

       <TargetMachine>MachineX86</TargetMachine>

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

     </Link>

+    <ResourceCompile>

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

+    </ResourceCompile>

   </ItemDefinitionGroup>

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

     <ClCompile>

@@ -115,9 +118,12 @@
       <ProgramDatabaseFile>$(OutDir)amdproto.pdb</ProgramDatabaseFile>

       <SubSystem>Windows</SubSystem>

       <BaseAddress>0x22000000</BaseAddress>

-      <ImportLibrary>$(OutDir)amdproto.lib</ImportLibrary>

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

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

     </Link>

+    <ResourceCompile>

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

+    </ResourceCompile>

   </ItemDefinitionGroup>

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

     <ClCompile>

@@ -139,11 +145,15 @@
       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <BaseAddress>0x22000000</BaseAddress>

-      <ImportLibrary>$(OutDir)amdproto.lib</ImportLibrary>

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

       <TargetMachine>MachineX86</TargetMachine>

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

+      <AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>

     </Link>

+    <ResourceCompile>

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

+    </ResourceCompile>

   </ItemDefinitionGroup>

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

     <ClCompile>

@@ -166,9 +176,13 @@
       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <BaseAddress>0x22000000</BaseAddress>

-      <ImportLibrary>$(OutDir)amdproto.lib</ImportLibrary>

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

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

+      <AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>

     </Link>

+    <ResourceCompile>

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

+    </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

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