diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-03-21 15:00:18 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-03-21 21:18:41 +0000 |
| commit | cda1a3fa9c2e6008706b2aaa58929242a59144f6 (patch) | |
| tree | b9d0b568b215edf9f2a5f277ca37cf681f5a2dae /desktop/source/pagein | |
| parent | 273ea24a16997b279b7d9969c25497cf55773fac (diff) | |
re-work start process to enable earlier splash and faster start
Diffstat (limited to 'desktop/source/pagein')
| -rwxr-xr-x | desktop/source/pagein/makefile.mk | 5 | ||||
| -rw-r--r-- | desktop/source/pagein/pagein-main.c | 12 | ||||
| -rwxr-xr-x | desktop/source/pagein/pagein.c | 5 |
3 files changed, 20 insertions, 2 deletions
diff --git a/desktop/source/pagein/makefile.mk b/desktop/source/pagein/makefile.mk index 09248d4f9469..205e03c95863 100755 --- a/desktop/source/pagein/makefile.mk +++ b/desktop/source/pagein/makefile.mk @@ -45,6 +45,7 @@ LIBSALCPPRT=$(0) OBJFILES= \ $(OBJ)$/pagein.obj \ + $(OBJ)$/pagein-main.obj \ $(OBJ)$/file_image_unx.obj APP1TARGET=$(TARGET) @@ -77,24 +78,28 @@ UREMISCPATH=..$/ure-link$/share$/misc $(MISC)$/$(TARGET)-calc : makefile.mk @echo Making: $@ @-echo $(DLLPRE)sc$(DFTDLLPOST) > $@ + @-echo $(DLLPRE)scui$(DFTDLLPOST) >> $@ @-echo $(DLLPRE)svx$(DFTDLLPOST) >> $@ @-echo $(DLLPRE)svxcore$(DFTDLLPOST) >> $@ $(MISC)$/$(TARGET)-draw : makefile.mk @echo Making: $@ @-echo $(DLLPRE)sd$(DFTDLLPOST) > $@ + @-echo $(DLLPRE)sdui$(DFTDLLPOST) >> $@ @-echo $(DLLPRE)svx$(DFTDLLPOST) >> $@ @-echo $(DLLPRE)svxcore$(DFTDLLPOST) >> $@ $(MISC)$/$(TARGET)-impress : makefile.mk @echo Making: $@ @-echo $(DLLPRE)sd$(DFTDLLPOST) > $@ + @-echo $(DLLPRE)sdui$(DFTDLLPOST) >> $@ @-echo $(DLLPRE)svx$(DFTDLLPOST) >> $@ @-echo $(DLLPRE)svxcore$(DFTDLLPOST) >> $@ $(MISC)$/$(TARGET)-writer : makefile.mk @echo Making: $@ @-echo $(DLLPRE)sw$(DFTDLLPOST) > $@ + @-echo $(DLLPRE)swui$(DFTDLLPOST) >> $@ @-echo $(DLLPRE)svx$(DFTDLLPOST) >> $@ @-echo $(DLLPRE)svxcore$(DFTDLLPOST) >> $@ diff --git a/desktop/source/pagein/pagein-main.c b/desktop/source/pagein/pagein-main.c new file mode 100644 index 000000000000..f8fe82ab0ab2 --- /dev/null +++ b/desktop/source/pagein/pagein-main.c @@ -0,0 +1,12 @@ +#include <stdio.h> +/* + * De-coupled to allow pagein to be re-used in the unx + * splash / quick-starter + */ +extern int pagein_execute (int argc, char **argv); + +int main (int argc, char **argv) +{ + return pagein_execute (argc, argv); +} + diff --git a/desktop/source/pagein/pagein.c b/desktop/source/pagein/pagein.c index 39c319fc2d72..23585eb026ca 100755 --- a/desktop/source/pagein/pagein.c +++ b/desktop/source/pagein/pagein.c @@ -58,8 +58,10 @@ cleanup_and_leave: return (result); } +extern int pagein_execute (int argc, char **argv); + /* main */ -int main (int argc, char **argv) +int pagein_execute (int argc, char **argv) { int i, v = 0; size_t nfiles = 0, nbytes = 0; @@ -103,7 +105,6 @@ int main (int argc, char **argv) continue; } - if ((argv[i][0] == '@') && ((fp = fopen (argv[i], "r")) == 0)) { char path[1024]; |