projects fixes

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

6 files changed, 26 insertions, 47 deletions

diff --git a/plugins/ContactsPlus/contacts_10.vcxproj b/plugins/ContactsPlus/contacts_10.vcxproj
index 298be44287..77995e3bcc 100644
--- a/plugins/ContactsPlus/contacts_10.vcxproj
+++ b/plugins/ContactsPlus/contacts_10.vcxproj
@@ -63,8 +63,8 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <Optimization>Full</Optimization>

       <WarningLevel>Level3</WarningLevel>

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

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CONTACTS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

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

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>contacts.h</PrecompiledHeaderFile>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

@@ -94,8 +94,8 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <Optimization>Full</Optimization>

       <WarningLevel>Level3</WarningLevel>

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

-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;CONTACTS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

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

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

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>contacts.h</PrecompiledHeaderFile>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

@@ -126,8 +126,8 @@
       <WarningLevel>Level3</WarningLevel>

       <MinimalRebuild>true</MinimalRebuild>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

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

-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CONTACTS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

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

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>contacts.h</PrecompiledHeaderFile>

@@ -153,8 +153,8 @@
       <FunctionLevelLinking>false</FunctionLevelLinking>

       <Optimization>Disabled</Optimization>

       <WarningLevel>Level3</WarningLevel>

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

-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;CONTACTS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

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

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <ExceptionHandling>false</ExceptionHandling>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -175,7 +175,6 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="src\contacts.cpp" />

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

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

@@ -185,14 +184,17 @@
     <ClCompile Include="src\utils.cpp" />

   </ItemGroup>

   <ItemGroup>

+    <ClInclude Include="res\resource.h" />

     <ClInclude Include="src\contacts.h" />

     <ClInclude Include="src\receive.h" />

     <ClInclude Include="src\resource.h" />

     <ClInclude Include="src\send.h" />

     <ClInclude Include="src\utils.h" />

+    <ClInclude Include="src\Version.h" />

   </ItemGroup>

   <ItemGroup>

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

+    <ResourceCompile Include="res\Version.rc" />

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/ContactsPlus/contacts_10.vcxproj.filters b/plugins/ContactsPlus/contacts_10.vcxproj.filters
index 58f0006c24..3a30313414 100644
--- a/plugins/ContactsPlus/contacts_10.vcxproj.filters
+++ b/plugins/ContactsPlus/contacts_10.vcxproj.filters
@@ -15,9 +15,6 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="src\contacts.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

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

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -50,10 +47,19 @@
     <ClInclude Include="src\utils.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="src\Version.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="res\resource.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\contacts.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

+    <ResourceCompile Include="res\Version.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/ContactsPlus/contacts_11.vcxproj b/plugins/ContactsPlus/contacts_11.vcxproj
index e0b6366248..7e4dcbc16f 100644
--- a/plugins/ContactsPlus/contacts_11.vcxproj
+++ b/plugins/ContactsPlus/contacts_11.vcxproj
@@ -179,7 +179,6 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="src\contacts.cpp" />

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

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

diff --git a/plugins/ContactsPlus/contacts_11.vcxproj.filters b/plugins/ContactsPlus/contacts_11.vcxproj.filters
index 358161258b..3a30313414 100644
--- a/plugins/ContactsPlus/contacts_11.vcxproj.filters
+++ b/plugins/ContactsPlus/contacts_11.vcxproj.filters
@@ -15,9 +15,6 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="src\contacts.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

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

       <Filter>Source Files</Filter>

     </ClCompile>

diff --git a/plugins/ContactsPlus/src/contacts.cpp b/plugins/ContactsPlus/src/contacts.cpp
deleted file mode 100644
index a7ba2cdfbb..0000000000
--- a/plugins/ContactsPlus/src/contacts.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// --------------------------------------------------------------------------

-//                Contacts+ for Miranda Instant Messenger

-//                _______________________________________

-// 

-// Copyright © 2002 Dominus Procellarum 

-// Copyright © 2004-2008 Joe Kucera

-// 

-// This program is free software; you can redistribute it and/or

-// modify it under the terms of the GNU General Public License

-// as published by the Free Software Foundation; either version 2

-// of the License, or (at your option) any later version.

-// 

-// This program is distributed in the hope that it will be useful,

-// but WITHOUT ANY WARRANTY; without even the implied warranty of

-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-// GNU General Public License for more details.

-// 

-// You should have received a copy of the GNU General Public License

-// along with this program; if not, write to the Free Software

-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-//

-// -----------------------------------------------------------------------------

-

-#include "contacts.h"

-

-

-bool WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

-{

-  hInst = hinstDLL;

-  return TRUE;

-}

diff --git a/plugins/ContactsPlus/src/main.cpp b/plugins/ContactsPlus/src/main.cpp
index a7e3855232..84c42bca68 100644
--- a/plugins/ContactsPlus/src/main.cpp
+++ b/plugins/ContactsPlus/src/main.cpp
@@ -59,6 +59,12 @@ PLUGININFOEX pluginInfo = {
 	{0x0324785E, 0x74CE, 0x4600, {0xB7, 0x81, 0x85, 0x17, 0x73, 0xB3, 0xEF, 0xC5}}

 };

 

+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

+{

+  hInst = hinstDLL;

+  return TRUE;

+}

+

 static int HookDBEventAdded(WPARAM wParam, LPARAM lParam)

 {

   HANDLE hContact = (HANDLE)wParam;