diff options
Diffstat (limited to 'editors/openoffice.org-vcltesttool/files/patch-product+inc+scp+udk_basefiles.scp')
| -rw-r--r-- | editors/openoffice.org-vcltesttool/files/patch-product+inc+scp+udk_basefiles.scp | 44 |
1 files changed, 7 insertions, 37 deletions
diff --git a/editors/openoffice.org-vcltesttool/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice.org-vcltesttool/files/patch-product+inc+scp+udk_basefiles.scp index 53ba0a1f9f7b..7b55cc064156 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-product+inc+scp+udk_basefiles.scp +++ b/editors/openoffice.org-vcltesttool/files/patch-product+inc+scp+udk_basefiles.scp @@ -1,48 +1,18 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002 -+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002 -@@ -2,7 +2,9 @@ +--- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 ++++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 +@@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment // (setup is linked against it). --#if ( defined( _gcc3 ) && defined( C300 ) ) +#if ( defined ( LINUX )) -+#if ( defined( _gcc3 ) && defined( C300 )) -+ - File gid_File_Lib_gcc - BIN_FILE_BODY; - Name = STRING(libgcc_s.so.1); -@@ -10,6 +12,24 @@ - Styles = (PACKED, SETUPZIP); - End + #if ( defined( _gcc3 ) && defined( C300 ) ) -+#if ( CCNUMVER >= 000300010000 ) -+ -+File gid_File_Lib_Stdc -+ BIN_FILE_BODY; -+ Name = STRING(libstdc++.so.4.0.0); -+ Dir = GCFG_BINARY_DIR; -+ Styles = (PACKED, SETUPZIP); -+End -+ -+Shortcut gid_Shortcut_Lib_Stdc -+ FileID = gid_File_Lib_Stdc; -+ Dir = GCFG_BINARY_DIR; -+ Name = STRING(libstdc++.so.4); -+ Styles = (NETWORK,RELATIVE); -+End -+ -+#else -+ - File gid_File_Lib_Stdc - BIN_FILE_BODY; - Name = STRING(libstdc++.so.3.0.1); -@@ -23,6 +43,9 @@ + File gid_File_Lib_gcc +@@ -42,6 +43,7 @@ Name = STRING(libstdc++.so.3); Styles = (NETWORK,RELATIVE); End -+ -+#endif +#endif #endif + #endif - File gid_File_Lib_Sal |