From a24f7ebeac4c6c56b691f3bd9092b059691b746e Mon Sep 17 00:00:00 2001
From: qw_fuku <fkhideaki@gmail.com>
Date: Sun, 15 Mar 2015 21:29:08 +0900
Subject: [PATCH] =?utf8?q?x64=E9=B7=B9=E3=83=97=E3=83=AD=E3=83=91=E3=83=86?=
 =?utf8?q?=E3=82=A3=E8=A8=AD=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Lib/LibGeo/LibDebug_x64.props               | 13 +++++++++++++
 Lib/LibGeo/LibDebug_x86.props               | 13 +++++++++++++
 Lib/LibGeo/LibGeo_vc11.vcxproj              | 18 +++++++++++-------
 Lib/LibGeo/LibRelease_x64.props             | 13 +++++++++++++
 Lib/LibGeo/LibRelease_x86.props             | 13 +++++++++++++
 Src/QtGeoViewer/Property_LibDebug_x64.props |  2 +-
 6 files changed, 64 insertions(+), 8 deletions(-)
 create mode 100644 Lib/LibGeo/LibDebug_x64.props
 create mode 100644 Lib/LibGeo/LibDebug_x86.props
 create mode 100644 Lib/LibGeo/LibRelease_x64.props
 create mode 100644 Lib/LibGeo/LibRelease_x86.props

diff --git a/Lib/LibGeo/LibDebug_x64.props b/Lib/LibGeo/LibDebug_x64.props
new file mode 100644
index 0000000..f541430
--- /dev/null
+++ b/Lib/LibGeo/LibDebug_x64.props
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup>
+    <Lib>
+      <AdditionalLibraryDirectories>../../LibExt/tinyxml/lib/msvc11_x64</AdditionalLibraryDirectories>
+      <AdditionalDependencies>tinyxmld_STL.lib</AdditionalDependencies>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
\ No newline at end of file
diff --git a/Lib/LibGeo/LibDebug_x86.props b/Lib/LibGeo/LibDebug_x86.props
new file mode 100644
index 0000000..e89809a
--- /dev/null
+++ b/Lib/LibGeo/LibDebug_x86.props
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup>
+    <Lib>
+      <AdditionalDependencies>tinyxmld_STL.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>../../LibExt/tinyxml/lib/msvc11</AdditionalLibraryDirectories>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
\ No newline at end of file
diff --git a/Lib/LibGeo/LibGeo_vc11.vcxproj b/Lib/LibGeo/LibGeo_vc11.vcxproj
index d9dfe9c..43bcc5d 100644
--- a/Lib/LibGeo/LibGeo_vc11.vcxproj
+++ b/Lib/LibGeo/LibGeo_vc11.vcxproj
@@ -53,21 +53,25 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\Config\Environment.props" />
     <Import Project="Include.props" />
+    <Import Project="LibRelease_x86.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\Config\Environment.props" />
     <Import Project="Include.props" />
+    <Import Project="LibRelease_x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\Config\Environment.props" />
     <Import Project="Include.props" />
+    <Import Project="LibDebug_x86.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\Config\Environment.props" />
     <Import Project="Include.props" />
+    <Import Project="LibDebug_x64.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -96,8 +100,8 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>tinyxmld_STL.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../LibExt/tinyxml/lib/msvc11;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -112,8 +116,8 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>tinyxmld_STL.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../LibExt/tinyxml/lib/msvc11;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -126,8 +130,8 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>tinyxml_STL.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../LibExt/tinyxml/lib/msvc11;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -140,7 +144,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>tinyxml_STL.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>../../LibExt/tinyxml/lib/msvc11;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Lib>
   </ItemDefinitionGroup>
diff --git a/Lib/LibGeo/LibRelease_x64.props b/Lib/LibGeo/LibRelease_x64.props
new file mode 100644
index 0000000..8ccc3ca
--- /dev/null
+++ b/Lib/LibGeo/LibRelease_x64.props
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup>
+    <Lib>
+      <AdditionalLibraryDirectories>../../LibExt/tinyxml/lib/msvc11_x64</AdditionalLibraryDirectories>
+      <AdditionalDependencies>tinyxml_STL.lib</AdditionalDependencies>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
\ No newline at end of file
diff --git a/Lib/LibGeo/LibRelease_x86.props b/Lib/LibGeo/LibRelease_x86.props
new file mode 100644
index 0000000..49fabce
--- /dev/null
+++ b/Lib/LibGeo/LibRelease_x86.props
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup>
+    <Lib>
+      <AdditionalLibraryDirectories>../../LibExt/tinyxml/lib/msvc11</AdditionalLibraryDirectories>
+      <AdditionalDependencies>tinyxml_STL.lib</AdditionalDependencies>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
\ No newline at end of file
diff --git a/Src/QtGeoViewer/Property_LibDebug_x64.props b/Src/QtGeoViewer/Property_LibDebug_x64.props
index c0369a2..6a8b3ea 100644
--- a/Src/QtGeoViewer/Property_LibDebug_x64.props
+++ b/Src/QtGeoViewer/Property_LibDebug_x64.props
@@ -5,7 +5,7 @@
   <PropertyGroup />
   <ItemDefinitionGroup>
     <Link>
-      <AdditionalLibraryDirectories>$(PATH_BOOST)\lib64;..\..\LibExt\assimp-3.1.1-WinBuild\lib32;..\..\LibExt\glew-1.12.0\lib\Release\Win32;../../LibExt/meshio/lib/Debug;..\..\LibExt\OpenGLUT-0.6.3\x86;..\..\LibExt\SDL2-2.0.3\lib\x86;..\..\LibExt\SDL2_image-2.0.0\lib\x86</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(PATH_BOOST)\lib64;..\..\LibExt\assimp-3.1.1-WinBuild\lib64;..\..\LibExt\glew-1.12.0\lib\Release\x64;../../LibExt/meshio/lib64/Debug;..\..\LibExt\OpenGLUT-0.6.3\x64;..\..\LibExt\SDL2-2.0.3\lib\x64;..\..\LibExt\SDL2_image-2.0.0\lib\x64</AdditionalLibraryDirectories>
       <AdditionalDependencies>glew32.lib;assimp.lib;meshio.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-- 
2.11.0