summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2015-04-24 21:10:03 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2015-04-24 21:10:03 +0000
commitd41cb4808c648d458be7615d6a72003e3614538d (patch)
treea24750dd6b7a5a80ef02dd09ec31152e1198fd99
parenta7fd1ec72196095ebeef4cc67cde5135c2d1d9a8 (diff)
AssocMgr - common project
git-svn-id: http://svn.miranda-ng.org/main/trunk@13109 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/AssocMgr/assocmgr.vcxproj28
-rw-r--r--plugins/AssocMgr/assocmgr.vcxproj.filters4
-rw-r--r--plugins/AssocMgr/assocmgr_10.vcxproj12
-rw-r--r--plugins/AssocMgr/assocmgr_10.vcxproj.user3
-rw-r--r--plugins/AssocMgr/assocmgr_12.vcxproj12
-rw-r--r--plugins/AssocMgr/src/assoclist.cpp2
-rw-r--r--plugins/AssocMgr/src/dde.cpp2
-rw-r--r--plugins/AssocMgr/src/main.cpp6
-rw-r--r--plugins/AssocMgr/src/reg.cpp2
-rw-r--r--plugins/AssocMgr/src/stdafx.cxx (renamed from plugins/AssocMgr/src/stdafx.cpp)2
-rw-r--r--plugins/AssocMgr/src/stdafx.h (renamed from plugins/AssocMgr/src/common.h)2
-rw-r--r--plugins/AssocMgr/src/test.cpp2
-rw-r--r--plugins/AssocMgr/src/utils.cpp2
13 files changed, 56 insertions, 23 deletions
diff --git a/plugins/AssocMgr/assocmgr.vcxproj b/plugins/AssocMgr/assocmgr.vcxproj
new file mode 100644
index 0000000000..895996cde7
--- /dev/null
+++ b/plugins/AssocMgr/assocmgr.vcxproj
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <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>AssocMgr</ProjectName>
+ <ProjectGuid>{B57D997C-73E1-D5F7-ECCA-C204345C04A3}</ProjectGuid>
+ </PropertyGroup>
+ <ImportGroup Label="PropertySheets">
+ <Import Project="$(ProjectDir)..\..\build\vc.common\common.props" />
+ </ImportGroup>
+</Project> \ No newline at end of file
diff --git a/plugins/AssocMgr/assocmgr.vcxproj.filters b/plugins/AssocMgr/assocmgr.vcxproj.filters
new file mode 100644
index 0000000000..de5ad9f66c
--- /dev/null
+++ b/plugins/AssocMgr/assocmgr.vcxproj.filters
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
+</Project> \ No newline at end of file
diff --git a/plugins/AssocMgr/assocmgr_10.vcxproj b/plugins/AssocMgr/assocmgr_10.vcxproj
index fd3b49ef01..487a4b1bd5 100644
--- a/plugins/AssocMgr/assocmgr_10.vcxproj
+++ b/plugins/AssocMgr/assocmgr_10.vcxproj
@@ -81,7 +81,7 @@
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>Use</PrecompiledHeader>
- <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
<ExceptionHandling>false</ExceptionHandling>
</ClCompile>
<ResourceCompile>
@@ -110,7 +110,7 @@
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>Use</PrecompiledHeader>
- <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
<ExceptionHandling>false</ExceptionHandling>
</ClCompile>
<ResourceCompile>
@@ -139,7 +139,7 @@
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<PrecompiledHeader>Use</PrecompiledHeader>
- <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
<ExceptionHandling>false</ExceptionHandling>
</ClCompile>
<ResourceCompile>
@@ -171,7 +171,7 @@
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<PrecompiledHeader>Use</PrecompiledHeader>
- <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
<ExceptionHandling>false</ExceptionHandling>
</ClCompile>
<ResourceCompile>
@@ -195,7 +195,7 @@
<ItemGroup>
<ClCompile Include="src\assoclist.cpp" />
<ClCompile Include="src\dde.cpp" />
- <ClCompile Include="src\stdafx.cpp">
+ <ClCompile Include="src\stdafx.cxx">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="src\reg.cpp" />
@@ -205,12 +205,12 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\assoclist.h" />
- <ClInclude Include="src\common.h" />
<ClInclude Include="src\dde.h" />
<ClInclude Include="src\reg.h" />
<ClInclude Include="src\test.h" />
<ClInclude Include="src\utils.h" />
<ClInclude Include="src\resource.h" />
+ <ClInclude Include="src\stdafx.h" />
<ClInclude Include="src\version.h" />
</ItemGroup>
<ItemGroup>
diff --git a/plugins/AssocMgr/assocmgr_10.vcxproj.user b/plugins/AssocMgr/assocmgr_10.vcxproj.user
new file mode 100644
index 0000000000..695b5c78b9
--- /dev/null
+++ b/plugins/AssocMgr/assocmgr_10.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project> \ No newline at end of file
diff --git a/plugins/AssocMgr/assocmgr_12.vcxproj b/plugins/AssocMgr/assocmgr_12.vcxproj
index 9c2b02d30f..d2631a31a1 100644
--- a/plugins/AssocMgr/assocmgr_12.vcxproj
+++ b/plugins/AssocMgr/assocmgr_12.vcxproj
@@ -85,7 +85,7 @@
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>Use</PrecompiledHeader>
- <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
<ExceptionHandling>false</ExceptionHandling>
</ClCompile>
<ResourceCompile>
@@ -115,7 +115,7 @@
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>Use</PrecompiledHeader>
- <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
<ExceptionHandling>false</ExceptionHandling>
</ClCompile>
<ResourceCompile>
@@ -144,7 +144,7 @@
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<PrecompiledHeader>Use</PrecompiledHeader>
- <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
<ExceptionHandling>false</ExceptionHandling>
</ClCompile>
<ResourceCompile>
@@ -175,7 +175,7 @@
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<PrecompiledHeader>Use</PrecompiledHeader>
- <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
<ExceptionHandling>false</ExceptionHandling>
</ClCompile>
<ResourceCompile>
@@ -198,7 +198,7 @@
<ItemGroup>
<ClCompile Include="src\assoclist.cpp" />
<ClCompile Include="src\dde.cpp" />
- <ClCompile Include="src\stdafx.cpp">
+ <ClCompile Include="src\stdafx.cxx">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="src\reg.cpp" />
@@ -208,12 +208,12 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\assoclist.h" />
- <ClInclude Include="src\common.h" />
<ClInclude Include="src\dde.h" />
<ClInclude Include="src\reg.h" />
<ClInclude Include="src\test.h" />
<ClInclude Include="src\utils.h" />
<ClInclude Include="src\resource.h" />
+ <ClInclude Include="src\stdafx.h" />
<ClInclude Include="src\version.h" />
</ItemGroup>
<ItemGroup>
diff --git a/plugins/AssocMgr/src/assoclist.cpp b/plugins/AssocMgr/src/assoclist.cpp
index cc343e2f45..b941acf106 100644
--- a/plugins/AssocMgr/src/assoclist.cpp
+++ b/plugins/AssocMgr/src/assoclist.cpp
@@ -19,7 +19,7 @@ along with this program (AssocMgr-License.txt); if not, write to the Free Softw
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "common.h"
+#include "stdafx.h"
/* Options */
extern HINSTANCE hInst;
diff --git a/plugins/AssocMgr/src/dde.cpp b/plugins/AssocMgr/src/dde.cpp
index 5ffc17add7..5fb674b22a 100644
--- a/plugins/AssocMgr/src/dde.cpp
+++ b/plugins/AssocMgr/src/dde.cpp
@@ -19,7 +19,7 @@ along with this program (AssocMgr-License.txt); if not, write to the Free Softwa
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "common.h"
+#include "stdafx.h"
/* Conversation */
extern HINSTANCE hInst;
diff --git a/plugins/AssocMgr/src/main.cpp b/plugins/AssocMgr/src/main.cpp
index fcf1d3543e..4d57f89a76 100644
--- a/plugins/AssocMgr/src/main.cpp
+++ b/plugins/AssocMgr/src/main.cpp
@@ -19,7 +19,7 @@ along with this program (AssocMgr-License.txt); if not, write to the Free Softwa
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "common.h"
+#include "stdafx.h"
HINSTANCE hInst;
static HANDLE hHookModulesLoaded;
@@ -39,7 +39,7 @@ PLUGININFOEX pluginInfo = {
{0x52685cd7, 0xec7, 0x44c1, {0xa1, 0xa6, 0x38, 0x16, 0x12, 0x41, 0x82, 0x2}}
};
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID)
{
hInst = hinstDLL;
return TRUE;
@@ -82,7 +82,7 @@ static int AssocMgrModulesLoaded(WPARAM,LPARAM)
return 0;
}
-extern "C" __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
+extern "C" __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD)
{
return &pluginInfo;
}
diff --git a/plugins/AssocMgr/src/reg.cpp b/plugins/AssocMgr/src/reg.cpp
index 0dcb9eae85..5ebba3dea9 100644
--- a/plugins/AssocMgr/src/reg.cpp
+++ b/plugins/AssocMgr/src/reg.cpp
@@ -19,7 +19,7 @@ along with this program (AssocMgr-License.txt); if not, write to the Free Softwa
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "common.h"
+#include "stdafx.h"
extern HINSTANCE hInst;
diff --git a/plugins/AssocMgr/src/stdafx.cpp b/plugins/AssocMgr/src/stdafx.cxx
index c5fe5abaad..6fb37564b7 100644
--- a/plugins/AssocMgr/src/stdafx.cpp
+++ b/plugins/AssocMgr/src/stdafx.cxx
@@ -15,4 +15,4 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "common.h" \ No newline at end of file
+#include "stdafx.h" \ No newline at end of file
diff --git a/plugins/AssocMgr/src/common.h b/plugins/AssocMgr/src/stdafx.h
index c7ea172927..89cf724b45 100644
--- a/plugins/AssocMgr/src/common.h
+++ b/plugins/AssocMgr/src/stdafx.h
@@ -19,8 +19,6 @@ along with this program (AssocMgr-License.txt); if not, write to the Free Softwa
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#define _CRT_SECURE_NO_WARNINGS
-#define _WIN32_WINNT 0x0600
#include <shlobj.h> /* for SHChangeNotify() */
#include <Vssym32.h>
#include <malloc.h>
diff --git a/plugins/AssocMgr/src/test.cpp b/plugins/AssocMgr/src/test.cpp
index 70642bd272..f5c404fcc1 100644
--- a/plugins/AssocMgr/src/test.cpp
+++ b/plugins/AssocMgr/src/test.cpp
@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
// -- Includes
-#include "common.h"
+#include "stdafx.h"
/*
#define AIM_SUPPORT_TEST
diff --git a/plugins/AssocMgr/src/utils.cpp b/plugins/AssocMgr/src/utils.cpp
index d1d5dad270..5c6d08da24 100644
--- a/plugins/AssocMgr/src/utils.cpp
+++ b/plugins/AssocMgr/src/utils.cpp
@@ -19,7 +19,7 @@ along with this program (AssocMgr-License.txt); if not, write to the Free Softwa
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "common.h"
+#include "stdafx.h"
/************************* String Conv ****************************/