diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2010-09-14 12:20:12 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-09-14 12:20:12 +0200 |
| commit | fac37861914f255c55a196a154575a0d7e143ac8 (patch) | |
| tree | ad8670c4bb4c8e5abcb5cefd7be4fb27b3e9126e /scp2/source/ooo | |
| parent | 65eee44249fb641de14b0c92f6be3ebedd468383 (diff) | |
build-fix-win32.diff: Fix Windows build on partition without short names
Diffstat (limited to 'scp2/source/ooo')
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 5 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index cc00520611b7..fb1fe68c4c35 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -600,10 +600,7 @@ File gid_Brand_File_Bin_Unopkg Name = "unopkg.bin"; End -#if defined WNT && \ - (defined M1310 || \ - ((defined M1400 || defined M1500) && \ - !(defined SYSTEM_MOZILLA || defined WITHOUT_MOZILLA))) +#ifdef WNT File gid_Brand_File_Bin_Msvcr71 TXT_FILE_BODY; Dir = gid_Brand_Dir_Program; diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 4e8c0efd256b..3a049c5aef17 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1778,6 +1778,12 @@ File gid_File_Moz_Msvcr80 Name = SCP2_URE_DL_NORMAL("msvcr80"); Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); End +File gid_File_Moz_Msvc80crt_Manifest + BIN_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Program; + Name = "Microsoft.VC80.CRT.manifest"; +End #endif #ifndef SYSTEM_REDLAND |