From d200c12c2f40c012c1e7283ab1b1ec39b30d16e8 Mon Sep 17 00:00:00 2001
From: goat <goatsdev@protonmail.com>
Date: Sat, 28 Dec 2024 14:02:06 +0100
Subject: [PATCH] copy cimgui DLLs in their vcxproj instead of Dalamud

---
 Dalamud/Dalamud.csproj               | 14 --------------
 external/cimgui/cimgui.vcxproj       |  9 +++++++--
 external/cimguizmo/cimguizmo.vcxproj |  9 +++++++--
 external/cimplot/cimplot.vcxproj     |  9 +++++++--
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/Dalamud/Dalamud.csproj b/Dalamud/Dalamud.csproj
index 1cd9fc336..d869f76ba 100644
--- a/Dalamud/Dalamud.csproj
+++ b/Dalamud/Dalamud.csproj
@@ -205,18 +205,4 @@
     <Target Name="CopyPluginTargets" AfterTargets="Build">
         <Copy SourceFiles="$(ProjectDir)\..\targets\Dalamud.Plugin.targets;$(ProjectDir)\..\targets\Dalamud.Plugin.Bootstrap.targets" DestinationFolder="$(OutDir)\targets" />
     </Target>
-
-    <!-- Copy imgui binaries into distrib -->
-    <!-- TEMP: We will move these to ImGuiScene once it is in-tree -->
-    <!-- Build order is controlled through the solution or nuke -->
-    <Target Name="CopyImGuiBinaries" AfterTargets="Build">
-        <Copy SourceFiles="..\external\x64\$(Configuration)\cimgui.dll" DestinationFolder="$(OutDir)" />
-        <Copy SourceFiles="..\external\x64\$(Configuration)\cimgui.pdb" DestinationFolder="$(OutDir)" />
-
-        <Copy SourceFiles="..\external\x64\$(Configuration)\cimplot.dll" DestinationFolder="$(OutDir)" />
-        <Copy SourceFiles="..\external\x64\$(Configuration)\cimplot.pdb" DestinationFolder="$(OutDir)" />
-
-        <Copy SourceFiles="..\external\x64\$(Configuration)\cimguizmo.dll" DestinationFolder="$(OutDir)" />
-        <Copy SourceFiles="..\external\x64\$(Configuration)\cimguizmo.pdb" DestinationFolder="$(OutDir)" />
-    </Target>
 </Project>
diff --git a/external/cimgui/cimgui.vcxproj b/external/cimgui/cimgui.vcxproj
index a7a7ddb0e..55e737595 100644
--- a/external/cimgui/cimgui.vcxproj
+++ b/external/cimgui/cimgui.vcxproj
@@ -56,7 +56,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <OutDir>..\$(Platform)\$(Configuration)\</OutDir>
+      <OutDir>bin\$(Configuration)\</OutDir>
+      <IntDir>obj\$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
@@ -99,4 +100,8 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+  <Target Name="CopyOutputDlls" AfterTargets="PostBuildEvent">
+    <Copy SourceFiles="$(OutDir)$(TargetName).dll" DestinationFolder="..\..\bin\$(Configuration)\" />
+    <Copy SourceFiles="$(OutDir)$(TargetName).pdb" DestinationFolder="..\..\bin\$(Configuration)\" />
+  </Target>
+</Project>
diff --git a/external/cimguizmo/cimguizmo.vcxproj b/external/cimguizmo/cimguizmo.vcxproj
index 48b432327..3014786b8 100644
--- a/external/cimguizmo/cimguizmo.vcxproj
+++ b/external/cimguizmo/cimguizmo.vcxproj
@@ -60,7 +60,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <OutDir>..\$(Platform)\$(Configuration)\</OutDir>
+      <OutDir>bin\$(Configuration)\</OutDir>
+      <IntDir>obj\$(Configuration)\</IntDir>
   </PropertyGroup>
 
   <ItemDefinitionGroup>
@@ -105,4 +106,8 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+  <Target Name="CopyOutputDlls" AfterTargets="PostBuildEvent">
+    <Copy SourceFiles="$(OutDir)$(TargetName).dll" DestinationFolder="..\..\bin\$(Configuration)\" />
+    <Copy SourceFiles="$(OutDir)$(TargetName).pdb" DestinationFolder="..\..\bin\$(Configuration)\" />
+  </Target>
+</Project>
diff --git a/external/cimplot/cimplot.vcxproj b/external/cimplot/cimplot.vcxproj
index c7ae46a6b..c2b468fab 100644
--- a/external/cimplot/cimplot.vcxproj
+++ b/external/cimplot/cimplot.vcxproj
@@ -58,7 +58,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <OutDir>..\$(Platform)\$(Configuration)\</OutDir>
+      <OutDir>bin\$(Configuration)\</OutDir>
+      <IntDir>obj\$(Configuration)\</IntDir>
   </PropertyGroup>
 
   <ItemDefinitionGroup>
@@ -103,4 +104,8 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+  <Target Name="CopyOutputDlls" AfterTargets="PostBuildEvent">
+    <Copy SourceFiles="$(OutDir)$(TargetName).dll" DestinationFolder="..\..\bin\$(Configuration)\" />
+    <Copy SourceFiles="$(OutDir)$(TargetName).pdb" DestinationFolder="..\..\bin\$(Configuration)\" />
+  </Target>
+</Project>