diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2010-10-12 16:26:07 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-10-12 16:26:07 +0100 |
| commit | 0425269accf7f2891e0430ade82260431d1ec53c (patch) | |
| tree | 51b14abba11423d9ad3f5f93203a95ea44918510 | |
| parent | d2b113ec937d709e45ed1bd278a074f26529d295 (diff) | |
Enable unx quickstart, and broffice flags
| -rw-r--r-- | desktop/unx/source/makefile.mk | 4 | ||||
| -rw-r--r-- | desktop/unx/source/start.c | 2 | ||||
| -rw-r--r-- | desktop/zipintro/makefile.mk | 20 |
3 files changed, 17 insertions, 9 deletions
diff --git a/desktop/unx/source/makefile.mk b/desktop/unx/source/makefile.mk index bd8eb75f7d..494477a0c4 100644 --- a/desktop/unx/source/makefile.mk +++ b/desktop/unx/source/makefile.mk @@ -41,6 +41,8 @@ dummy: STDLIB= +CFLAGS+=$(LIBPNG_CFLAGS) + OBJFILES= \ $(OBJ)$/splashx.obj \ $(OBJ)$/start.obj @@ -50,7 +52,7 @@ APP1RPATH = BRAND APP1OBJS = $(OBJFILES) APP1LIBSALCPPRT= APP1CODETYPE = C -APP1STDLIBS = $(SALLIB) -lX11 `pkg-config --libs libpng` +APP1STDLIBS = $(SALLIB) -lX11 $(LIBPNG_LIBS) .IF "$(OS)"=="SOLARIS" APP1STDLIBS+= -lsocket .ENDIF diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c index fe94e904f6..450d63cfc6 100644 --- a/desktop/unx/source/start.c +++ b/desktop/unx/source/start.c @@ -55,7 +55,7 @@ */ #define QSEND_AND_REPORT "-qsend-and-report" -#define IMG_SUFFIX ".bmp" +#define IMG_SUFFIX ".png" #define PIPEDEFAULTPATH "/tmp" #define PIPEALTERNATEPATH "/var/tmp" diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk index 73bc37f6f8..b2d089ee68 100644 --- a/desktop/zipintro/makefile.mk +++ b/desktop/zipintro/makefile.mk @@ -34,22 +34,28 @@ TARGET=zipintro ZIP1LIST= \ $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/intro.png $(INTRO_BITMAPS)) \ - $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/about.png $(ABOUT_BITMAPS)) \ - $(MISC)$/$(RSCDEFIMG)$/brand$/intro-pt_BR.png \ - $(MISC)$/$(RSCDEFIMG)$/brand$/about-pt_BR.png + $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/about.png $(ABOUT_BITMAPS)) ZIP2LIST= \ $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro.png $(INTRO_BITMAPS)) \ - $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about.png $(ABOUT_BITMAPS)) \ - $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro-pt_BR.png \ - $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about-pt_BR.png + $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about.png $(ABOUT_BITMAPS)) ZIP3LIST= \ $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_left.png \ $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_right.png \ $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_space.png \ $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_rtl_left.png \ - $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_rtl_right.png \ + $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_rtl_right.png + +.IF "$(ENABLE_BROFFICE)"=="TRUE" +ZIP1LIST+= \ + $(MISC)$/$(RSCDEFIMG)$/brand$/intro-pt_BR.png \ + $(MISC)$/$(RSCDEFIMG)$/brand$/about-pt_BR.png +ZIP2LIST+= \ + $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro-pt_BR.png \ + $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about-pt_BR.png +ZIP3LIST+= \ $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_left-pt_BR.png \ $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_right-pt_BR.png +.ENDIF # ENABLE_BROFFICE ZIP1TARGET=brand ZIP1DEPS=$(ZIP1LIST) |