Boltun: compilation fix

git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@233 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb

4 files changed, 310 insertions, 1 deletions

diff --git a/Boltun/Boltun.vcxproj b/Boltun/Boltun.vcxproj
new file mode 100644
index 0000000..09036f7
--- /dev/null
+++ b/Boltun/Boltun.vcxproj
@@ -0,0 +1,196 @@
+<?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 Unicode|Win32">

+      <Configuration>Debug Unicode</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release Unicode|Win32">

+      <Configuration>Release Unicode</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{98DF7761-41D7-4C5C-9FFE-E5CCB3997783}</ProjectGuid>

+    <RootNamespace>Boltun</RootNamespace>

+  </PropertyGroup>

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

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>Unicode</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

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

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

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

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

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />

+  </ImportGroup>

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

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

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>

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

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

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

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

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

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">$(ProjectName)w</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">$(ProjectName)w</TargetName>

+  </PropertyGroup>

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

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>.\Release/Boltun.tlb</TypeLibraryName>

+      <HeaderFileName>

+      </HeaderFileName>

+    </Midl>

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <WholeProgramOptimization>true</WholeProgramOptimization>

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

+      <PreprocessorDefinitions>NDEBUG;BOLTUN_EXPORTS;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_UNICODE;UNICODE;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

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

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+    </ResourceCompile>

+    <Link>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

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

+      <TargetMachine>MachineX86</TargetMachine>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

+    </Link>

+    <Bscmake>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </Bscmake>

+  </ItemDefinitionGroup>

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

+    <CustomBuildStep>

+      <Command>copy Engine\boltun.mindw "$(SolutionDir)$(Configuration)\Plugins"

+</Command>

+      <Outputs>$(OutDir)boltun.mindw;%(Outputs)</Outputs>

+    </CustomBuildStep>

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>.\Debug/Boltun.tlb</TypeLibraryName>

+      <HeaderFileName>

+      </HeaderFileName>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

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

+      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOLTUN_EXPORTS;_UNICODE;UNICODE;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

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

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+    </ResourceCompile>

+    <Link>

+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

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

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+    <Bscmake>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </Bscmake>

+  </ItemDefinitionGroup>

+  <ItemGroup>

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

+    <ClCompile Include="boltun.cpp">

+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ClCompile>

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

+    <ClCompile Include="Engine\Mind.cpp" />

+    <ClCompile Include="Engine\MyCodeCvt.cpp" />

+    <ClCompile Include="Engine\TalkEngine.cpp" />

+    <ClCompile Include="Engine\UnrecentChooser.cpp" />

+    <ClCompile Include="Engine\WordsList.cpp">

+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">Full</Optimization>

+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">AnySuitable</InlineFunctionExpansion>

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

+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">Speed</FavorSizeOrSpeed>

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

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

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

+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">Default</BasicRuntimeChecks>

+      <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="actionQueue.h" />

+    <ClInclude Include="boltun.h" />

+    <ClInclude Include="config.h" />

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

+    <ClInclude Include="Engine\CriticalSection.h" />

+    <ClInclude Include="Engine\Mind.h" />

+    <ClInclude Include="Engine\MyCodeCvt.h" />

+    <ClInclude Include="Engine\PerContactData.h" />

+    <ClInclude Include="Engine\TalkEngine.h" />

+    <ClInclude Include="Engine\tstring.h" />

+    <ClInclude Include="Engine\UnrecentChooser.h" />

+    <ClInclude Include="Engine\ValueChooser.h" />

+    <ClInclude Include="Engine\WordsList.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="res\boltun.ico" />

+    <None Include="res\smiles.dat" />

+    <None Include="Engine\boltun.mindw" />

+    <None Include="lang_pack.txt" />

+    <None Include="mind.txt" />

+    <None Include="readme.txt" />

+    <None Include="TODO.txt" />

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="boltun.rc">

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ResourceCompile>

