diff options
author | Peter Nelson <peter1138@openttd.org> | 2019-01-13 09:08:01 +0000 |
---|---|---|
committer | PeterN <peter@fuzzle.org> | 2019-01-25 22:28:39 +0000 |
commit | 1334cfb3e5fd13fb51dc9cbf0690f55f5a57c4bf (patch) | |
tree | 905186d23663141353f874108d38547c19716bca /projects | |
parent | e76fd99c472237125f03d46ed7bff915e2d6a20b (diff) | |
download | openttd-1334cfb3e5fd13fb51dc9cbf0690f55f5a57c4bf.tar.xz |
Change: Always build baseset metadata, instead of including it in the repo.
This adds a script and project files to generate these files within MSVC.
Diffstat (limited to 'projects')
-rw-r--r-- | projects/basesets_vs140.vcxproj | 99 | ||||
-rw-r--r-- | projects/basesets_vs140.vcxproj.filters | 40 | ||||
-rw-r--r-- | projects/basesets_vs140.vcxproj.filters.in | 11 | ||||
-rw-r--r-- | projects/basesets_vs140.vcxproj.in | 40 | ||||
-rw-r--r-- | projects/basesets_vs141.vcxproj | 99 | ||||
-rw-r--r-- | projects/basesets_vs141.vcxproj.filters | 40 | ||||
-rw-r--r-- | projects/basesets_vs141.vcxproj.filters.in | 11 | ||||
-rw-r--r-- | projects/basesets_vs141.vcxproj.in | 40 | ||||
-rwxr-xr-x | projects/generate | 49 | ||||
-rw-r--r-- | projects/generate.vbs | 51 | ||||
-rw-r--r-- | projects/openttd_vs140.sln | 10 | ||||
-rw-r--r-- | projects/openttd_vs140.vcxproj | 4 | ||||
-rw-r--r-- | projects/openttd_vs140.vcxproj.in | 4 | ||||
-rw-r--r-- | projects/openttd_vs141.sln | 10 | ||||
-rw-r--r-- | projects/openttd_vs141.vcxproj | 4 | ||||
-rw-r--r-- | projects/openttd_vs141.vcxproj.in | 4 |
16 files changed, 516 insertions, 0 deletions
diff --git a/projects/basesets_vs140.vcxproj b/projects/basesets_vs140.vcxproj new file mode 100644 index 000000000..4e5ed52c4 --- /dev/null +++ b/projects/basesets_vs140.vcxproj @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectName>basesets</ProjectName> + <ProjectGuid>{E12E77CA-C0F1-4ADA-943F-4929274249D3}</ProjectGuid> + <RootNamespace>basesets</RootNamespace> + <Keyword>MakeFileProj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Utility</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <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"> + <Langs>..\src\lang\afrikaans.txt;..\src\lang\arabic_egypt.txt;..\src\lang\basque.txt;..\src\lang\belarusian.txt;..\src\lang\brazilian_portuguese.txt;..\src\lang\bulgarian.txt;..\src\lang\catalan.txt;..\src\lang\croatian.txt;..\src\lang\czech.txt;..\src\lang\danish.txt;..\src\lang\dutch.txt;..\src\lang\english.txt;..\src\lang\english_AU.txt;..\src\lang\english_US.txt;..\src\lang\esperanto.txt;..\src\lang\estonian.txt;..\src\lang\faroese.txt;..\src\lang\finnish.txt;..\src\lang\french.txt;..\src\lang\gaelic.txt;..\src\lang\galician.txt;..\src\lang\german.txt;..\src\lang\greek.txt;..\src\lang\hebrew.txt;..\src\lang\hungarian.txt;..\src\lang\icelandic.txt;..\src\lang\indonesian.txt;..\src\lang\irish.txt;..\src\lang\italian.txt;..\src\lang\japanese.txt;..\src\lang\korean.txt;..\src\lang\latin.txt;..\src\lang\latvian.txt;..\src\lang\lithuanian.txt;..\src\lang\luxembourgish.txt;..\src\lang\malay.txt;..\src\lang\norwegian_bokmal.txt;..\src\lang\norwegian_nynorsk.txt;..\src\lang\polish.txt;..\src\lang\portuguese.txt;..\src\lang\romanian.txt;..\src\lang\russian.txt;..\src\lang\serbian.txt;..\src\lang\simplified_chinese.txt;..\src\lang\slovak.txt;..\src\lang\slovenian.txt;..\src\lang\spanish.txt;..\src\lang\spanish_MX.txt;..\src\lang\swedish.txt;..\src\lang\tamil.txt;..\src\lang\thai.txt;..\src\lang\traditional_chinese.txt;..\src\lang\turkish.txt;..\src\lang\ukrainian.txt;..\src\lang\vietnamese.txt;..\src\lang\welsh.txt</Langs> + </PropertyGroup> + <PropertyGroup> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\baseset\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\baseset\</IntDir> + </PropertyGroup> + <ItemGroup> + <CustomBuild Include="..\media\baseset\no_music.obm"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating no_music.obm baseset metadata file</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript //nologo ..\media\baseset\translations.vbs "%(FullPath)" "$(OutputPath)no_music.obm" ..\src\lang ..\bin\baseset\orig_extra.grf</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Langs);..\bin\baseset\orig_extra.grf;%(AdditionalInputs)</AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\baseset\no_music.obm;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="..\media\baseset\no_sound.obs"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating no_sound.obs baseset metadata file</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript //nologo ..\media\baseset\translations.vbs "%(FullPath)" "$(OutputPath)no_sound.obs" ..\src\lang ..\bin\baseset\orig_extra.grf</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Langs);..\bin\baseset\orig_extra.grf;%(AdditionalInputs)</AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\baseset\no_sound.obs;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_dos.obg"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating orig_dos.obg baseset metadata file</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript //nologo ..\media\baseset\translations.vbs "%(FullPath)" "$(OutputPath)orig_dos.obg" ..\src\lang ..\bin\baseset\orig_extra.grf</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Langs);..\bin\baseset\orig_extra.grf;%(AdditionalInputs)</AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\baseset\orig_dos.obg;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_dos.obm"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating orig_dos.obm baseset metadata file</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript //nologo ..\media\baseset\translations.vbs "%(FullPath)" "$(OutputPath)orig_dos.obm" ..\src\lang ..\bin\baseset\orig_extra.grf</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Langs);..\bin\baseset\orig_extra.grf;%(AdditionalInputs)</AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\baseset\orig_dos.obm;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_dos.obs"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating orig_dos.obs baseset metadata file</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript //nologo ..\media\baseset\translations.vbs "%(FullPath)" "$(OutputPath)orig_dos.obs" ..\src\lang ..\bin\baseset\orig_extra.grf</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Langs);..\bin\baseset\orig_extra.grf;%(AdditionalInputs)</AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\baseset\orig_dos.obs;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_dos_de.obg"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating orig_dos_de.obg baseset metadata file</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript //nologo ..\media\baseset\translations.vbs "%(FullPath)" "$(OutputPath)orig_dos_de.obg" ..\src\lang ..\bin\baseset\orig_extra.grf</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Langs);..\bin\baseset\orig_extra.grf;%(AdditionalInputs)</AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\baseset\orig_dos_de.obg;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_tto.obm"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating orig_tto.obm baseset metadata file</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript //nologo ..\media\baseset\translations.vbs "%(FullPath)" "$(OutputPath)orig_tto.obm" ..\src\lang ..\bin\baseset\orig_extra.grf</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Langs);..\bin\baseset\orig_extra.grf;%(AdditionalInputs)</AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\baseset\orig_tto.obm;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_win.obg"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating orig_win.obg baseset metadata file</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript //nologo ..\media\baseset\translations.vbs "%(FullPath)" "$(OutputPath)orig_win.obg" ..\src\lang ..\bin\baseset\orig_extra.grf</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Langs);..\bin\baseset\orig_extra.grf;%(AdditionalInputs)</AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\baseset\orig_win.obg;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_win.obm"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating orig_win.obm baseset metadata file</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript //nologo ..\media\baseset\translations.vbs "%(FullPath)" "$(OutputPath)orig_win.obm" ..\src\lang ..\bin\baseset\orig_extra.grf</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Langs);..\bin\baseset\orig_extra.grf;%(AdditionalInputs)</AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\baseset\orig_win.obm;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_win.obs"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating orig_win.obs baseset metadata file</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript //nologo ..\media\baseset\translations.vbs "%(FullPath)" "$(OutputPath)orig_win.obs" ..\src\lang ..\bin\baseset\orig_extra.grf</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Langs);..\bin\baseset\orig_extra.grf;%(AdditionalInputs)</AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\baseset\orig_win.obs;%(Outputs)</Outputs> + </CustomBuild> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> diff --git a/projects/basesets_vs140.vcxproj.filters b/projects/basesets_vs140.vcxproj.filters new file mode 100644 index 000000000..aa555f3fc --- /dev/null +++ b/projects/basesets_vs140.vcxproj.filters @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Baseset Metadata"> + <UniqueIdentifier>{b5a3ac67-19a9-4276-80e9-2360367d2680}</UniqueIdentifier> + </Filter> + </ItemGroup> + <ItemGroup> + <CustomBuild Include="..\media\baseset\no_music.obm"> + <Filter>Baseset Metadata</Filter> + </CustomBuild> + <CustomBuild Include="..\media\baseset\no_sound.obs"> + <Filter>Baseset Metadata</Filter> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_dos.obg"> + <Filter>Baseset Metadata</Filter> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_dos.obm"> + <Filter>Baseset Metadata</Filter> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_dos.obs"> + <Filter>Baseset Metadata</Filter> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_dos_de.obg"> + <Filter>Baseset Metadata</Filter> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_tto.obm"> + <Filter>Baseset Metadata</Filter> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_win.obg"> + <Filter>Baseset Metadata</Filter> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_win.obm"> + <Filter>Baseset Metadata</Filter> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_win.obs"> + <Filter>Baseset Metadata</Filter> + </CustomBuild> + </ItemGroup> +</Project> diff --git a/projects/basesets_vs140.vcxproj.filters.in b/projects/basesets_vs140.vcxproj.filters.in new file mode 100644 index 000000000..07bff4542 --- /dev/null +++ b/projects/basesets_vs140.vcxproj.filters.in @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Baseset Metadata"> + <UniqueIdentifier>{b5a3ac67-19a9-4276-80e9-2360367d2680}</UniqueIdentifier> + </Filter> + </ItemGroup> + <ItemGroup> +!!FILES!! + </ItemGroup> +</Project> diff --git a/projects/basesets_vs140.vcxproj.in b/projects/basesets_vs140.vcxproj.in new file mode 100644 index 000000000..0471100a3 --- /dev/null +++ b/projects/basesets_vs140.vcxproj.in @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectName>basesets</ProjectName> + <ProjectGuid>{E12E77CA-C0F1-4ADA-943F-4929274249D3}</ProjectGuid> + <RootNamespace>basesets</RootNamespace> + <Keyword>MakeFileProj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Utility</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <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"> +!!FILTERS!! + </PropertyGroup> + <PropertyGroup> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\baseset\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\baseset\</IntDir> + </PropertyGroup> + <ItemGroup> +!!FILES!! + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> diff --git a/projects/basesets_vs141.vcxproj b/projects/basesets_vs141.vcxproj new file mode 100644 index 000000000..a01f24989 --- /dev/null +++ b/projects/basesets_vs141.vcxproj @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectName>basesets</ProjectName> + <ProjectGuid>{E12E77CA-C0F1-4ADA-943F-4929274249D3}</ProjectGuid> + <RootNamespace>basesets</RootNamespace> + <Keyword>MakeFileProj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Utility</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <PlatformToolset>v141</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <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"> + <Langs>..\src\lang\afrikaans.txt;..\src\lang\arabic_egypt.txt;..\src\lang\basque.txt;..\src\lang\belarusian.txt;..\src\lang\brazilian_portuguese.txt;..\src\lang\bulgarian.txt;..\src\lang\catalan.txt;..\src\lang\croatian.txt;..\src\lang\czech.txt;..\src\lang\danish.txt;..\src\lang\dutch.txt;..\src\lang\english.txt;..\src\lang\english_AU.txt;..\src\lang\english_US.txt;..\src\lang\esperanto.txt;..\src\lang\estonian.txt;..\src\lang\faroese.txt;..\src\lang\finnish.txt;..\src\lang\french.txt;..\src\lang\gaelic.txt;..\src\lang\galician.txt;..\src\lang\german.txt;..\src\lang\greek.txt;..\src\lang\hebrew.txt;..\src\lang\hungarian.txt;..\src\lang\icelandic.txt;..\src\lang\indonesian.txt;..\src\lang\irish.txt;..\src\lang\italian.txt;..\src\lang\japanese.txt;..\src\lang\korean.txt;..\src\lang\latin.txt;..\src\lang\latvian.txt;..\src\lang\lithuanian.txt;..\src\lang\luxembourgish.txt;..\src\lang\malay.txt;..\src\lang\norwegian_bokmal.txt;..\src\lang\norwegian_nynorsk.txt;..\src\lang\polish.txt;..\src\lang\portuguese.txt;..\src\lang\romanian.txt;..\src\lang\russian.txt;..\src\lang\serbian.txt;..\src\lang\simplified_chinese.txt;..\src\lang\slovak.txt;..\src\lang\slovenian.txt;..\src\lang\spanish.txt;..\src\lang\spanish_MX.txt;..\src\lang\swedish.txt;..\src\lang\tamil.txt;..\src\lang\thai.txt;..\src\lang\traditional_chinese.txt;..\src\lang\turkish.txt;..\src\lang\ukrainian.txt;..\src\lang\vietnamese.txt;..\src\lang\welsh.txt</Langs> + </PropertyGroup> + <PropertyGroup> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\baseset\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\baseset\</IntDir> + </PropertyGroup> + <ItemGroup> + <CustomBuild Include="..\media\baseset\no_music.obm"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating no_music.obm baseset metadata file</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript //nologo ..\media\baseset\translations.vbs "%(FullPath)" "$(OutputPath)no_music.obm" ..\src\lang ..\bin\baseset\orig_extra.grf</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Langs);..\bin\baseset\orig_extra.grf;%(AdditionalInputs)</AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\baseset\no_music.obm;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="..\media\baseset\no_sound.obs"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating no_sound.obs baseset metadata file</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript //nologo ..\media\baseset\translations.vbs "%(FullPath)" "$(OutputPath)no_sound.obs" ..\src\lang ..\bin\baseset\orig_extra.grf</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Langs);..\bin\baseset\orig_extra.grf;%(AdditionalInputs)</AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\baseset\no_sound.obs;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_dos.obg"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating orig_dos.obg baseset metadata file</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript //nologo ..\media\baseset\translations.vbs "%(FullPath)" "$(OutputPath)orig_dos.obg" ..\src\lang ..\bin\baseset\orig_extra.grf</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Langs);..\bin\baseset\orig_extra.grf;%(AdditionalInputs)</AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\baseset\orig_dos.obg;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_dos.obm"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating orig_dos.obm baseset metadata file</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript //nologo ..\media\baseset\translations.vbs "%(FullPath)" "$(OutputPath)orig_dos.obm" ..\src\lang ..\bin\baseset\orig_extra.grf</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Langs);..\bin\baseset\orig_extra.grf;%(AdditionalInputs)</AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\baseset\orig_dos.obm;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_dos.obs"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating orig_dos.obs baseset metadata file</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript //nologo ..\media\baseset\translations.vbs "%(FullPath)" "$(OutputPath)orig_dos.obs" ..\src\lang ..\bin\baseset\orig_extra.grf</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Langs);..\bin\baseset\orig_extra.grf;%(AdditionalInputs)</AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\baseset\orig_dos.obs;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_dos_de.obg"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating orig_dos_de.obg baseset metadata file</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript //nologo ..\media\baseset\translations.vbs "%(FullPath)" "$(OutputPath)orig_dos_de.obg" ..\src\lang ..\bin\baseset\orig_extra.grf</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Langs);..\bin\baseset\orig_extra.grf;%(AdditionalInputs)</AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\baseset\orig_dos_de.obg;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_tto.obm"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating orig_tto.obm baseset metadata file</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript //nologo ..\media\baseset\translations.vbs "%(FullPath)" "$(OutputPath)orig_tto.obm" ..\src\lang ..\bin\baseset\orig_extra.grf</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Langs);..\bin\baseset\orig_extra.grf;%(AdditionalInputs)</AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\baseset\orig_tto.obm;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_win.obg"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating orig_win.obg baseset metadata file</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript //nologo ..\media\baseset\translations.vbs "%(FullPath)" "$(OutputPath)orig_win.obg" ..\src\lang ..\bin\baseset\orig_extra.grf</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Langs);..\bin\baseset\orig_extra.grf;%(AdditionalInputs)</AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\baseset\orig_win.obg;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_win.obm"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating orig_win.obm baseset metadata file</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript //nologo ..\media\baseset\translations.vbs "%(FullPath)" "$(OutputPath)orig_win.obm" ..\src\lang ..\bin\baseset\orig_extra.grf</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Langs);..\bin\baseset\orig_extra.grf;%(AdditionalInputs)</AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\baseset\orig_win.obm;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_win.obs"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating orig_win.obs baseset metadata file</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript //nologo ..\media\baseset\translations.vbs "%(FullPath)" "$(OutputPath)orig_win.obs" ..\src\lang ..\bin\baseset\orig_extra.grf</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Langs);..\bin\baseset\orig_extra.grf;%(AdditionalInputs)</AdditionalInputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\baseset\orig_win.obs;%(Outputs)</Outputs> + </CustomBuild> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> diff --git a/projects/basesets_vs141.vcxproj.filters b/projects/basesets_vs141.vcxproj.filters new file mode 100644 index 000000000..aa555f3fc --- /dev/null +++ b/projects/basesets_vs141.vcxproj.filters @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Baseset Metadata"> + <UniqueIdentifier>{b5a3ac67-19a9-4276-80e9-2360367d2680}</UniqueIdentifier> + </Filter> + </ItemGroup> + <ItemGroup> + <CustomBuild Include="..\media\baseset\no_music.obm"> + <Filter>Baseset Metadata</Filter> + </CustomBuild> + <CustomBuild Include="..\media\baseset\no_sound.obs"> + <Filter>Baseset Metadata</Filter> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_dos.obg"> + <Filter>Baseset Metadata</Filter> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_dos.obm"> + <Filter>Baseset Metadata</Filter> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_dos.obs"> + <Filter>Baseset Metadata</Filter> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_dos_de.obg"> + <Filter>Baseset Metadata</Filter> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_tto.obm"> + <Filter>Baseset Metadata</Filter> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_win.obg"> + <Filter>Baseset Metadata</Filter> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_win.obm"> + <Filter>Baseset Metadata</Filter> + </CustomBuild> + <CustomBuild Include="..\media\baseset\orig_win.obs"> + <Filter>Baseset Metadata</Filter> + </CustomBuild> + </ItemGroup> +</Project> diff --git a/projects/basesets_vs141.vcxproj.filters.in b/projects/basesets_vs141.vcxproj.filters.in new file mode 100644 index 000000000..07bff4542 --- /dev/null +++ b/projects/basesets_vs141.vcxproj.filters.in @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Baseset Metadata"> + <UniqueIdentifier>{b5a3ac67-19a9-4276-80e9-2360367d2680}</UniqueIdentifier> + </Filter> + </ItemGroup> + <ItemGroup> +!!FILES!! + </ItemGroup> +</Project> diff --git a/projects/basesets_vs141.vcxproj.in b/projects/basesets_vs141.vcxproj.in new file mode 100644 index 000000000..69dbd2e07 --- /dev/null +++ b/projects/basesets_vs141.vcxproj.in @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectName>basesets</ProjectName> + <ProjectGuid>{E12E77CA-C0F1-4ADA-943F-4929274249D3}</ProjectGuid> + <RootNamespace>basesets</RootNamespace> + <Keyword>MakeFileProj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Utility</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <PlatformToolset>v141</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <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"> +!!FILTERS!! + </PropertyGroup> + <PropertyGroup> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\baseset\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\baseset\</IntDir> + </PropertyGroup> + <ItemGroup> +!!FILES!! + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> diff --git a/projects/generate b/projects/generate index be3396c6f..cb97ed3de 100755 --- a/projects/generate +++ b/projects/generate @@ -30,6 +30,7 @@ fi # strgen_vs141.vcxproj.filters is for MSVC 2017 # generate_vs141.vcxproj is for MSVC 2017 # version_vs141.vcxproj is for MSVC 2017 +# basesets_vs141.vcxproj is for MSVC 2017 # openttd_vs140.sln is for MSVC 2015 # openttd_vs140.vcxproj is for MSVC 2015 @@ -39,6 +40,7 @@ fi # strgen_vs140.vcxproj.filters is for MSVC 2015 # generate_vs140.vcxproj is for MSVC 2015 # version_vs140.vcxproj is for MSVC 2015 +# basesets_vs140.vcxproj is for MSVC 2015 @@ -197,6 +199,44 @@ load_settings_data() { eval "$2=\"\$RES\$RES2\"" } +load_baseset_data() { + FIRST="" + RES="" + RES2=" +#4 <Langs>" + # Windows Folder sort and Linux Folder sort are slightly different. + # By removing the extension and sorting it on Linux, they are the same. + for i in `ls $2 | sed s~.txt$~~g | sort` + do + if [ "$FIRST" != "" ]; then + RES2="$RES2;" + else + FIRST=1 + fi + i=`basename $i` + RES2="$RES2..\\src\\lang\\$i.txt" + done + RES2="$RES2</Langs>" + # Windows Folder sort and Linux Folder sort are slightly different. + # By fiddling with the extension and sorting it on Linux, they are the same. + for i in `ls $1 | sed s~\\\.~000~g | sort | sed s~000~.~g` + do + i=`basename $i` + RES="$RES +#2 <CustomBuild Include=\"..\\media\\baseset\\"$i"\"> +#2 <Message Condition=\"'\$(Configuration)|\$(Platform)'=='Debug|Win32'\">Generating "$i" baseset metadata file</Message> +#2 <Command Condition=\"'\$(Configuration)|\$(Platform)'=='Debug|Win32'\">cscript //nologo ..\\media\\baseset\\translations.vbs \"%(FullPath)\" \"\$(OutputPath)$i\" ..\\src\\lang ..\\bin\\baseset\\orig_extra.grf</Command> +#2 <AdditionalInputs Condition=\"'\$(Configuration)|\$(Platform)'=='Debug|Win32'\">\$(Langs);..\\bin\\baseset\\orig_extra.grf;%(AdditionalInputs)</AdditionalInputs> +#2 <Outputs Condition=\"'\$(Configuration)|\$(Platform)'=='Debug|Win32'\">..\\bin\\baseset\\"$i";%(Outputs)</Outputs> +#2 </CustomBuild> +#3 <CustomBuild Include=\"..\\media\\baseset\\"$i"\"> +#3 <Filter>Baseset Metadata</Filter> +#3 </CustomBuild>" + done + + eval "$3=\"\$RES\$RES2\"" +} + generate() { echo "Generating $2..." if [ $# -eq 3 ]; then @@ -263,6 +303,11 @@ settingsfiles=`echo "$settings" | grep "^#4" | sed "s~#4~~g"` settingscommand=`echo "$settings" | grep "^#3" | sed "s~#3~~g"` settingsvcxproj=`echo "$settings" | grep "^#2" | sed "s~#2~~g"` +load_baseset_data "$ROOT_DIR/media/baseset/*.ob?" "$ROOT_DIR/src/lang/*.txt" baseset +basesetfiles=`echo "$baseset" | grep "^#3" | sed "s-#3--g"` +basesetvcxproj=`echo "$baseset" | grep "^#2" | sed "s~#2~~g"` +basesetlangs=`echo "$baseset" | grep "^#4" | sed "s~#4~~g"` + generate "$openttdvcxproj" "openttd_vs140.vcxproj" generate "$openttdfiles" "openttd_vs140.vcxproj.filters" "$openttdfilters" generate "$openttdvcxproj" "openttd_vs141.vcxproj" @@ -275,3 +320,7 @@ generate "$settingsvcxproj" "settings_vs140.vcxproj" "$settingscommand" generate "$settingsfiles" "settings_vs140.vcxproj.filters" generate "$settingsvcxproj" "settings_vs141.vcxproj" "$settingscommand" generate "$settingsfiles" "settings_vs141.vcxproj.filters" +generate "$basesetvcxproj" "basesets_vs140.vcxproj" "$basesetlangs" +generate "$basesetfiles" "basesets_vs140.vcxproj.filters" +generate "$basesetvcxproj" "basesets_vs141.vcxproj" "$basesetlangs" +generate "$basesetfiles" "basesets_vs141.vcxproj.filters" diff --git a/projects/generate.vbs b/projects/generate.vbs index 218dcfc0e..d4b61a6c8 100644 --- a/projects/generate.vbs +++ b/projects/generate.vbs @@ -18,6 +18,7 @@ Set FSO = CreateObject("Scripting.FileSystemObject") ' strgen_vs141.vcxproj.filters is for MSVC 2017 ' generate_vs141.vcxproj is for MSVC 2017 ' version_vs141.vcxproj is for MSVC 2017 +' basesets_vs141.vcxproj is for MSVC 2017 ' openttd_vs140.sln is for MSVC 2015 ' openttd_vs140.vcxproj is for MSVC 2015 @@ -27,6 +28,7 @@ Set FSO = CreateObject("Scripting.FileSystemObject") ' strgen_vs140.vcxproj.filters is for MSVC 2015 ' generate_vs140.vcxproj is for MSVC 2015 ' version_vs140.vcxproj is for MSVC 2015 +' basesets_vs140.vcxproj is for MSVC 2015 Sub safety_check(filename) Dim file, line, regexp, list @@ -267,6 +269,48 @@ Sub load_settings_data(dir, ByRef vcxproj, ByRef command, ByRef files) Next End Sub +Sub load_baseset_data(dir, langdir, ByRef vcxproj, ByRef files, ByRef langs) + Dim folder, file, ext, first_time + Set folder = FSO.GetFolder(langdir) + langs = " <Langs>" + For Each file In folder.Files + If first_time <> 0 Then + langs = langs & ";" + Else + first_time = 1 + End If + file = FSO.GetFileName(file) + ext = FSO.GetExtensionName(file) + langs = langs & "..\src\lang\" & file + Next + langs = langs & "</Langs>" + first_time = 0 + Set folder = FSO.GetFolder(dir) + For Each file In folder.Files + file = FSO.GetFileName(file) + ext = FSO.GetExtensionName(file) + If ext = "obm" Or ext = "obg" Or ext = "obs" Then + If first_time <> 0 Then + vcxproj = vcxproj & vbCrLf + files = files & vbCrLf + Else + first_time = 1 + End If + vcxproj = vcxproj & _ + " <CustomBuild Include=" & Chr(34) & "..\media\baseset\" & file & Chr(34) & ">" & vbCrLf & _ + " <Message Condition=" & Chr(34) & "'$(Configuration)|$(Platform)'=='Debug|Win32'" & Chr(34) & ">Generating " & file & " baseset metadata file</Message>" & vbCrLf & _ + " <Command Condition=" & Chr(34) & "'$(Configuration)|$(Platform)'=='Debug|Win32'" & Chr(34) & ">cscript //nologo ..\media\baseset\translations.vbs " & Chr(34) & "%(FullPath)" & Chr(34) & " " & Chr(34) & "$(OutputPath)" & file & Chr(34) & " ..\src\lang ..\bin\baseset\orig_extra.grf</Command>" & vbCrLf & _ + " <AdditionalInputs Condition=" & Chr(34) & "'$(Configuration)|$(Platform)'=='Debug|Win32'" & Chr(34) & ">$(Langs);..\bin\baseset\orig_extra.grf;%(AdditionalInputs)</AdditionalInputs>" & vbCrLf & _ + " <Outputs Condition=" & Chr(34) & "'$(Configuration)|$(Platform)'=='Debug|Win32'" & Chr(34) & ">..\bin\baseset\" & file & ";%(Outputs)</Outputs>" & vbCrLf & _ + " </CustomBuild>" + files = files & _ + " <CustomBuild Include=" & Chr(34) & "..\media\baseset\" & file & Chr(34) & ">" & vbCrLf & _ + " <Filter>Baseset Metadata</Filter>" & vbCrLf & _ + " </CustomBuild>" + End If + Next +End Sub + Sub generate(data, dest, data2) Dim srcfile, destfile, line WScript.Echo "Generating " & FSO.GetFileName(dest) & "..." @@ -338,3 +382,10 @@ generate settingsvcxproj, ROOT_DIR & "/projects/settings_vs140.vcxproj", setting generate settingsfiles, ROOT_DIR & "/projects/settings_vs140.vcxproj.filters", Null generate settingsvcxproj, ROOT_DIR & "/projects/settings_vs141.vcxproj", settingscommand generate settingsfiles, ROOT_DIR & "/projects/settings_vs141.vcxproj.filters", Null + +Dim basesetvcxproj, basesetfiles, basesetlangs +load_baseset_data ROOT_DIR & "/media/baseset", ROOT_DIR & "/src/lang", basesetvcxproj, basesetfiles, basesetlangs +generate basesetvcxproj, ROOT_DIR & "/projects/basesets_vs140.vcxproj", basesetlangs +generate basesetfiles, ROOT_DIR & "/projects/basesets_vs140.vcxproj.filters", Null +generate basesetvcxproj, ROOT_DIR & "/projects/basesets_vs141.vcxproj", basesetlangs +generate basesetfiles, ROOT_DIR & "/projects/basesets_vs141.vcxproj.filters", Null diff --git a/projects/openttd_vs140.sln b/projects/openttd_vs140.sln index c9beb2a1e..e2b7632f7 100644 --- a/projects/openttd_vs140.sln +++ b/projects/openttd_vs140.sln @@ -19,6 +19,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "settingsgen", "settingsgen_ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regression", "regression_vs140.vcxproj", "{4712B013-437D-42CE-947F-DEBABA15261F}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basesets", "basesets_vs140.vcxproj", "{E12E77CA-C0F1-4ADA-943F-4929274249D3}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -83,6 +85,14 @@ Global {4712B013-437D-42CE-947F-DEBABA15261F}.Debug|x64.ActiveCfg = Debug|Win32 {4712B013-437D-42CE-947F-DEBABA15261F}.Release|Win32.ActiveCfg = Debug|Win32 {4712B013-437D-42CE-947F-DEBABA15261F}.Release|x64.ActiveCfg = Debug|Win32 + {E12E77CA-C0F1-4ADA-943F-4929274249D3}.Debug|Win32.ActiveCfg = Debug|Win32 + {E12E77CA-C0F1-4ADA-943F-4929274249D3}.Debug|Win32.Build.0 = Debug|Win32 + {E12E77CA-C0F1-4ADA-943F-4929274249D3}.Debug|x64.ActiveCfg = Debug|Win32 + {E12E77CA-C0F1-4ADA-943F-4929274249D3}.Debug|x64.Build.0 = Debug|Win32 + {E12E77CA-C0F1-4ADA-943F-4929274249D3}.Release|Win32.ActiveCfg = Debug|Win32 + {E12E77CA-C0F1-4ADA-943F-4929274249D3}.Release|Win32.Build.0 = Debug|Win32 + {E12E77CA-C0F1-4ADA-943F-4929274249D3}.Release|x64.ActiveCfg = Debug|Win32 + {E12E77CA-C0F1-4ADA-943F-4929274249D3}.Release|x64.Build.0 = Debug|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/projects/openttd_vs140.vcxproj b/projects/openttd_vs140.vcxproj index 59f52a08d..b2dbfd293 100644 --- a/projects/openttd_vs140.vcxproj +++ b/projects/openttd_vs140.vcxproj @@ -1361,6 +1361,10 @@ <Project>{1a2b3c5e-1c23-41a5-9c9b-acba2aa75fec}</Project> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> </ProjectReference> + <ProjectReference Include="basesets_vs140.vcxproj"> + <Project>{e12e77ca-c0f1-4ada-943f-4929274249d3}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> </Project> diff --git a/projects/openttd_vs140.vcxproj.in b/projects/openttd_vs140.vcxproj.in index c5e120401..951f8b604 100644 --- a/projects/openttd_vs140.vcxproj.in +++ b/projects/openttd_vs140.vcxproj.in @@ -365,6 +365,10 @@ <Project>{1a2b3c5e-1c23-41a5-9c9b-acba2aa75fec}</Project> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> </ProjectReference> + <ProjectReference Include="basesets_vs140.vcxproj"> + <Project>{e12e77ca-c0f1-4ada-943f-4929274249d3}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> </Project> diff --git a/projects/openttd_vs141.sln b/projects/openttd_vs141.sln index f163125cb..6e328ba76 100644 --- a/projects/openttd_vs141.sln +++ b/projects/openttd_vs141.sln @@ -19,6 +19,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "settingsgen", "settingsgen_ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regression", "regression_vs141.vcxproj", "{4712B013-437D-42CE-947F-DEBABA15261F}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basesets", "basesets_vs141.vcxproj", "{E12E77CA-C0F1-4ADA-943F-4929274249D3}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -83,6 +85,14 @@ Global {4712B013-437D-42CE-947F-DEBABA15261F}.Debug|x64.ActiveCfg = Debug|Win32 {4712B013-437D-42CE-947F-DEBABA15261F}.Release|Win32.ActiveCfg = Debug|Win32 {4712B013-437D-42CE-947F-DEBABA15261F}.Release|x64.ActiveCfg = Debug|Win32 + {E12E77CA-C0F1-4ADA-943F-4929274249D3}.Debug|Win32.ActiveCfg = Debug|Win32 + {E12E77CA-C0F1-4ADA-943F-4929274249D3}.Debug|Win32.Build.0 = Debug|Win32 + {E12E77CA-C0F1-4ADA-943F-4929274249D3}.Debug|x64.ActiveCfg = Debug|Win32 + {E12E77CA-C0F1-4ADA-943F-4929274249D3}.Debug|x64.Build.0 = Debug|Win32 + {E12E77CA-C0F1-4ADA-943F-4929274249D3}.Release|Win32.ActiveCfg = Debug|Win32 + {E12E77CA-C0F1-4ADA-943F-4929274249D3}.Release|Win32.Build.0 = Debug|Win32 + {E12E77CA-C0F1-4ADA-943F-4929274249D3}.Release|x64.ActiveCfg = Debug|Win32 + {E12E77CA-C0F1-4ADA-943F-4929274249D3}.Release|x64.Build.0 = Debug|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/projects/openttd_vs141.vcxproj b/projects/openttd_vs141.vcxproj index 525119179..92edccd7c 100644 --- a/projects/openttd_vs141.vcxproj +++ b/projects/openttd_vs141.vcxproj @@ -1361,6 +1361,10 @@ <Project>{1a2b3c5e-1c23-41a5-9c9b-acba2aa75fec}</Project> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> </ProjectReference> + <ProjectReference Include="basesets_vs141.vcxproj"> + <Project>{e12e77ca-c0f1-4ada-943f-4929274249d3}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> </Project> diff --git a/projects/openttd_vs141.vcxproj.in b/projects/openttd_vs141.vcxproj.in index 2a8a78af7..d28f500f1 100644 --- a/projects/openttd_vs141.vcxproj.in +++ b/projects/openttd_vs141.vcxproj.in @@ -365,6 +365,10 @@ <Project>{1a2b3c5e-1c23-41a5-9c9b-acba2aa75fec}</Project> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> </ProjectReference> + <ProjectReference Include="basesets_vs141.vcxproj"> + <Project>{e12e77ca-c0f1-4ada-943f-4929274249d3}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> </Project> |