summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2012-10-19 10:24:47 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2012-10-19 10:24:47 +0000
commit8090b146cf93a5b76470aa3fdcf9d797d44f6f52 (patch)
treee6d2ff33026b9492bccf08f06446808e09d2ece7
parent5f68b45a7c77b3c5751757a601b62e0356586add (diff)
Tlen protocol and icons added to solutions
git-svn-id: http://svn.miranda-ng.org/main/trunk@1982 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--bin10/mir_full.sln10
-rw-r--r--bin10/mir_full_pro.sln11
-rw-r--r--bin10/mir_icons.sln16
-rw-r--r--protocols/Tlen/tlen_10.vcxproj8
4 files changed, 40 insertions, 5 deletions
diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index b5c34e9783..de7edd5807 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -349,6 +349,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_tree_Cast128", "..\plug
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_tree_HC256", "..\plugins\Dbx_tree\encryption\HC256\HC256.vcxproj", "{541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tlen", "..\protocols\Tlen\tlen_10.vcxproj", "{F3208C96-3C21-46AA-8695-C794E28CDC34}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -1541,6 +1543,14 @@ Global
{541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Release|Win32.Build.0 = Release|Win32
{541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Release|x64.ActiveCfg = Release|x64
{541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Release|x64.Build.0 = Release|x64
+ {F3208C96-3C21-46AA-8695-C794E28CDC34}.Debug|Win32.ActiveCfg = Debug|Win32
+ {F3208C96-3C21-46AA-8695-C794E28CDC34}.Debug|Win32.Build.0 = Debug|Win32
+ {F3208C96-3C21-46AA-8695-C794E28CDC34}.Debug|x64.ActiveCfg = Debug|x64
+ {F3208C96-3C21-46AA-8695-C794E28CDC34}.Debug|x64.Build.0 = Debug|x64
+ {F3208C96-3C21-46AA-8695-C794E28CDC34}.Release|Win32.ActiveCfg = Release|Win32
+ {F3208C96-3C21-46AA-8695-C794E28CDC34}.Release|Win32.Build.0 = Release|Win32
+ {F3208C96-3C21-46AA-8695-C794E28CDC34}.Release|x64.ActiveCfg = Release|x64
+ {F3208C96-3C21-46AA-8695-C794E28CDC34}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln
index 376afd1ec6..a6a59c701b 100644
--- a/bin10/mir_full_pro.sln
+++ b/bin10/mir_full_pro.sln
@@ -385,6 +385,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_tree_Cast128", "..\plug
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_tree_HC256", "..\plugins\Dbx_tree\encryption\HC256\HC256.vcxproj", "{541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tlen", "..\protocols\Tlen\tlen_10.vcxproj", "{F3208C96-3C21-46AA-8695-C794E28CDC34}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -1577,6 +1579,14 @@ Global
{541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Release|Win32.Build.0 = Release|Win32
{541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Release|x64.ActiveCfg = Release|x64
{541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Release|x64.Build.0 = Release|x64
+ {F3208C96-3C21-46AA-8695-C794E28CDC34}.Debug|Win32.ActiveCfg = Debug|Win32
+ {F3208C96-3C21-46AA-8695-C794E28CDC34}.Debug|Win32.Build.0 = Debug|Win32
+ {F3208C96-3C21-46AA-8695-C794E28CDC34}.Debug|x64.ActiveCfg = Debug|x64
+ {F3208C96-3C21-46AA-8695-C794E28CDC34}.Debug|x64.Build.0 = Debug|x64
+ {F3208C96-3C21-46AA-8695-C794E28CDC34}.Release|Win32.ActiveCfg = Release|Win32
+ {F3208C96-3C21-46AA-8695-C794E28CDC34}.Release|Win32.Build.0 = Release|Win32
+ {F3208C96-3C21-46AA-8695-C794E28CDC34}.Release|x64.ActiveCfg = Release|x64
+ {F3208C96-3C21-46AA-8695-C794E28CDC34}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -1656,6 +1666,7 @@ Global
{6DE11A47-2268-4B08-8DE5-15A1705FCE28} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}
{12FFF2B0-0D0B-430B-A4C6-1577CA98F598} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}
{736E59E5-CDCE-4C88-9C3A-E7913D45C9EC} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}
+ {F3208C96-3C21-46AA-8695-C794E28CDC34} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}
{987F026D-EB1F-4013-ADA8-2406ACCDA526} = {0D22875F-6B96-49C3-BA4F-D7E573A1515B}
{D9057E63-AAAA-4FE7-800A-20C02F4761F3} = {0D22875F-6B96-49C3-BA4F-D7E573A1515B}
{56997126-0098-407A-94E1-7C5748C1C9EF} = {0D22875F-6B96-49C3-BA4F-D7E573A1515B}
diff --git a/bin10/mir_icons.sln b/bin10/mir_icons.sln
index e97ca37b3a..d08f822fe9 100644
--- a/bin10/mir_icons.sln
+++ b/bin10/mir_icons.sln
@@ -96,10 +96,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM_icons", "..\plugins
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM_icons_XP", "..\plugins\TabSRMM\TabSRMM_icons\XP\iconsxp_10.vcxproj", "{987C5A57-A46B-4779-BB85-077E21F7BF7F}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Tlen", "..\protocols\Tlen\proto_tlen\Proto_Tlen.vcxproj", "{1AA0A504-0644-4F00-A1AD-F55D69E50DD1}"
+EndProject
Global
- GlobalSection(DPCodeReviewSolutionGUID) = preSolution
- DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
- EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
@@ -491,8 +490,19 @@ Global
{987C5A57-A46B-4779-BB85-077E21F7BF7F}.Release|Win32.Build.0 = Release|Win32
{987C5A57-A46B-4779-BB85-077E21F7BF7F}.Release|x64.ActiveCfg = Release|x64
{987C5A57-A46B-4779-BB85-077E21F7BF7F}.Release|x64.Build.0 = Release|x64
+ {1AA0A504-0644-4F00-A1AD-F55D69E50DD1}.Debug|Win32.ActiveCfg = Debug|Win32
+ {1AA0A504-0644-4F00-A1AD-F55D69E50DD1}.Debug|Win32.Build.0 = Debug|Win32
+ {1AA0A504-0644-4F00-A1AD-F55D69E50DD1}.Debug|x64.ActiveCfg = Debug|x64
+ {1AA0A504-0644-4F00-A1AD-F55D69E50DD1}.Debug|x64.Build.0 = Debug|x64
+ {1AA0A504-0644-4F00-A1AD-F55D69E50DD1}.Release|Win32.ActiveCfg = Release|Win32
+ {1AA0A504-0644-4F00-A1AD-F55D69E50DD1}.Release|Win32.Build.0 = Release|Win32
+ {1AA0A504-0644-4F00-A1AD-F55D69E50DD1}.Release|x64.ActiveCfg = Release|x64
+ {1AA0A504-0644-4F00-A1AD-F55D69E50DD1}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(DPCodeReviewSolutionGUID) = preSolution
+ DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
+ EndGlobalSection
EndGlobal
diff --git a/protocols/Tlen/tlen_10.vcxproj b/protocols/Tlen/tlen_10.vcxproj
index 4e5b9c1a8c..ad2fe9c159 100644
--- a/protocols/Tlen/tlen_10.vcxproj
+++ b/protocols/Tlen/tlen_10.vcxproj
@@ -109,6 +109,7 @@
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
+ <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>
@@ -142,7 +143,7 @@
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;JABBER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;JABBER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
</ExceptionHandling>
@@ -162,6 +163,7 @@
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
+ <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>
@@ -217,6 +219,7 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
+ <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>ws2_32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -248,7 +251,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;JABBER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;JABBER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>false</StringPooling>
<ExceptionHandling>
</ExceptionHandling>
@@ -272,6 +275,7 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
+ <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>ws2_32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>