(svn r22202) -Codechange: make MusicFileSettings a proper citizen of the client settings

4 files changed, 3 insertions, 15 deletions

diff --git a/projects/settings_vs100.vcxproj b/projects/settings_vs100.vcxproj
index 7c2e03f76..51f1f5b5e 100644
--- a/projects/settings_vs100.vcxproj
+++ b/projects/settings_vs100.vcxproj
@@ -23,7 +23,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <SettingsCommandLine>
-..\objs\settings\settings_gen.exe -o ..\objs\settings\table\settings.h -b ..\src\table\settings.h.preamble -a ..\src\table\settings.h.postamble ..\src\table\company_settings.ini ..\src\table\currency_settings.ini ..\src\table\gameopt_settings.ini ..\src\table\misc_settings.ini ..\src\table\music_settings.ini ..\src\table\settings.ini ..\src\table\win32_settings.ini
+..\objs\settings\settings_gen.exe -o ..\objs\settings\table\settings.h -b ..\src\table\settings.h.preamble -a ..\src\table\settings.h.postamble ..\src\table\company_settings.ini ..\src\table\currency_settings.ini ..\src\table\gameopt_settings.ini ..\src\table\misc_settings.ini ..\src\table\settings.ini ..\src\table\win32_settings.ini
     </SettingsCommandLine>
   </PropertyGroup>
   <PropertyGroup>
@@ -40,7 +40,6 @@
     <None Include="..\src\table\currency_settings.ini" />
     <None Include="..\src\table\gameopt_settings.ini" />
     <None Include="..\src\table\misc_settings.ini" />
-    <None Include="..\src\table\music_settings.ini" />
     <None Include="..\src\table\settings.ini" />
     <None Include="..\src\table\win32_settings.ini" />
   </ItemGroup>
diff --git a/projects/settings_vs100.vcxproj.filters b/projects/settings_vs100.vcxproj.filters
index 835e30e3d..2c579391b 100644
--- a/projects/settings_vs100.vcxproj.filters
+++ b/projects/settings_vs100.vcxproj.filters
@@ -18,9 +18,6 @@
     <None Include="..\src\table\misc_settings.ini">
       <Filter>INI</Filter>
     </None>
-    <None Include="..\src\table\music_settings.ini">
-      <Filter>INI</Filter>
-    </None>
     <None Include="..\src\table\settings.ini">
       <Filter>INI</Filter>
     </None>
diff --git a/projects/settings_vs80.vcproj b/projects/settings_vs80.vcproj
index e28b731ed..9ecc87097 100644
--- a/projects/settings_vs80.vcproj
+++ b/projects/settings_vs80.vcproj
@@ -24,7 +24,7 @@
 				Name="VCPreBuildEventTool"
 				Description="Generating settings.h"
 				CommandLine="
-..\objs\settings\settings_gen.exe -o ..\objs\settings\table\settings.h -b ..\src\table\settings.h.preamble -a ..\src\table\settings.h.postamble ..\src\table\company_settings.ini ..\src\table\currency_settings.ini ..\src\table\gameopt_settings.ini ..\src\table\misc_settings.ini ..\src\table\music_settings.ini ..\src\table\settings.ini ..\src\table\win32_settings.ini
+..\objs\settings\settings_gen.exe -o ..\objs\settings\table\settings.h -b ..\src\table\settings.h.preamble -a ..\src\table\settings.h.postamble ..\src\table\company_settings.ini ..\src\table\currency_settings.ini ..\src\table\gameopt_settings.ini ..\src\table\misc_settings.ini ..\src\table\settings.ini ..\src\table\win32_settings.ini
 				"
 			/>
 			<Tool
@@ -61,10 +61,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\src\table\music_settings.ini"
-			>
-		</File>
-		<File
 			RelativePath="..\src\table\settings.ini"
 			>
 		</File>
diff --git a/projects/settings_vs90.vcproj b/projects/settings_vs90.vcproj
index 4bf545398..ac6a75ee8 100644
--- a/projects/settings_vs90.vcproj
+++ b/projects/settings_vs90.vcproj
@@ -25,7 +25,7 @@
 				Name="VCPreBuildEventTool"
 				Description="Generating settings.h"
 				CommandLine="
-..\objs\settings\settings_gen.exe -o ..\objs\settings\table\settings.h -b ..\src\table\settings.h.preamble -a ..\src\table\settings.h.postamble ..\src\table\company_settings.ini ..\src\table\currency_settings.ini ..\src\table\gameopt_settings.ini ..\src\table\misc_settings.ini ..\src\table\music_settings.ini ..\src\table\settings.ini ..\src\table\win32_settings.ini
+..\objs\settings\settings_gen.exe -o ..\objs\settings\table\settings.h -b ..\src\table\settings.h.preamble -a ..\src\table\settings.h.postamble ..\src\table\company_settings.ini ..\src\table\currency_settings.ini ..\src\table\gameopt_settings.ini ..\src\table\misc_settings.ini ..\src\table\settings.ini ..\src\table\win32_settings.ini
 				"
 			/>
 			<Tool
@@ -62,10 +62,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\src\table\music_settings.ini"
-			>
-		</File>
-		<File
 			RelativePath="..\src\table\settings.ini"
 			>
 		</File>