[Libreoffice-commits] .: scp2/source

[Michael Meeks]

 scp2/source/ooo/common_brand.scp     |    9 +++++++++
 scp2/source/ooo/file_library_ooo.scp |    3 +++
 scp2/source/ooo/makefile.mk          |    4 ++++
 3 files changed, 16 insertions(+)

New commits:
commit bdaddfbe08f3cc1825cf9d6e561d3cdc2278f708
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue Oct 12 15:34:16 2010 +0100

    enable unix quickstarter packaging

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 54512d5..c5b07c4 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -525,6 +525,15 @@ File gid_Brand_File_Bin_Soffice_Bin
     Name = "soffice.bin";
 End
 
+#if defined ENABLE_UNIX_QUICKSTARTER
+File gid_File_Bin_QStart_Bin
+    BIN_FILE_BODY;
+    Dir = gid_Brand_Dir_Program;
+    Styles = (PACKED, PATCH);
+    Name = "oosplash.bin";
+End
+#endif
+
 // use this for high detail file open dialog >= 5.1 windows
 #ifdef WNT
 File gid_Brand_File_Bin_Soffice_Bin_Manifest
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 2e981e9..81fc177 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1416,6 +1416,9 @@ File gid_File_Lib_Spell
 End
 
 STD_UNO_LIB_FILE( gid_File_Lib_Spl, spl)
+#if defined ENABLE_UNIX_QUICKSTARTER
+STD_UNO_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx)
+#endif
 
 SPECIAL_UNO_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
 
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index cb14363..fc2ebdd 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -72,6 +72,10 @@ SCPDEFS+=-DGTK_TWO_FOUR
 SCPDEFS+=-DENABLE_SYSTRAY_GTK
 .ENDIF
 
+.IF "$(ENABLE_UNIX_QUICKSTARTER)" != ""
+SCPDEFS+=-DENABLE_UNIX_QUICKSTARTER
+.ENDIF
+
 .IF "$(ENABLE_KDE)" != ""
 SCPDEFS+=-DENABLE_KDE
 .ENDIF