diff options
Diffstat (limited to 'linden/indra/develop.py')
| -rwxr-xr-x | linden/indra/develop.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/develop.py b/linden/indra/develop.py index f4fa1cc..100f719 100755 --- a/linden/indra/develop.py +++ b/linden/indra/develop.py | |||
| @@ -632,9 +632,9 @@ class WindowsSetup(PlatformSetup): | |||
| 632 | if self.generator == 'nmake': | 632 | if self.generator == 'nmake': |
| 633 | # Hack around a bug in cmake that I'm surprised did not hit GUI controlled builds. | 633 | # Hack around a bug in cmake that I'm surprised did not hit GUI controlled builds. |
| 634 | self.run(r'sed -i "s|\(^RC_FLAGS .* \) /GS .*$|\1|" build-nmake/win_crash_logger/CMakeFiles/windows-crash-logger.dir/flags.make') | 634 | self.run(r'sed -i "s|\(^RC_FLAGS .* \) /GS .*$|\1|" build-nmake/win_crash_logger/CMakeFiles/windows-crash-logger.dir/flags.make') |
| 635 | self.run(r'sed -i "s|\(^RC_FLAGS .* \) /GS .*$|\1|" build-nmake/newview/CMakeFiles/imprudence-bin.dir/flags.make') | 635 | self.run(r'sed -i "s|\(^RC_FLAGS .* \) /GS .*$|\1|" build-nmake/newview/CMakeFiles/meta-impy-bin.dir/flags.make') |
| 636 | self.run(r'sed -i "s|\(^RC_FLAGS .* \) /EHsc .*/Zm1000 \($\)|\1\2|" build-nmake/win_crash_logger/CMakeFiles/windows-crash-logger.dir/flags.make') | 636 | self.run(r'sed -i "s|\(^RC_FLAGS .* \) /EHsc .*/Zm1000 \($\)|\1\2|" build-nmake/win_crash_logger/CMakeFiles/windows-crash-logger.dir/flags.make') |
| 637 | self.run(r'sed -i "s|\(^RC_FLAGS .* \) /EHsc .*/Zm1000 \($\)|\1\2|" build-nmake/newview/CMakeFiles/imprudence-bin.dir/flags.make') | 637 | self.run(r'sed -i "s|\(^RC_FLAGS .* \) /EHsc .*/Zm1000 \($\)|\1\2|" build-nmake/newview/CMakeFiles/meta-impy-bin.dir/flags.make') |
| 638 | # Evil hack. | 638 | # Evil hack. |
| 639 | self.run(r'touch newview/touched.bat') | 639 | self.run(r'touch newview/touched.bat') |
| 640 | return 'nmake' | 640 | return 'nmake' |