summaryrefslogtreecommitdiff
path: root/desktop/unx/source
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@novell.com>2010-10-12 16:26:07 +0100
committerMichael Meeks <michael.meeks@novell.com>2010-10-12 16:26:07 +0100
commit0425269accf7f2891e0430ade82260431d1ec53c (patch)
tree51b14abba11423d9ad3f5f93203a95ea44918510 /desktop/unx/source
parentd2b113ec937d709e45ed1bd278a074f26529d295 (diff)
Enable unx quickstart, and broffice flags
Diffstat (limited to 'desktop/unx/source')
-rw-r--r--desktop/unx/source/makefile.mk4
-rw-r--r--desktop/unx/source/start.c2
2 files changed, 4 insertions, 2 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"