diff options
Diffstat (limited to 'useactions')
-rw-r--r-- | useactions/UpgradeLog.XML | 13 | ||||
-rw-r--r-- | useactions/UseActions_10.vcxproj | 8 | ||||
-rw-r--r-- | useactions/UseActions_6.dsp | 28 | ||||
-rw-r--r-- | useactions/UseActions_8.vcproj | 8 | ||||
-rw-r--r-- | useactions/UseActions_9.vcproj | 8 | ||||
-rw-r--r-- | useactions/common.h | 12 |
6 files changed, 32 insertions, 45 deletions
diff --git a/useactions/UpgradeLog.XML b/useactions/UpgradeLog.XML deleted file mode 100644 index fd6b370..0000000 --- a/useactions/UpgradeLog.XML +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet type='text/xsl' href='_UpgradeReport_Files/UpgradeReport.xslt'?><UpgradeLog>
-<Properties><Property Name="Solution" Value="UseActions_10">
-</Property><Property Name="Solution File" Value="D:\Sources\svn.miranda.im\useactions\trunk\UseActions_10.sln">
-</Property><Property Name="Date" Value="13 февраля 2011 г.">
-</Property><Property Name="Time" Value="1:38">
-</Property></Properties><Event ErrorLevel="0" Project="UseActions_10" Source="UseActions_10.vcproj" Description="Converting project file 'D:\Sources\svn.miranda.im\useactions\trunk\UseActions_10.vcproj'.">
-</Event><Event ErrorLevel="1" Project="UseActions_10" Source="UseActions_10.vcproj" Description="VCWebServiceProxyGeneratorTool is no longer supported. The tool has been removed from your project settings.">
-</Event><Event ErrorLevel="1" Project="UseActions_10" Source="UseActions_10.vcproj" Description="MSB8012: $(TargetPath) ('D:\Sources\svn.miranda.im\useactions\trunk\..\..\..\..\testmir\Plugins\UseActions.dll') does not match the Linker's OutputFile property value '..\..\..\..\testmir\Plugins\UseActions.dll' ('D:\testmir\Plugins\UseActions.dll') in project configuration 'Debug (Unicode)|Win32'. This may cause your project to build incorrectly. To correct this, please make sure that $(TargetPath) property value matches the value specified in %(Link.OutputFile).">
-</Event><Event ErrorLevel="0" Project="UseActions_10" Source="UseActions_10.vcproj" Description="Done converting to new project file 'D:\Sources\svn.miranda.im\useactions\trunk\UseActions_10.vcxproj'.">
-</Event><Event ErrorLevel="3" Project="UseActions_10" Source="UseActions_10.vcproj" Description="Converted">
-</Event><Event ErrorLevel="0" Project="" Source="UseActions_10.sln" Description="Solution converted successfully">
-</Event><Event ErrorLevel="3" Project="" Source="UseActions_10.sln" Description="Converted">
-</Event></UpgradeLog>
\ No newline at end of file diff --git a/useactions/UseActions_10.vcxproj b/useactions/UseActions_10.vcxproj index 59920b5..a07c96f 100644 --- a/useactions/UseActions_10.vcxproj +++ b/useactions/UseActions_10.vcxproj @@ -75,7 +75,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USERDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>Create</PrecompiledHeader>
@@ -99,7 +99,7 @@ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USERDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>Create</PrecompiledHeader>
@@ -117,7 +117,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug (Unicode)|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USERDLL;UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@ <Optimization>Full</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USERDLL;UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>Create</PrecompiledHeader>
diff --git a/useactions/UseActions_6.dsp b/useactions/UseActions_6.dsp index 16e4646..6041ed6 100644 --- a/useactions/UseActions_6.dsp +++ b/useactions/UseActions_6.dsp @@ -43,8 +43,8 @@ RSC=rc.exe # PROP Output_Dir ".\Debug\Plugins"
# PROP Intermediate_Dir ".\Debug\Obj"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /GX /Zi /Od /I "../../include" /D "_DEBUG" /D "_WINDOWS" /D "_USERDLL" /Yc"common.h" /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /Zi /Od /I "../../include" /D "_DEBUG" /D "_WINDOWS" /D "_USERDLL" /Yc"common.h" /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /GX /Zi /Od /I "../../include;../ExternalAPI" /D "_DEBUG" /D "_WINDOWS" /D "_USERDLL" /Yc"common.h" /GZ /c
+# ADD CPP /nologo /MTd /W3 /GX /Zi /Od /I "../../include;../ExternalAPI" /D "_DEBUG" /D "_WINDOWS" /D "_USERDLL" /Yc"common.h" /GZ /c
# ADD BASE MTL /nologo /win32
# ADD MTL /nologo /win32
# ADD BASE RSC /l 0x409
@@ -70,8 +70,8 @@ LINK32=link.exe # PROP Output_Dir ".\Release\Plugins"
# PROP Intermediate_Dir ".\Release\Obj"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /GX /I "../../include" /D "NDEBUG" /D "_WINDOWS" /D "_USERDLL" /Yc"common.h" /c
-# ADD CPP /nologo /MT /GX /I "../../include" /D "NDEBUG" /D "_WINDOWS" /D "_USERDLL" /Yc"common.h" /c
+# ADD BASE CPP /nologo /MT /GX /I "../../include;../ExternalAPI" /D "NDEBUG" /D "_WINDOWS" /D "_USERDLL" /Yc"common.h" /c
+# ADD CPP /nologo /MT /GX /I "../../include;../ExternalAPI" /D "NDEBUG" /D "_WINDOWS" /D "_USERDLL" /Yc"common.h" /c
# ADD BASE MTL /nologo /win32
# ADD MTL /nologo /win32
# ADD BASE RSC /l 0x409
@@ -98,8 +98,8 @@ LINK32=link.exe # PROP Intermediate_Dir ".\Debug_(Unicode)\Obj"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /GX /ZI /Od /I "../../include" /D "_DEBUG" /D "_WINDOWS" /D "_USERDLL" /D "UNICODE" /D "_UNICODE" /FR /Yc"common.h" /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "../../include" /D "_DEBUG" /D "_WINDOWS" /D "_USERDLL" /D "UNICODE" /D "_UNICODE" /FR /Yc"common.h" /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /GX /ZI /Od /I "../../include;../ExternalAPI" /D "_DEBUG" /D "_WINDOWS" /D "_USERDLL" /D "UNICODE" /D "_UNICODE" /FR /Yc"common.h" /GZ /c
+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "../../include;../ExternalAPI" /D "_DEBUG" /D "_WINDOWS" /D "_USERDLL" /D "UNICODE" /D "_UNICODE" /FR /Yc"common.h" /GZ /c
# ADD BASE MTL /nologo /win32
# ADD MTL /nologo /win32
# ADD BASE RSC /l 0x409
@@ -126,8 +126,8 @@ LINK32=link.exe # PROP Intermediate_Dir ".\Release_(Unicode)\Obj"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /GX /Ox /Os /I "../../include" /D "NDEBUG" /D "_WINDOWS" /D "_USERDLL" /D "UNICODE" /D "_UNICODE" /Yc"common.h" /c
-# ADD CPP /nologo /MD /W3 /Ox /Og /Os /Gf /I "../../include" /D "NDEBUG" /D "_WINDOWS" /D "_USERDLL" /D "UNICODE" /D "_UNICODE" /Fr /YX"common.h" /c
+# ADD BASE CPP /nologo /MT /GX /Ox /Os /I "../../include;../ExternalAPI" /D "NDEBUG" /D "_WINDOWS" /D "_USERDLL" /D "UNICODE" /D "_UNICODE" /Yc"common.h" /c
+# ADD CPP /nologo /MD /W3 /Ox /Og /Os /Gf /I "../../include;../ExternalAPI" /D "NDEBUG" /D "_WINDOWS" /D "_USERDLL" /D "UNICODE" /D "_UNICODE" /Fr /YX"common.h" /c
# ADD BASE MTL /nologo /win32
# ADD MTL /nologo /win32
# ADD BASE RSC /l 0x409
@@ -173,12 +173,12 @@ DEP_CPP_USEAC=\ "..\..\include\statusmodes.h"\
"..\..\include\win2k.h"\
".\common.h"\
- ".\ExternalAPI\m_actman.h"\
- ".\ExternalAPI\m_msg_buttonsbar.h"\
- ".\ExternalAPI\m_toolbar.h"\
- ".\ExternalAPI\m_toptoolbar.h"\
- ".\ExternalAPI\m_updater.h"\
- ".\ExternalAPI\m_variables.h"\
+ "..\ExternalAPI\m_actman.h"\
+ "..\ExternalAPI\m_msg_buttonsbar.h"\
+ "..\ExternalAPI\m_toolbar.h"\
+ "..\ExternalAPI\m_toptoolbar.h"\
+ "..\ExternalAPI\m_updater.h"\
+ "..\ExternalAPI\m_variables.h"\
".\res\version.h"\
".\UseActions.h"\
diff --git a/useactions/UseActions_8.vcproj b/useactions/UseActions_8.vcproj index 1c63bc1..9e4b1ba 100644 --- a/useactions/UseActions_8.vcproj +++ b/useactions/UseActions_8.vcproj @@ -38,7 +38,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../include"
+ AdditionalIncludeDirectories="../../include;../ExternalAPI"
PreprocessorDefinitions="_DEBUG;_WINDOWS;_USERDLL"
RuntimeLibrary="1"
UsePrecompiledHeader="1"
@@ -112,7 +112,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../include"
+ AdditionalIncludeDirectories="../../include;../ExternalAPI"
PreprocessorDefinitions="NDEBUG;_WINDOWS;_USERDLL"
RuntimeLibrary="0"
UsePrecompiledHeader="1"
@@ -183,7 +183,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../include"
+ AdditionalIncludeDirectories="../../include;../ExternalAPI"
PreprocessorDefinitions="_DEBUG;_WINDOWS;_USERDLL;UNICODE;_UNICODE"
RuntimeLibrary="1"
UsePrecompiledHeader="1"
@@ -266,7 +266,7 @@ Optimization="3"
FavorSizeOrSpeed="2"
WholeProgramOptimization="true"
- AdditionalIncludeDirectories="../../include"
+ AdditionalIncludeDirectories="../../include;../ExternalAPI"
PreprocessorDefinitions="NDEBUG;_WINDOWS;_USERDLL;UNICODE;_UNICODE"
RuntimeLibrary="0"
UsePrecompiledHeader="1"
diff --git a/useactions/UseActions_9.vcproj b/useactions/UseActions_9.vcproj index 4f9240f..ad10317 100644 --- a/useactions/UseActions_9.vcproj +++ b/useactions/UseActions_9.vcproj @@ -39,7 +39,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../include"
+ AdditionalIncludeDirectories="../../include;../ExternalAPI"
PreprocessorDefinitions="_DEBUG;_WINDOWS;_USERDLL"
RuntimeLibrary="1"
UsePrecompiledHeader="1"
@@ -114,7 +114,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../include"
+ AdditionalIncludeDirectories="../../include;../ExternalAPI"
PreprocessorDefinitions="NDEBUG;_WINDOWS;_USERDLL"
RuntimeLibrary="0"
UsePrecompiledHeader="1"
@@ -185,7 +185,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../include"
+ AdditionalIncludeDirectories="../../include;../ExternalAPI"
PreprocessorDefinitions="_DEBUG;_WINDOWS;_USERDLL;UNICODE;_UNICODE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -271,7 +271,7 @@ Optimization="3"
FavorSizeOrSpeed="2"
WholeProgramOptimization="true"
- AdditionalIncludeDirectories="../../include"
+ AdditionalIncludeDirectories="../../include;../ExternalAPI"
PreprocessorDefinitions="NDEBUG;_WINDOWS;_USERDLL;UNICODE;_UNICODE"
RuntimeLibrary="0"
UsePrecompiledHeader="1"
diff --git a/useactions/common.h b/useactions/common.h index 1a022b3..f44ebd0 100644 --- a/useactions/common.h +++ b/useactions/common.h @@ -50,12 +50,12 @@ #include <m_genmenu.h>
#include <m_icolib.h>
#include <m_protocols.h>
-#include "ExternalAPI\m_actman.h"
-#include "ExternalAPI\m_msg_buttonsbar.h"
-#include "ExternalAPI\m_toolbar.h"
-#include "ExternalAPI\m_toptoolbar.h"
-#include "ExternalAPI\m_variables.h"
-#include "ExternalAPI\m_updater.h"
+#include "m_actman.h"
+#include "m_msg_buttonsbar.h"
+#include "m_toolbar.h"
+#include "m_toptoolbar.h"
+#include "m_variables.h"
+#include "m_updater.h"
extern HINSTANCE hInst;
extern PLUGINLINK *pluginLink;
|