From 91709b16c3eed7d1113aedbd9c92f71e62a3b01d Mon Sep 17 00:00:00 2001
From: Kah Wei <msntkw@msn.com>
Date: Tue, 13 Sep 2022 20:35:30 +0800
Subject: [PATCH] Changed out and intermediatery directories for all projects
 to use shared directories

---
 SHADE_Application/SHADE_Application.vcxproj | 8 ++++----
 SHADE_Application/premake5.lua              | 4 ++--
 SHADE_Engine/SHADE_Engine.vcxproj           | 9 +++++----
 SHADE_Engine/SHADE_Engine.vcxproj.filters   | 1 +
 SHADE_Engine/premake5.lua                   | 4 ++--
 premake5.lua                                | 5 +++--
 6 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/SHADE_Application/SHADE_Application.vcxproj b/SHADE_Application/SHADE_Application.vcxproj
index 2616224e..59d25053 100644
--- a/SHADE_Application/SHADE_Application.vcxproj
+++ b/SHADE_Application/SHADE_Application.vcxproj
@@ -42,15 +42,15 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>bin\Debug_x86_64\SHADE_Application\</OutDir>
-    <IntDir>bin-int\Debug_x86_64\SHADE_Application\</IntDir>
+    <OutDir>..\bin\Debug\</OutDir>
+    <IntDir>..\bin_int\Debug\SHADE_Application\</IntDir>
     <TargetName>SHADE_Application</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>bin\Release_x86_64\SHADE_Application\</OutDir>
-    <IntDir>bin-int\Release_x86_64\SHADE_Application\</IntDir>
+    <OutDir>..\bin\Release\</OutDir>
+    <IntDir>..\bin_int\Release\SHADE_Application\</IntDir>
     <TargetName>SHADE_Application</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
diff --git a/SHADE_Application/premake5.lua b/SHADE_Application/premake5.lua
index 8c17bf55..d7f47246 100644
--- a/SHADE_Application/premake5.lua
+++ b/SHADE_Application/premake5.lua
@@ -2,8 +2,8 @@ project "SHADE_Application"
   kind "WindowedApp"
   language "C++"
   cppdialect "C++latest"
-  targetdir ("bin/" .. outputdir .. "/%{prj.name}")
-  objdir    ("bin-int/" .. outputdir .. "/%{prj.name}")
+  targetdir (outputdir)
+  objdir    (interdir)
   systemversion "latest"
   pchheader "SBpch.h"
   pchsource "%{prj.location}/src/SBpch.cpp"
diff --git a/SHADE_Engine/SHADE_Engine.vcxproj b/SHADE_Engine/SHADE_Engine.vcxproj
index 1c50ecc0..57c76f8e 100644
--- a/SHADE_Engine/SHADE_Engine.vcxproj
+++ b/SHADE_Engine/SHADE_Engine.vcxproj
@@ -41,14 +41,14 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>bin\Debug_x86_64\SHADE_Engine\</OutDir>
-    <IntDir>bin-int\Debug_x86_64\SHADE_Engine\</IntDir>
+    <OutDir>..\bin\Debug\</OutDir>
+    <IntDir>..\bin_int\Debug\SHADE_Engine\</IntDir>
     <TargetName>SHADE_Engine</TargetName>
     <TargetExt>.lib</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>bin\Release_x86_64\SHADE_Engine\</OutDir>
-    <IntDir>bin-int\Release_x86_64\SHADE_Engine\</IntDir>
+    <OutDir>..\bin\Release\</OutDir>
+    <IntDir>..\bin_int\Release\SHADE_Engine\</IntDir>
     <TargetName>SHADE_Engine</TargetName>
     <TargetExt>.lib</TargetExt>
   </PropertyGroup>
@@ -183,6 +183,7 @@
     <ClInclude Include="src\Resource\Handle.h" />
     <ClInclude Include="src\Resource\ResourceLibrary.h" />
     <ClInclude Include="src\Resource\SparseSet.h" />
+    <ClInclude Include="src\SH_API.h" />
     <ClInclude Include="src\SHpch.h" />
     <ClInclude Include="src\Scene\SHScene.h" />
     <ClInclude Include="src\Scene\SHSceneGraph.h" />
diff --git a/SHADE_Engine/SHADE_Engine.vcxproj.filters b/SHADE_Engine/SHADE_Engine.vcxproj.filters
index 7486fad4..6af93131 100644
--- a/SHADE_Engine/SHADE_Engine.vcxproj.filters
+++ b/SHADE_Engine/SHADE_Engine.vcxproj.filters
@@ -360,6 +360,7 @@
     <ClInclude Include="src\Resource\SparseSet.h">
       <Filter>Resource</Filter>
     </ClInclude>
+    <ClInclude Include="src\SH_API.h" />
     <ClInclude Include="src\SHpch.h" />
     <ClInclude Include="src\Scene\SHScene.h">
       <Filter>Scene</Filter>
diff --git a/SHADE_Engine/premake5.lua b/SHADE_Engine/premake5.lua
index c858d538..ddd9eaaa 100644
--- a/SHADE_Engine/premake5.lua
+++ b/SHADE_Engine/premake5.lua
@@ -2,8 +2,8 @@ project "SHADE_Engine"
   kind "StaticLib"
   language "C++"
   cppdialect "C++latest"
-  targetdir ("bin/" .. outputdir .. "/%{prj.name}")
-  objdir    ("bin-int/" .. outputdir .. "/%{prj.name}")
+  targetdir (outputdir)
+  objdir    (interdir)
   systemversion "latest"
   pchheader "SHpch.h"
   pchsource "%{prj.location}/src/SHpch.cpp"
diff --git a/premake5.lua b/premake5.lua
index d54f8e40..afb72a33 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -14,8 +14,9 @@ workspace "SHADE"
   {
 	"MultiProcessorCompile"
   }
-
-  outputdir = "%{cfg.buildcfg}_%{cfg.architecture}"
+  
+  outputdir = "%{wks.location}/bin/%{cfg.buildcfg}"
+  interdir = "%{wks.location}/bin_int"
   
   include "SHADE_Application"
   include "SHADE_Engine"