OSDN Git Service

(root) / xkeymacs / xkeymacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2ad575b)
Specify the dependency of projects in the solution file instead of
authorTomohiro Kashiwada <kikairoya@gmail.com>
Thu, 9 Jun 2011 09:51:08 +0000 (18:51 +0900)
committerKazuhiro Fujieda <fujieda@users.sourceforge.jp>
Fri, 10 Jun 2011 07:38:30 +0000 (16:38 +0900)
specifying the reference to the xkeymacsdll project in the xkeymacs
project file to avoid the error missing the project GUID in
different environments.

xkeymacs-vc10.sln patch | blob | history
xkeymacs/xkeymacs-vc10.vcxproj patch | blob | history
xkeymacsdll/xkeymacsdll-vc10.vcxproj patch | blob | history

diff --git a/xkeymacs-vc10.sln b/xkeymacs-vc10.sln
index 2ee2057..d9dfc74 100644 (file)
--- a/xkeymacs-vc10.sln
+++ b/xkeymacs-vc10.sln
@@ -1,9 +1,12 @@
 \r
 Microsoft Visual Studio Solution File, Format Version 11.00\r
 # Visual C++ Express 2010\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xkeymacs-vc10", "xkeymacs\xkeymacs-vc10.vcxproj", "{C6C37558-8C3D-7F6A-9B81-9DE917C7F213}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xkeymacs-vc10", "xkeymacs\xkeymacs-vc10.vcxproj", "{8EEC4832-1538-8942-A213-6F85EE1CD8D4}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {1C6AA554-5283-2136-B3EF-277915DBCDF5} = {1C6AA554-5283-2136-B3EF-277915DBCDF5}\r
+       EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xkeymacsdll-vc10", "xkeymacsdll\xkeymacsdll-vc10.vcxproj", "{6E0D026B-0162-ECF5-9DB6-3D5EC4311906}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xkeymacsdll-vc10", "xkeymacsdll\xkeymacsdll-vc10.vcxproj", "{1C6AA554-5283-2136-B3EF-277915DBCDF5}"\r
 EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
@@ -13,22 +16,22 @@ Global
                Release|x64 = Release|x64\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {C6C37558-8C3D-7F6A-9B81-9DE917C7F213}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {C6C37558-8C3D-7F6A-9B81-9DE917C7F213}.Debug|Win32.Build.0 = Debug|Win32\r
-               {C6C37558-8C3D-7F6A-9B81-9DE917C7F213}.Debug|x64.ActiveCfg = Debug|x64\r
-               {C6C37558-8C3D-7F6A-9B81-9DE917C7F213}.Debug|x64.Build.0 = Debug|x64\r
-               {C6C37558-8C3D-7F6A-9B81-9DE917C7F213}.Release|Win32.ActiveCfg = Release|Win32\r
-               {C6C37558-8C3D-7F6A-9B81-9DE917C7F213}.Release|Win32.Build.0 = Release|Win32\r
-               {C6C37558-8C3D-7F6A-9B81-9DE917C7F213}.Release|x64.ActiveCfg = Release|x64\r
-               {C6C37558-8C3D-7F6A-9B81-9DE917C7F213}.Release|x64.Build.0 = Release|x64\r
-               {6E0D026B-0162-ECF5-9DB6-3D5EC4311906}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {6E0D026B-0162-ECF5-9DB6-3D5EC4311906}.Debug|Win32.Build.0 = Debug|Win32\r
-               {6E0D026B-0162-ECF5-9DB6-3D5EC4311906}.Debug|x64.ActiveCfg = Debug|x64\r
-               {6E0D026B-0162-ECF5-9DB6-3D5EC4311906}.Debug|x64.Build.0 = Debug|x64\r
-               {6E0D026B-0162-ECF5-9DB6-3D5EC4311906}.Release|Win32.ActiveCfg = Release|Win32\r
-               {6E0D026B-0162-ECF5-9DB6-3D5EC4311906}.Release|Win32.Build.0 = Release|Win32\r
-               {6E0D026B-0162-ECF5-9DB6-3D5EC4311906}.Release|x64.ActiveCfg = Release|x64\r
-               {6E0D026B-0162-ECF5-9DB6-3D5EC4311906}.Release|x64.Build.0 = Release|x64\r
+               {8EEC4832-1538-8942-A213-6F85EE1CD8D4}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {8EEC4832-1538-8942-A213-6F85EE1CD8D4}.Debug|Win32.Build.0 = Debug|Win32\r
+               {8EEC4832-1538-8942-A213-6F85EE1CD8D4}.Debug|x64.ActiveCfg = Debug|x64\r
+               {8EEC4832-1538-8942-A213-6F85EE1CD8D4}.Debug|x64.Build.0 = Debug|x64\r
+               {8EEC4832-1538-8942-A213-6F85EE1CD8D4}.Release|Win32.ActiveCfg = Release|Win32\r
+               {8EEC4832-1538-8942-A213-6F85EE1CD8D4}.Release|Win32.Build.0 = Release|Win32\r
+               {8EEC4832-1538-8942-A213-6F85EE1CD8D4}.Release|x64.ActiveCfg = Release|x64\r
+               {8EEC4832-1538-8942-A213-6F85EE1CD8D4}.Release|x64.Build.0 = Release|x64\r
+               {1C6AA554-5283-2136-B3EF-277915DBCDF5}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {1C6AA554-5283-2136-B3EF-277915DBCDF5}.Debug|Win32.Build.0 = Debug|Win32\r
+               {1C6AA554-5283-2136-B3EF-277915DBCDF5}.Debug|x64.ActiveCfg = Debug|x64\r
+               {1C6AA554-5283-2136-B3EF-277915DBCDF5}.Debug|x64.Build.0 = Debug|x64\r
+               {1C6AA554-5283-2136-B3EF-277915DBCDF5}.Release|Win32.ActiveCfg = Release|Win32\r
+               {1C6AA554-5283-2136-B3EF-277915DBCDF5}.Release|Win32.Build.0 = Release|Win32\r
+               {1C6AA554-5283-2136-B3EF-277915DBCDF5}.Release|x64.ActiveCfg = Release|x64\r
+               {1C6AA554-5283-2136-B3EF-277915DBCDF5}.Release|x64.Build.0 = Release|x64\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
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
diff --git a/xkeymacsdll/xkeymacsdll-vc10.vcxproj b/xkeymacsdll/xkeymacsdll-vc10.vcxproj
index 5be8271..b92c224 100644 (file)
--- a/xkeymacsdll/xkeymacsdll-vc10.vcxproj
+++ b/xkeymacsdll/xkeymacsdll-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>DynamicLibrary</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>DynamicLibrary</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>DynamicLibrary</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
@@ -137,9 +142,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
       <RuntimeTypeInfo>false</RuntimeTypeInfo>\r
       <OmitFramePointers>true</OmitFramePointers>\r
+      <StringPooling>true</StringPooling>\r
+      <WholeProgramOptimization>true</WholeProgramOptimization>\r
     </ClCompile>\r
     <Link>\r
       <TargetMachine>MachineX86</TargetMachine>\r
@@ -166,6 +173,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
About OSDN
Find Software
Develop Software
Help