Unified output folder

X-Hax · Feb 18, 2016 · 68c4180 · 68c4180
1 parent 90eebe6
commit 68c4180
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/BuildScript.ini b/BuildScript.ini
@@ -6,14 +6,14 @@ libmpg123-0.dll=extlib\\bass\\libmpg123-0.dll
 libogg.dll=extlib\\bass\\libogg.dll
 libvorbis.dll=extlib\\bass\\libvorbis.dll
 libvorbisfile.dll=extlib\\bass\\libvorbisfile.dll
-SADXModManager.exe=SADXModManager\\bin\\Release\\SADXModManager.exe
-SADXModManager.exe.config=SADXModManager\\bin\\Release\\SADXModManager.exe.config
-SADXModManager.pdb=SADXModManager\\bin\\Release\\SADXModManager.pdb
-SharpDX.dll=SADXModManager\\bin\\Release\\SharpDX.dll
-SharpDX.DirectInput.dll=SADXModManager\\bin\\Release\\SharpDX.DirectInput.dll
+SADXModManager.exe=bin\\SADXModManager.exe
+SADXModManager.exe.config=bin\\SADXModManager.exe.config
+SADXModManager.pdb=bin\\SADXModManager.pdb
+SharpDX.dll=bin\\SharpDX.dll
+SharpDX.DirectInput.dll=bin\\SharpDX.DirectInput.dll
 mods\\Border.png=data\\Border.png
 mods\\Codes.xml=data\\Codes.xml
-mods\\SADXModLoader.dll=Release\\SADXModLoader.dll
+mods\\SADXModLoader.dll=bin\\SADXModLoader.dll
 programming=SADXModLoader\\include
 programming\\AnimationFile.cpp=libmodutils\\AnimationFile.cpp
 programming\\AnimationFile.h=libmodutils\\AnimationFile.h

diff --git a/SADXModLoader/SADXModLoader.vcxproj b/SADXModLoader/SADXModLoader.vcxproj
@@ -96,10 +96,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);$(ProgramFiles)\DirectX 8.1 SDK\include</IncludePath>
+    <OutDir>$(SolutionDir)bin\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <IncludePath>$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);$(ProgramFiles)\DirectX 8.1 SDK\include</IncludePath>
+    <OutDir>$(SolutionDir)bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -114,7 +116,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>$(ProgramFiles)\DirectX 8.1 SDK\lib;..\extlib\bass</AdditionalLibraryDirectories>
-      <AdditionalDependencies>d3dx8.lib;bass.lib;bass_vgmstream.lib;..\$(Configuration)\libmodutils.lib;shlwapi.lib;dbghelp.lib;gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>d3dx8.lib;bass.lib;bass_vgmstream.lib;$(OutDir)libmodutils.lib;shlwapi.lib;dbghelp.lib;gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>libci.lib</IgnoreSpecificDefaultLibraries>
     </Link>
     <PreBuildEvent>
@@ -138,7 +140,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>$(ProgramFiles)\DirectX 8.1 SDK\lib;..\extlib\bass</AdditionalLibraryDirectories>
-      <AdditionalDependencies>d3dx8.lib;bass.lib;bass_vgmstream.lib;..\$(Configuration)\libmodutils.lib;shlwapi.lib;dbghelp.lib;gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>d3dx8.lib;bass.lib;bass_vgmstream.lib;$(OutDir)libmodutils.lib;shlwapi.lib;dbghelp.lib;gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>libci.lib</IgnoreSpecificDefaultLibraries>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>

diff --git a/SADXModManager/SADXModManager.csproj b/SADXModManager/SADXModManager.csproj
@@ -21,7 +21,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -30,7 +30,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

diff --git a/libmodutils/libmodutils.vcxproj b/libmodutils/libmodutils.vcxproj
@@ -41,9 +41,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <IncludePath>$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);$(ProgramFiles)\DirectX 8.1 SDK\include</IncludePath>
+    <OutDir>$(SolutionDir)bin\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <IncludePath>$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);$(ProgramFiles)\DirectX 8.1 SDK\include</IncludePath>
+    <OutDir>$(SolutionDir)bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>