diff --git a/projects/generate b/projects/generate index 2ee7d6b1a7..58df7023d8 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 da4a244178..794ac6e62b 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 72dcd4e8fd..094dbcfb5a 100644 --- a/projects/settings_vs100.vcxproj +++ b/projects/settings_vs100.vcxproj @@ -24,14 +24,14 @@ <_ProjectFileVersion>10.0.30319.1 - ..\objs\settings\ - ..\objs\settings\ + ..\objs\settings\table\ + ..\objs\settings\table\ Generating settings.h -$(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 diff --git a/projects/settings_vs100.vcxproj.in b/projects/settings_vs100.vcxproj.in index 47afc88ae3..99d7305806 100644 --- a/projects/settings_vs100.vcxproj.in +++ b/projects/settings_vs100.vcxproj.in @@ -24,8 +24,8 @@ <_ProjectFileVersion>10.0.30319.1 - ..\objs\settings\ - ..\objs\settings\ + ..\objs\settings\table\ + ..\objs\settings\table\ diff --git a/projects/settings_vs80.vcproj b/projects/settings_vs80.vcproj index f84698bc45..e28b731edd 100644 --- a/projects/settings_vs80.vcproj +++ b/projects/settings_vs80.vcproj @@ -16,15 +16,15 @@ 10.0.30319.1 ..\objs\settings\ ..\objs\settings\ + settings_gen @@ -77,4 +78,4 @@ - + \ No newline at end of file