Move midiproc project into doomretro solution

bradharding · Nov 18, 2016 · 9bd66ae · 9bd66ae
1 parent e4ce217
commit 9bd66ae
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 29 deletions.
diff --git a/midiproc/midiproc.sln b/midiproc/midiproc.sln
diff --git a/midiproc/midiproc.vcxproj b/midiproc/midiproc.vcxproj
@@ -93,9 +93,6 @@
       <TargetMachine>MachineX86</TargetMachine>
       <AdditionalLibraryDirectories>$(ProjectDir)..\SDL2-2.0.5\lib\x86;$(ProjectDir)..\SDL2_mixer-2.0.1\lib\x86</AdditionalLibraryDirectories>
     </Link>
-    <PostBuildEvent>
-      <Command>copy /Y $(TargetPath) $(TargetDir)..\..\msvc\Release\$(TargetFileName)</Command>
-    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp" />

diff --git a/msvc/doomretro.sln b/msvc/doomretro.sln
@@ -1,9 +1,11 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.25914.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doomretro", "doomretro.vcxproj", "{8B744A3B-8F18-41A0-85A3-293816E85B6E}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "midiproc", "..\midiproc\midiproc.vcxproj", "{D307F009-3EC2-45DF-98F6-C2DB0C02FF18}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -16,8 +18,14 @@ Global
 		{8B744A3B-8F18-41A0-85A3-293816E85B6E}.Release|Win32.ActiveCfg = Release|Win32
 		{8B744A3B-8F18-41A0-85A3-293816E85B6E}.Release|Win32.Build.0 = Release|Win32
 		{8B744A3B-8F18-41A0-85A3-293816E85B6E}.Template|Win32.ActiveCfg = Release|Win32
+		{D307F009-3EC2-45DF-98F6-C2DB0C02FF18}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D307F009-3EC2-45DF-98F6-C2DB0C02FF18}.Debug|Win32.Build.0 = Debug|Win32
+		{D307F009-3EC2-45DF-98F6-C2DB0C02FF18}.Release|Win32.ActiveCfg = Release|Win32
+		{D307F009-3EC2-45DF-98F6-C2DB0C02FF18}.Release|Win32.Build.0 = Release|Win32
+		{D307F009-3EC2-45DF-98F6-C2DB0C02FF18}.Template|Win32.ActiveCfg = Release|Win32
+		{D307F009-3EC2-45DF-98F6-C2DB0C02FF18}.Template|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = TRUE
+		HideSolutionNode = FALSE
 	EndGlobalSection
 EndGlobal
diff --git a/msvc/doomretro.vcxproj b/msvc/doomretro.vcxproj
@@ -257,7 +257,6 @@
     <CustomBuildStep Include="..\src\w_wad.h" />
     <CustomBuildStep Include="..\src\wi_stuff.h" />
     <CustomBuildStep Include="..\src\z_zone.h" />
-    <ClInclude Include="..\midiproc\midiproc.h" />
     <ClInclude Include="..\src\am_map.h" />
     <ClInclude Include="..\src\c_cmds.h" />
     <ClInclude Include="..\src\c_console.h" />