+  </ItemGroup>

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

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/Boltun/Boltun.vcxproj.filters b/Boltun/Boltun.vcxproj.filters
new file mode 100644
index 0000000..e025146
--- /dev/null
+++ b/Boltun/Boltun.vcxproj.filters
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{053e819b-1bb3-488b-8dbd-f6b29640c30c}</UniqueIdentifier>

+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>

+    </Filter>

+    <Filter Include="Source Files\Enigne">

+      <UniqueIdentifier>{e94debaf-39e5-4d66-95b0-b02f301c140c}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{db6f678c-e69c-4576-819a-360e80ffc84c}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl</Extensions>

+    </Filter>

+    <Filter Include="Header Files\Engine">

+      <UniqueIdentifier>{614d736c-849c-4a07-ba4e-a6c9b895154b}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{c04447a2-5567-4425-92b8-a4a1267e7e32}</UniqueIdentifier>

+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="actionQueue.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="boltun.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="config.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="Engine\Mind.cpp">

+      <Filter>Source Files\Enigne</Filter>

+    </ClCompile>

+    <ClCompile Include="Engine\MyCodeCvt.cpp">

+      <Filter>Source Files\Enigne</Filter>

+    </ClCompile>

+    <ClCompile Include="Engine\TalkEngine.cpp">

+      <Filter>Source Files\Enigne</Filter>

+    </ClCompile>

+    <ClCompile Include="Engine\UnrecentChooser.cpp">

+      <Filter>Source Files\Enigne</Filter>

+    </ClCompile>

+    <ClCompile Include="Engine\WordsList.cpp">

+      <Filter>Source Files\Enigne</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="actionQueue.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="boltun.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="config.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="resource.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="Engine\CriticalSection.h">

+      <Filter>Header Files\Engine</Filter>

+    </ClInclude>

+    <ClInclude Include="Engine\Mind.h">

+      <Filter>Header Files\Engine</Filter>

+    </ClInclude>

+    <ClInclude Include="Engine\MyCodeCvt.h">

+      <Filter>Header Files\Engine</Filter>

+    </ClInclude>

+    <ClInclude Include="Engine\PerContactData.h">

+      <Filter>Header Files\Engine</Filter>

+    </ClInclude>

+    <ClInclude Include="Engine\TalkEngine.h">

+      <Filter>Header Files\Engine</Filter>

+    </ClInclude>

+    <ClInclude Include="Engine\tstring.h">

+      <Filter>Header Files\Engine</Filter>

+    </ClInclude>

+    <ClInclude Include="Engine\UnrecentChooser.h">

+      <Filter>Header Files\Engine</Filter>

+    </ClInclude>

+    <ClInclude Include="Engine\ValueChooser.h">

+      <Filter>Header Files\Engine</Filter>

+    </ClInclude>

+    <ClInclude Include="Engine\WordsList.h">

+      <Filter>Header Files\Engine</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="res\boltun.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\smiles.dat">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="lang_pack.txt" />

+    <None Include="mind.txt" />

+    <None Include="readme.txt" />

+    <None Include="TODO.txt" />

+    <None Include="Engine\boltun.mindw">

+      <Filter>Source Files</Filter>

+    </None>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="boltun.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/Boltun/boltun.cpp b/Boltun/boltun.cpp
index c24ba19..e0f8566 100644
--- a/Boltun/boltun.cpp
+++ b/Boltun/boltun.cpp
@@ -34,7 +34,7 @@
 #include "m_protosvc.h"

 #include "m_options.h"

 #include "m_langpack.h"

-#include "../../src/resource.h"

+#include "resource.h"

 

 #include "resource.h"

 

diff --git a/Boltun/resource.h b/Boltun/resource.h
index e38aa83..b4fa069 100644
--- a/Boltun/resource.h
+++ b/Boltun/resource.h
@@ -7,6 +7,9 @@
 #define IDI_MAINBOLTUN                  102

 #define IDD_ENGINE                      103

 #define IDR_SMILES                      105

+#define IDI_TICK                        106

+#define IDI_NOTICK                      107

+#define IDI_RECVMSG                     108

 #define IDC_EVERYBODY                   1000

 #define IDC_NOTINLIST                   1001

 #define IDC_AUTOAWAY                    1002