Mercurial > hg > openttd
changeset 17436:658216b20ef7 draft
(svn r22190) -Fix (r22188): minor changes in project files
author | glx <glx@openttd.org> |
---|---|
date | Fri, 04 Mar 2011 23:44:10 +0000 |
parents | a11b37ab3106 |
children | 771a2ca3d4c1 |
files | projects/generate projects/generate.vbs projects/settings_vs100.vcxproj projects/settings_vs100.vcxproj.in projects/settings_vs80.vcproj projects/settings_vs80.vcproj.in projects/settings_vs90.vcproj projects/settings_vs90.vcproj.in projects/settingsgen_vs100.vcxproj |
diffstat | 9 files changed, 19 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/projects/generate +++ b/projects/generate @@ -207,7 +207,7 @@ load_settings_data() { RES="" RES2=" -#3\$(IntDir)\\settings_gen.exe -o \$(OutDir)\\table\\settings.h -b ..\\src\\table\\settings.h.preamble -a ..\\src\\table\\settings.h.postamble" +#3..\\objs\\settings\\settings_gen.exe -o ..\\objs\\settings\\table\\settings.h -b ..\\src\\table\\settings.h.preamble -a ..\\src\\table\\settings.h.postamble" for i in `ls $1` do i=`basename $i`
--- a/projects/generate.vbs +++ b/projects/generate.vbs @@ -277,7 +277,7 @@ Function load_settings_data(dir, ByRef vcxproj, ByRef command, ByRef files) Dim res, folder, file, first_time res = "" - command = "$(IntDir)\settings_gen.exe -o $(OutDir)\table\settings.h -b ..\src\table\settings.h.preamble -a ..\src\table\settings.h.postamble" + command = "..\objs\settings\settings_gen.exe -o ..\objs\settings\table\settings.h -b ..\src\table\settings.h.preamble -a ..\src\table\settings.h.postamble" Set folder = FSO.GetFolder(dir) For Each file In folder.Files file = FSO.GetFileName(file)
--- a/projects/settings_vs100.vcxproj +++ b/projects/settings_vs100.vcxproj @@ -24,14 +24,14 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\</IntDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PreBuildEvent> <Message>Generating settings.h</Message> <Command> -$(IntDir)\settings_gen.exe -o $(OutDir)\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\music_settings.ini ..\src\table\settings.ini ..\src\table\win32_settings.ini </Command> </PreBuildEvent> </ItemDefinitionGroup>
--- a/projects/settings_vs100.vcxproj.in +++ b/projects/settings_vs100.vcxproj.in @@ -24,8 +24,8 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\</IntDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PreBuildEvent>
--- a/projects/settings_vs80.vcproj +++ b/projects/settings_vs80.vcproj @@ -16,15 +16,15 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="..\objs\settings" - IntermediateDirectory="..\objs\settings" + OutputDirectory="..\objs\settings\table" + IntermediateDirectory="..\objs\settings\table" ConfigurationType="10" > <Tool Name="VCPreBuildEventTool" Description="Generating settings.h" CommandLine=" -$(IntDir)\settings_gen.exe -o $(OutDir)\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\music_settings.ini ..\src\table\settings.ini ..\src\table\win32_settings.ini " /> <Tool
--- a/projects/settings_vs80.vcproj.in +++ b/projects/settings_vs80.vcproj.in @@ -16,8 +16,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="..\objs\settings" - IntermediateDirectory="..\objs\settings" + OutputDirectory="..\objs\settings\table" + IntermediateDirectory="..\objs\settings\table" ConfigurationType="10" > <Tool
--- a/projects/settings_vs90.vcproj +++ b/projects/settings_vs90.vcproj @@ -17,15 +17,15 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="..\objs\settings" - IntermediateDirectory="..\objs\settings" + OutputDirectory="..\objs\settings\table" + IntermediateDirectory="..\objs\settings\table" ConfigurationType="10" > <Tool Name="VCPreBuildEventTool" Description="Generating settings.h" CommandLine=" -$(IntDir)\settings_gen.exe -o $(OutDir)\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\music_settings.ini ..\src\table\settings.ini ..\src\table\win32_settings.ini " /> <Tool
--- a/projects/settings_vs90.vcproj.in +++ b/projects/settings_vs90.vcproj.in @@ -17,8 +17,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="..\objs\settings" - IntermediateDirectory="..\objs\settings" + OutputDirectory="..\objs\settings\table" + IntermediateDirectory="..\objs\settings\table" ConfigurationType="10" > <Tool
--- a/projects/settingsgen_vs100.vcxproj +++ b/projects/settingsgen_vs100.vcxproj @@ -27,6 +27,7 @@ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\</OutDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\</IntDir> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">settings_gen</TargetName> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PreBuildEvent> @@ -77,4 +78,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project> \ No newline at end of file