Mercurial > hg > openttd
changeset 6273:442b0e075488 draft
(svn r9082) -Codechange: [win32] Update VS2003 and VS2005 project files to use the same outpath, and build in UNICODE mode. When making a release it is probably better to make two binaries, one without UNICODE, the other with, guaranteeing full Win9x compatibility (UNICODE with MSLU also works, without it's even better).
-Remove: [os/2] Relic project file remains from watcom
author | Darkvater <Darkvater@openttd.org> |
---|---|
date | Sat, 10 Mar 2007 00:25:54 +0000 |
parents | 039bee52a5d4 |
children | a51753c89fad |
files | projects/openttd.vcproj projects/openttd.vcproj.in projects/openttd_vs80.vcproj projects/openttd_vs80.vcproj.in projects/strgen.tgt projects/strgen.vcproj projects/strgen_vs80.vcproj |
diffstat | 7 files changed, 23 insertions(+), 168 deletions(-) [+] |
line wrap: on
line diff
--- a/projects/openttd.vcproj +++ b/projects/openttd.vcproj @@ -13,12 +13,12 @@ <Configurations> <Configuration Name="Release|Win32" - OutputDirectory="..\objs\$(ConfigurationName)" - IntermediateDirectory="..\objs\$(ConfigurationName)" + OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2" + CharacterSet="1" WholeProgramOptimization="TRUE"> <Tool Name="VCCLCompilerTool" @@ -57,7 +57,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalDependencies="unicows.lib winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib" + AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib" LinkIncremental="1" SuppressStartupBanner="TRUE" IgnoreDefaultLibraryNames="" @@ -93,8 +93,8 @@ </Configuration> <Configuration Name="Debug|Win32" - OutputDirectory="..\objs\$(ConfigurationName)\" - IntermediateDirectory="..\objs\$(ConfigurationName)\" + OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" + IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE"
--- a/projects/openttd.vcproj.in +++ b/projects/openttd.vcproj.in @@ -13,12 +13,12 @@ <Configurations> <Configuration Name="Release|Win32" - OutputDirectory="..\objs\$(ConfigurationName)" - IntermediateDirectory="..\objs\$(ConfigurationName)" + OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2" + CharacterSet="1" WholeProgramOptimization="TRUE"> <Tool Name="VCCLCompilerTool" @@ -57,7 +57,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalDependencies="unicows.lib winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib" + AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib" LinkIncremental="1" SuppressStartupBanner="TRUE" IgnoreDefaultLibraryNames="" @@ -93,8 +93,8 @@ </Configuration> <Configuration Name="Debug|Win32" - OutputDirectory="..\objs\$(ConfigurationName)\" - IntermediateDirectory="..\objs\$(ConfigurationName)\" + OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" + IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE"
--- a/projects/openttd_vs80.vcproj +++ b/projects/openttd_vs80.vcproj @@ -28,7 +28,7 @@ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" + CharacterSet="1" WholeProgramOptimization="1" > <Tool @@ -139,7 +139,7 @@ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" + CharacterSet="1" WholeProgramOptimization="1" > <Tool @@ -251,7 +251,7 @@ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" + CharacterSet="1" > <Tool Name="VCPreBuildEventTool" @@ -346,7 +346,7 @@ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" + CharacterSet="1" > <Tool Name="VCPreBuildEventTool"
--- a/projects/openttd_vs80.vcproj.in +++ b/projects/openttd_vs80.vcproj.in @@ -28,7 +28,7 @@ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" + CharacterSet="1" WholeProgramOptimization="1" > <Tool @@ -139,7 +139,7 @@ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" + CharacterSet="1" WholeProgramOptimization="1" > <Tool @@ -251,7 +251,7 @@ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" + CharacterSet="1" > <Tool Name="VCPreBuildEventTool" @@ -346,7 +346,7 @@ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" + CharacterSet="1" > <Tool Name="VCPreBuildEventTool"
deleted file mode 100644 --- a/projects/strgen.tgt +++ /dev/null @@ -1,131 +0,0 @@ -40 -targetIdent -0 -MProject -1 -MComponent -0 -2 -WString -4 -OEXE -3 -WString -5 -oc2en -1 -0 -0 -4 -MCommand -0 -5 -MCommand -26 -..\os\os2\build_lang.cmd - -6 -MItem -10 -strgen.exe -7 -WString -4 -OEXE -8 -WVList -2 -9 -MRState -10 -WString -7 -OS2LINK -11 -WString -25 -?????No debug information -1 -1 -12 -MRState -13 -WString -7 -OS2LINK -14 -WString -14 -?????Debug All -1 -0 -15 -WVList -0 --1 -1 -1 -0 -16 -WPickList -2 -17 -MItem -3 -*.c -18 -WString -4 -COBJ -19 -WVList -2 -20 -MRState -21 -WString -3 -WCC -22 -WString -29 -?????No debugging information -0 -1 -23 -MRState -24 -WString -3 -WCC -25 -WString -28 -?????Line number information -0 -0 -26 -WVList -0 --1 -1 -1 -0 -27 -MItem -8 -strgen.c -28 -WString -4 -COBJ -29 -WVList -0 -30 -WVList -0 -17 -1 -1 -0
--- a/projects/strgen.vcproj +++ b/projects/strgen.vcproj @@ -31,7 +31,7 @@ AssemblerOutput="2" AssemblerListingLocation="$(IntDir)" ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(IntDir)" + ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb" WarningLevel="3" WarnAsError="TRUE" SuppressStartupBanner="TRUE" @@ -40,11 +40,11 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - OutputFile="$(OutDir)\strgen.exe" + OutputFile="$(IntDir)\strgen.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="$(OutDir)\strgen.pdb" + ProgramDatabaseFile="$(IntDir)\strgen.pdb" SubSystem="1" TargetMachine="1"/> <Tool @@ -84,12 +84,6 @@ </File> <File RelativePath="..\src\string.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> </File> </Filter> <File
--- a/projects/strgen_vs80.vcproj +++ b/projects/strgen_vs80.vcproj @@ -119,14 +119,6 @@ <File RelativePath="..\src\string.cpp" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj" - /> - </FileConfiguration> </File> </Filter> <File