Specify the dependency of projects in the solution file instead of

[xkeymacs/xkeymacs.git] / xkeymacs / xkeymacs-vc10.vcxproj

diff --git a/xkeymacs/xkeymacs-vc10.vcxproj b/xkeymacs/xkeymacs-vc10.vcxproj
index b640155..fc5486c 100644 (file)
--- a/xkeymacs/xkeymacs-vc10.vcxproj
+++ b/xkeymacs/xkeymacs-vc10.vcxproj
@@ -27,18 +27,22 @@
     <UseDebugLibraries>true</UseDebugLibraries>\r
     <UseOfMfc>Dynamic</UseOfMfc>\r
     <CharacterSet>MultiByte</CharacterSet>\r
+    <PlatformToolset>Windows7.1SDK</PlatformToolset>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
     <ConfigurationType>Application</ConfigurationType>\r
     <UseDebugLibraries>true</UseDebugLibraries>\r
     <UseOfMfc>Dynamic</UseOfMfc>\r
     <CharacterSet>MultiByte</CharacterSet>\r
+    <PlatformToolset>Windows7.1SDK</PlatformToolset>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
     <ConfigurationType>Application</ConfigurationType>\r
     <UseDebugLibraries>false</UseDebugLibraries>\r
     <UseOfMfc>Dynamic</UseOfMfc>\r
     <CharacterSet>MultiByte</CharacterSet>\r
+    <PlatformToolset>Windows7.1SDK</PlatformToolset>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
     <ConfigurationType>Application</ConfigurationType>\r
@@ -46,6 +50,7 @@
     <UseOfMfc>Dynamic</UseOfMfc>\r
     <CharacterSet>MultiByte</CharacterSet>\r
     <PlatformToolset>Windows7.1SDK</PlatformToolset>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <ImportGroup Label="ExtensionSettings">\r
@@ -65,10 +70,12 @@
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <LinkIncremental>true</LinkIncremental>\r
+    <TargetName>xkeymacs</TargetName>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
     <LinkIncremental>true</LinkIncremental>\r
     <OutDir>$(SolutionDir)$(Configuration)\</OutDir>\r
+    <TargetName>xkeymacs64</TargetName>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <LinkIncremental>false</LinkIncremental>\r
@@ -95,7 +102,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <AdditionalLibraryDirectories>C:\WinDDK\7600.16385.1\lib\Mfc\i386;C:\WinDDK\7600.16385.1\lib\ATL\i386</AdditionalLibraryDirectories>\r
-      <AdditionalDependencies>Version.lib;ShLwApi.Lib;Imm32.lib</AdditionalDependencies>\r
+      <AdditionalDependencies>Version.lib;ShLwApi.Lib;Imm32.lib;$(SolutionDir)xkeymacsdll\$(IntDir)$(TargetName).lib</AdditionalDependencies>\r
       <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>\r
     </Link>\r
     <ResourceCompile>\r
@@ -116,7 +123,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <AdditionalLibraryDirectories>C:\WinDDK\7600.16385.1\lib\Mfc\amd64;C:\WinDDK\7600.16385.1\lib\ATL\amd64</AdditionalLibraryDirectories>\r
-      <AdditionalDependencies>Version.lib;ShLwApi.Lib;Imm32.lib</AdditionalDependencies>\r
+      <AdditionalDependencies>Version.lib;ShLwApi.Lib;Imm32.lib;$(SolutionDir)xkeymacsdll\$(IntDir)$(TargetName).lib</AdditionalDependencies>\r
       <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>\r
     </Link>\r
     <ResourceCompile>\r
@@ -131,9 +138,11 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <AdditionalIncludeDirectories>C:\WinDDK\7600.16385.1\inc\mfc42</AdditionalIncludeDirectories>\r
       <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>\r
-      <Optimization>MinSpace</Optimization>\r
+      <Optimization>MaxSpeed</Optimization>\r
       <OmitFramePointers>true</OmitFramePointers>\r
       <RuntimeTypeInfo>false</RuntimeTypeInfo>\r
+      <StringPooling>true</StringPooling>\r
+      <WholeProgramOptimization>true</WholeProgramOptimization>\r
     </ClCompile>\r
     <Link>\r
       <TargetMachine>MachineX86</TargetMachine>\r
@@ -142,7 +151,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
       <OptimizeReferences>true</OptimizeReferences>\r
       <AdditionalLibraryDirectories>C:\WinDDK\7600.16385.1\lib\Mfc\i386;C:\WinDDK\7600.16385.1\lib\ATL\i386</AdditionalLibraryDirectories>\r
-      <AdditionalDependencies>Version.lib;Imm32.lib;ShLwApi.Lib</AdditionalDependencies>\r
+      <AdditionalDependencies>Version.lib;ShLwApi.Lib;Imm32.lib;$(SolutionDir)xkeymacsdll\$(IntDir)$(TargetName).lib</AdditionalDependencies>\r
       <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>\r
     </Link>\r
     <ResourceCompile>\r
@@ -158,6 +167,9 @@
       <AdditionalIncludeDirectories>C:\WinDDK\7600.16385.1\inc\mfc42</AdditionalIncludeDirectories>\r
       <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>\r
       <Optimization>MaxSpeed</Optimization>\r
+      <OmitFramePointers>true</OmitFramePointers>\r
+      <StringPooling>true</StringPooling>\r
+      <WholeProgramOptimization>true</WholeProgramOptimization>\r
     </ClCompile>\r
     <Link>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
@@ -165,7 +177,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
       <OptimizeReferences>true</OptimizeReferences>\r
       <AdditionalLibraryDirectories>C:\WinDDK\7600.16385.1\lib\Mfc\amd64;C:\WinDDK\7600.16385.1\lib\ATL\amd64</AdditionalLibraryDirectories>\r
-      <AdditionalDependencies>Version.lib;Imm32.lib;ShLwApi.Lib</AdditionalDependencies>\r
+      <AdditionalDependencies>Version.lib;ShLwApi.Lib;Imm32.lib;$(SolutionDir)xkeymacsdll\$(IntDir)$(TargetName).lib</AdditionalDependencies>\r
       <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>\r
     </Link>\r
     <ResourceCompile>\r
@@ -270,11 +282,6 @@
   <ItemGroup>\r
     <ResourceCompile Include="xkeymacs.rc" />\r
   </ItemGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\xkeymacsdll\xkeymacsdll-vc10.vcxproj">\r
-      <Project>{6e0d026b-0162-ecf5-9db6-3d5ec4311906}</Project>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r