copy cimgui DLLs in their vcxproj instead of Dalamud

goatcorp · Dec 28, 2024 · d200c12 · d200c12
1 parent 4af9bc0
commit d200c12
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 20 deletions.
diff --git 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
@@ -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>
+  <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
@@ -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>
+  <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
@@ -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>
+  <Target Name="CopyOutputDlls" AfterTargets="PostBuildEvent">
+    <Copy SourceFiles="$(OutDir)$(TargetName).dll" DestinationFolder="..\..\bin\$(Configuration)\" />
+    <Copy SourceFiles="$(OutDir)$(TargetName).pdb" DestinationFolder="..\..\bin\$(Configuration)\" />
+  </Target>
+</Project>