From 3072c2525fec86b952ec134209f4d60a6a7f3b57 Mon Sep 17 00:00:00 2001
From: "nao@rist.u-tokai.ac.jp" <nao>
Date: Mon, 2 May 2022 15:18:30 +0900
Subject: [PATCH] 64bit setting wchar_t default

---
 Project1.cbproj       | 21 ++++++++++-----------
 Project1.cbproj.local | 10 +++++-----
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/Project1.cbproj b/Project1.cbproj
index 3293630..29c7cb3 100644
--- a/Project1.cbproj
+++ b/Project1.cbproj
@@ -6,7 +6,7 @@
         <MainSource>Project1.cpp</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <Platform Condition="'$(Platform)'==''">Win64</Platform>
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Application</AppType>
     </PropertyGroup>
@@ -136,7 +136,6 @@
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
         <LinkPackageImports>rtl.bpi;fmx.bpi</LinkPackageImports>
-        <_TCHARMapping>char</_TCHARMapping>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
     </PropertyGroup>
@@ -207,7 +206,7 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32c270mt.dll" Class="DependencyModule">
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32c270.dll" Class="DependencyModule">
                     <Platform Name="Win32">
                         <Overwrite>true</Overwrite>
                     </Platform>
@@ -222,13 +221,13 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx32\libcgcrtl.dylib" Class="DependencyModule">
-                    <Platform Name="OSX32">
+                <DeployFile Condition="'$(UsingDelphiRTL)'=='true'" LocalName="$(BDS)\bin\borlndmm.dll" Class="DependencyModule">
+                    <Platform Name="Win32">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile Condition="'$(UsingDelphiRTL)'=='true'" LocalName="$(BDS)\bin\borlndmm.dll" Class="DependencyModule">
-                    <Platform Name="Win32">
+                <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx32\libcgcrtl.dylib" Class="DependencyModule">
+                    <Platform Name="OSX32">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
@@ -279,13 +278,13 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx64\libcgcrtl.dylib" Class="DependencyModule">
-                    <Platform Name="OSX64">
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32c270mt.dll" Class="DependencyModule">
+                    <Platform Name="Win32">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32c270.dll" Class="DependencyModule">
-                    <Platform Name="Win32">
+                <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx64\libcgcrtl.dylib" Class="DependencyModule">
+                    <Platform Name="OSX64">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
diff --git a/Project1.cbproj.local b/Project1.cbproj.local
index 28b8325..6f5b5ce 100644
--- a/Project1.cbproj.local
+++ b/Project1.cbproj.local
@@ -7,10 +7,10 @@
     <Transaction>2022/04/27 13:14:52.000.156,=C:\Users\nao\Documents\Embarcadero\Studio\Projects\Unit1.cpp</Transaction>
     <Transaction>2022/04/29 11:55:29.000.785,=C:\Users\nao\Documents\Embarcadero\Studio\Projects\Unit1.cpp</Transaction>
     <Transaction>2022/04/29 11:55:30.000.866,=C:\Users\nao\Documents\Embarcadero\Studio\Projects\Project1PCH1.h</Transaction>
-    <Transaction>2022/04/29 12:01:48.000.306,C:\Users\nao\Documents\Embarcadero\Studio\Projects\Unit1.fmx=C:\Users\nao\Documents\Embarcadero\Studio\Projects\kuse-dd\Unit1.fmx</Transaction>
-    <Transaction>2022/04/29 12:01:48.000.306,C:\Users\nao\Documents\Embarcadero\Studio\Projects\Unit1.h=C:\Users\nao\Documents\Embarcadero\Studio\Projects\kuse-dd\Unit1.h</Transaction>
-    <Transaction>2022/04/29 12:01:48.000.306,C:\Users\nao\Documents\Embarcadero\Studio\Projects\Unit1.cpp=C:\Users\nao\Documents\Embarcadero\Studio\Projects\kuse-dd\Unit1.cpp</Transaction>
-    <Transaction>2022/04/29 12:01:51.000.704,C:\Users\nao\Documents\Embarcadero\Studio\Projects\Project1PCH1.h=C:\Users\nao\Documents\Embarcadero\Studio\Projects\kuse-dd\Project1PCH1.h</Transaction>
-    <Transaction>2022/04/29 12:01:53.000.604,C:\Users\nao\Documents\Embarcadero\Studio\Projects\Project1.cbproj=C:\Users\nao\Documents\Embarcadero\Studio\Projects\kuse-dd\Project1.cbproj</Transaction>
+    <Transaction>2022/04/29 12:01:48.000.306,C:\Users\nao\Documents\Embarcadero\Studio\Projects\kuse-dd\Unit1.fmx=C:\Users\nao\Documents\Embarcadero\Studio\Projects\Unit1.fmx</Transaction>
+    <Transaction>2022/04/29 12:01:48.000.306,C:\Users\nao\Documents\Embarcadero\Studio\Projects\kuse-dd\Unit1.h=C:\Users\nao\Documents\Embarcadero\Studio\Projects\Unit1.h</Transaction>
+    <Transaction>2022/04/29 12:01:48.000.306,C:\Users\nao\Documents\Embarcadero\Studio\Projects\kuse-dd\Unit1.cpp=C:\Users\nao\Documents\Embarcadero\Studio\Projects\Unit1.cpp</Transaction>
+    <Transaction>2022/04/29 12:01:51.000.704,C:\Users\nao\Documents\Embarcadero\Studio\Projects\kuse-dd\Project1PCH1.h=C:\Users\nao\Documents\Embarcadero\Studio\Projects\Project1PCH1.h</Transaction>
+    <Transaction>2022/04/29 12:01:53.000.604,C:\Users\nao\Documents\Embarcadero\Studio\Projects\kuse-dd\Project1.cbproj=C:\Users\nao\Documents\Embarcadero\Studio\Projects\Project1.cbproj</Transaction>
   </Transactions>
 </BorlandProject>