From 0d7d45ac4e885157aec93c6a645bc866a64355ef Mon Sep 17 00:00:00 2001
From: Ross <writetoross@gmail.com>
Date: Mon, 27 Mar 2023 18:12:03 +1000
Subject: [PATCH] feat(windows): make output dir match keyman standard

---
 windows/src/support/texteditor/Editor.vcxproj | 13 +++++++++++++
 windows/src/support/texteditor/Makefile       | 11 ++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/windows/src/support/texteditor/Editor.vcxproj b/windows/src/support/texteditor/Editor.vcxproj
index 1dbdf64d4a..4b01793829 100644
--- a/windows/src/support/texteditor/Editor.vcxproj
+++ b/windows/src/support/texteditor/Editor.vcxproj
@@ -31,6 +31,8 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
@@ -38,12 +40,16 @@
     <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
@@ -51,6 +57,8 @@
     <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -72,15 +80,19 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)32</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)32</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)64</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)64</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -92,6 +104,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/windows/src/support/texteditor/Makefile b/windows/src/support/texteditor/Makefile
index f5aaba9cf9..331b06e66a 100644
--- a/windows/src/support/texteditor/Makefile
+++ b/windows/src/support/texteditor/Makefile
@@ -6,18 +6,19 @@
 
 build:
     $(MSBUILD) editor.vcxproj $(MSBUILD_BUILD)
-    $(COPY) Release\editor.exe $(PROGRAM)\support
-    $(COPY) Release\editor.pdb $(DEBUGPATH)\support
+    $(COPY) $(WIN32_TARGET_PATH)\editor32.exe $(PROGRAM)\support
+    $(COPY) $(WIN32_TARGET_PATH)\editor32.pdb $(PROGRAM)\support
+		$(COPY) $(X64_TARGET_PATH)\editor64.exe $(PROGRAM)\support
+    $(COPY) $(X64_TARGET_PATH)\editor64.pdb $(PROGRAM)\support
 
 clean: def-clean
     $(MSBUILD) $(MSBUILD_CLEAN) editor.sln
-    rmdir /s /q release
 
 signcode:
-    $(SIGNCODE) /d "Keyman Engine x64" $(PROGRAM)\support\editor.exe
+    $(SIGNCODE) /d "Text Editor for testing Keyman" $(PROGRAM)\support\editor32.exe
 
 install:
-    $(COPY) $(PROGRAM)\support\editor.exe "$(INSTALLPATH_KEYMANENGINE)"
+    $(COPY) $(PROGRAM)\support\editor32.exe "$(INSTALLPATH_KEYMANENGINE)"
 
 
 !include ..\..\Target.mak