The International Simutrans Forum

Development => Patches & Projects => Incorporated Patches and Solved Bug Reports => Topic started by: taos on January 04, 2019, 06:12:28 PM

Title: Build error under Haiku due to missing ',' in simsys.cc (line 407)
Post by: taos on January 04, 2019, 06:12:28 PM
Some time between 120.2.2 and 120.3 (commit 69ee10ff4bf1643562000a97b6becb47c1f79175 in github), compiling Simutrans under Haiku stopped working. Today I (finally) had some time to look for the reason and it seems it's due to a missing ',' at the end of a line inside a Haiku specific conditional #ifdef statement (probably the reason no other operating system is affected). It's in line 407 of simsys.cc, instead of
Code: [Select]
#elif defined __HAIKU__
"/boot/system/non-packaged/data/fonts/",
"/boot/home/config/non-packaged/data/fonts/",
"~/config/non-packaged/data/fonts/",
"/boot/system/data/fonts/ttfonts/"
it should be
Code: [Select]
#elif defined __HAIKU__
"/boot/system/non-packaged/data/fonts/",
"/boot/home/config/non-packaged/data/fonts/",
"~/config/non-packaged/data/fonts/",
"/boot/system/data/fonts/ttfonts/",

Do you need me to attach a patch?
Title: Re: Build error under Haiku due to missing ',' in simsys.cc (line 407)
Post by: Dwachs on January 05, 2019, 02:09:18 PM
thank you, committed in r8648
Title: Re: Build error under Haiku due to missing ',' in simsys.cc (line 407)
Post by: taos on January 05, 2019, 07:23:22 PM
Thanks! BTW, there's another ',' missing in the following linux/BSD/unix section (line 412) which probably didn't negatively affect building on linux because it's not the last one.
Title: Re: Build error under Haiku due to missing ',' in simsys.cc (line 407)
Post by: Dwachs on January 06, 2019, 10:22:24 AM
Thanks for spotting. Will fix.