summaryrefslogtreecommitdiff
path: root/projects
diff options
context:
space:
mode:
authorglx <glx@openttd.org>2011-03-04 23:44:10 +0000
committerglx <glx@openttd.org>2011-03-04 23:44:10 +0000
commit691825f39d87b3762eaa85b22fb39c13cc48090d (patch)
treea170da24047e4b895be6a065a2f36379e63c829c /projects
parent88e669d01b6657868b98428d621f6014ebc96a0d (diff)
downloadopenttd-691825f39d87b3762eaa85b22fb39c13cc48090d.tar.xz
(svn r22190) -Fix (r22188): minor changes in project files
Diffstat (limited to 'projects')
-rwxr-xr-xprojects/generate2
-rwxr-xr-xprojects/generate.vbs2
-rw-r--r--projects/settings_vs100.vcxproj6
-rw-r--r--projects/settings_vs100.vcxproj.in4
-rw-r--r--projects/settings_vs80.vcproj6
-rw-r--r--projects/settings_vs80.vcproj.in4
-rw-r--r--projects/settings_vs90.vcproj6
-rw-r--r--projects/settings_vs90.vcproj.in4
-rw-r--r--projects/settingsgen_vs100.vcxproj3
9 files changed, 19 insertions, 18 deletions
diff --git a/projects/generate b/projects/generate
index 2ee7d6b1a..58df7023d 100755
--- a/projects/generate
+++ b/projects/generate
@@ -207,7 +207,7 @@ load_lang_data() {
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`
diff --git a/projects/generate.vbs b/projects/generate.vbs
index da4a24417..794ac6e62 100755
--- a/projects/generate.vbs
+++ b/projects/generate.vbs
@@ -277,7 +277,7 @@ End Function
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)
diff --git a/projects/settings_vs100.vcxproj b/projects/settings_vs100.vcxproj
index 72dcd4e8f..094dbcfb5 100644
--- 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>
diff --git a/projects/settings_vs100.vcxproj.in b/projects/settings_vs100.vcxproj.in
index 47afc88ae..99d730580 100644
--- 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>
diff --git a/projects/settings_vs80.vcproj b/projects/settings_vs80.vcproj
index f84698bc4..e28b731ed 100644
--- 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
diff --git a/projects/settings_vs80.vcproj.in b/projects/settings_vs80.vcproj.in
index cdb1df634..a0f10fb09 100644
--- 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
diff --git a/projects/settings_vs90.vcproj b/projects/settings_vs90.vcproj
index 094bfd7d0..4bf545398 100644
--- 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
diff --git a/projects/settings_vs90.vcproj.in b/projects/settings_vs90.vcproj.in
index a8534f9a5..a342e2b32 100644
--- 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
diff --git a/projects/settingsgen_vs100.vcxproj b/projects/settingsgen_vs100.vcxproj
index dc0168119..30454d81f 100644
--- 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