diff options
author | glx <glx@openttd.org> | 2011-03-05 01:31:56 +0000 |
---|---|---|
committer | glx <glx@openttd.org> | 2011-03-05 01:31:56 +0000 |
commit | 0eade7efaf29c9f1149ac90d555b68ec7aae884d (patch) | |
tree | 58dc6121bf70d9da72cdf325e7788abc04596d4b /projects/settings_vs100.vcxproj | |
parent | 691825f39d87b3762eaa85b22fb39c13cc48090d (diff) | |
download | openttd-0eade7efaf29c9f1149ac90d555b68ec7aae884d.tar.xz |
(svn r22191) -Fix: make sure table/settings.h is generated with MSVC2010, also fix a warning in version project
Diffstat (limited to 'projects/settings_vs100.vcxproj')
-rw-r--r-- | projects/settings_vs100.vcxproj | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/projects/settings_vs100.vcxproj b/projects/settings_vs100.vcxproj index 094dbcfb5..7c2e03f76 100644 --- a/projects/settings_vs100.vcxproj +++ b/projects/settings_vs100.vcxproj @@ -13,7 +13,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Utility</ConfigurationType> + <ConfigurationType>Makefile</ConfigurationType> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -21,20 +21,20 @@ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> - <PropertyGroup Label="UserMacros" /> + <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 + </SettingsCommandLine> + </PropertyGroup> <PropertyGroup> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\</OutDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\</IntDir> + <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SettingsCommandLine)</NMakeBuildCommandLine> + <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SettingsCommandLine)</NMakeReBuildCommandLine> + <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">del ..\objs\settings\table\settings.h</NMakeCleanCommandLine> + <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\settings.h</NMakeOutput> </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <PreBuildEvent> - <Message>Generating settings.h</Message> - <Command> -..\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> <ItemGroup> <None Include="..\src\table\company_settings.ini" /> <None Include="..\src\table\currency_settings.ini" /> |