project fixes

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

3 files changed, 33 insertions, 22 deletions

diff --git a/plugins/Bass_interface/Bass_interface.vcxproj b/plugins/Bass_interface/Bass_interface.vcxproj
index 8493bc6291..587bdb09c3 100644
--- a/plugins/Bass_interface/Bass_interface.vcxproj
+++ b/plugins/Bass_interface/Bass_interface.vcxproj
@@ -81,6 +81,10 @@
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

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

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

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

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

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

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

   </PropertyGroup>

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

     <ClCompile>

@@ -89,10 +93,9 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BASS_INTERFACE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <CompileAs>CompileAsC</CompileAs>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <Link>

@@ -100,17 +103,18 @@
       <SubSystem>Windows</SubSystem>

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

     </Link>

+    <ResourceCompile>

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

+    </ResourceCompile>

   </ItemDefinitionGroup>

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

     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <CompileAs>CompileAsC</CompileAs>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <Link>

@@ -118,6 +122,9 @@
       <SubSystem>Windows</SubSystem>

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

     </Link>

+    <ResourceCompile>

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

+    </ResourceCompile>

   </ItemDefinitionGroup>

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

     <ClCompile>

@@ -135,7 +142,6 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <FloatingPointModel>Fast</FloatingPointModel>

       <WarningLevel>Level3</WarningLevel>

-      <CompileAs>CompileAsC</CompileAs>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <Link>

@@ -145,6 +151,9 @@
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <GenerateDebugInformation>true</GenerateDebugInformation>

     </Link>

+    <ResourceCompile>

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

+    </ResourceCompile>

   </ItemDefinitionGroup>

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

     <ClCompile>

@@ -153,7 +162,7 @@
       <IntrinsicFunctions>false</IntrinsicFunctions>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

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

       <StringPooling>true</StringPooling>

       <ExceptionHandling>

       </ExceptionHandling>

@@ -162,7 +171,6 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <FloatingPointModel>Fast</FloatingPointModel>

       <WarningLevel>Level3</WarningLevel>

-      <CompileAs>CompileAsC</CompileAs>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <Link>

@@ -172,11 +180,11 @@
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <GenerateDebugInformation>true</GenerateDebugInformation>

     </Link>

+    <ResourceCompile>

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

+    </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

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

-  </ItemGroup>

-  <ItemGroup>

     <ClInclude Include="bass.h" />

     <ClInclude Include="bass_interface.h" />

     <ClInclude Include="resource.h" />

@@ -186,6 +194,9 @@
     <ResourceCompile Include="bass.rc" />

     <ResourceCompile Include="Version.rc" />

   </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="Main.cpp" />

+  </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

diff --git a/plugins/Bass_interface/Bass_interface.vcxproj.filters b/plugins/Bass_interface/Bass_interface.vcxproj.filters
index 951799ef02..025a1f421b 100644
--- a/plugins/Bass_interface/Bass_interface.vcxproj.filters
+++ b/plugins/Bass_interface/Bass_interface.vcxproj.filters
@@ -15,11 +15,6 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="main.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-  </ItemGroup>

-  <ItemGroup>

     <ClInclude Include="bass.h">

       <Filter>Header Files</Filter>

     </ClInclude>

@@ -41,4 +36,9 @@
       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="Main.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/Bass_interface/Main.c b/plugins/Bass_interface/Main.cpp
index a2870b4fbb..3c9d5108a5 100644
--- a/plugins/Bass_interface/Main.c
+++ b/plugins/Bass_interface/Main.cpp
@@ -28,19 +28,19 @@ static HANDLE hHooks[5] = {0};
 static HANDLE hService;

 static HINSTANCE hBass = NULL;

 

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

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

 {

 	hInst=hinstDLL;

 	return TRUE;

 }

 

-__declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)

+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)

 {

 	return &pluginInfo;

 }

 

 static const MUUID interfaces[] = {MIID_BASSINT, MIID_LAST};

-__declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)

+extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)

 {

 	return interfaces;

 }

@@ -481,7 +481,7 @@ int OnShutdown(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-int __declspec(dllexport) Load(PLUGINLINK *link)

+extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)

 {

 	pluginLink = link;

 	mir_getLP(&pluginInfo);

@@ -498,7 +498,7 @@ int __declspec(dllexport) Load(PLUGINLINK *link)
 	return 0;

 }

 

-int __declspec(dllexport) Unload(void)

+extern "C" int __declspec(dllexport) Unload(void)

 {

 	int i;

 	for (i = 0; i < SIZEOF(hHooks); i++)