another part of small project fixes and x64 adaptation in some cases

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

3 files changed, 41 insertions, 14 deletions

diff --git a/SimpleAR/SimpleAR_10.sln b/SimpleAR/SimpleAR_10.sln
new file mode 100644
index 0000000..b316efd
--- /dev/null
+++ b/SimpleAR/SimpleAR_10.sln
@@ -0,0 +1,25 @@
+Microsoft Visual Studio Solution File, Format Version 11.00

+# Visual Studio 2010

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimpleAR", "SimpleAR_10.vcxproj", "{06C44834-7B7A-4074-A6D8-7F163B3FF707}"

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug Unicode|Win32 = Debug Unicode|Win32

+		Debug Unicode|x64 = Debug Unicode|x64

+		Release Unicode|Win32 = Release Unicode|Win32

+		Release Unicode|x64 = Release Unicode|x64

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{06C44834-7B7A-4074-A6D8-7F163B3FF707}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32

+		{06C44834-7B7A-4074-A6D8-7F163B3FF707}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32

+		{06C44834-7B7A-4074-A6D8-7F163B3FF707}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64

+		{06C44834-7B7A-4074-A6D8-7F163B3FF707}.Debug Unicode|x64.Build.0 = Debug Unicode|x64

+		{06C44834-7B7A-4074-A6D8-7F163B3FF707}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

+		{06C44834-7B7A-4074-A6D8-7F163B3FF707}.Release Unicode|Win32.Build.0 = Release Unicode|Win32

+		{06C44834-7B7A-4074-A6D8-7F163B3FF707}.Release Unicode|x64.ActiveCfg = Release Unicode|x64

+		{06C44834-7B7A-4074-A6D8-7F163B3FF707}.Release Unicode|x64.Build.0 = Release Unicode|x64

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+EndGlobal

diff --git a/SimpleAR/SimpleAR_10.vcxproj b/SimpleAR/SimpleAR_10.vcxproj
index 1cf8dbb..caec3b3 100644
--- a/SimpleAR/SimpleAR_10.vcxproj
+++ b/SimpleAR/SimpleAR_10.vcxproj
@@ -69,10 +69,10 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>

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

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

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">$(SolutionDir)$(Configuration)64/Plugins\</OutDir>

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

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">$(SolutionDir)$(Configuration)64/Plugins\</OutDir>

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

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

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

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

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

     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

@@ -85,11 +85,13 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

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

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

   </PropertyGroup>

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

     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -122,7 +124,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <WholeProgramOptimization>true</WholeProgramOptimization>

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

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

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SAR_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

@@ -140,7 +142,7 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <DataExecutionPrevention>

       </DataExecutionPrevention>

-      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>

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

       <TargetMachine>MachineX86</TargetMachine>

     </Link>

     <Bscmake>

@@ -153,7 +155,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -189,7 +191,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <WholeProgramOptimization>true</WholeProgramOptimization>

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

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

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SAR_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

@@ -207,7 +209,7 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <DataExecutionPrevention>

       </DataExecutionPrevention>

-      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>

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

       <TargetMachine>MachineX64</TargetMachine>

     </Link>

     <Bscmake>

diff --git a/SimpleAR/SimpleAR_9.vcproj b/SimpleAR/SimpleAR_9.vcproj
index a6910ca..96152f9 100644
--- a/SimpleAR/SimpleAR_9.vcproj
+++ b/SimpleAR/SimpleAR_9.vcproj
@@ -45,7 +45,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include;../ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SAR_EXPORTS"

 				RuntimeLibrary="1"

 				UsePrecompiledHeader="2"

@@ -123,7 +123,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include;../ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SAR_EXPORTS"

 				RuntimeLibrary="1"

 				UsePrecompiledHeader="2"

@@ -205,7 +205,7 @@
 				EnableIntrinsicFunctions="true"

 				FavorSizeOrSpeed="2"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="../../include;../ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SAR_EXPORTS;_CRT_SECURE_NO_WARNINGS"

 				StringPooling="true"

 				RuntimeLibrary="0"

@@ -290,7 +290,7 @@
 				EnableIntrinsicFunctions="true"

 				FavorSizeOrSpeed="2"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="../../include;../ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SAR_EXPORTS;_CRT_SECURE_NO_WARNINGS"

 				StringPooling="true"

 				RuntimeLibrary="0"