strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix ENABLE_QUICKSTART_LIBPNG handling fdo#36497

Browse source 
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
This commit is contained in:
Michael Meeks 2011-05-17 15:23:42 +01:00 committed by Fridrich Štrba
parent cae534fec2
commit 06fbdf7dae
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
desktop/unx/source/makefile.mk
View file

@ -34,10 +34,10 @@ NO_DEFAULT_STL=TRUE
.IF "$(ENABLE_QUICKSTART_LIBPNG)"=="TRUE"
CFLAGS+=-DENABLE_QUICKSTART_LIBPNG
CFLAGS+=$(LIBPNG_CFLAGS)
.ENDIF
STDLIB=
CFLAGS+=$(LIBPNG_CFLAGS)
OBJFILES= \
$(OBJ)$/splashx.obj \
@ -55,7 +55,10 @@ APP1RPATH = BRAND
APP1OBJS = $(OBJFILES) $(PAGEIN_OBJS)
APP1LIBSALCPPRT=
APP1CODETYPE = C
APP1STDLIBS = $(PTHREAD_LIBS) $(X11LINK_DYNAMIC) $(SALLIB) $(LIBPNG_LIBS)
APP1STDLIBS = $(PTHREAD_LIBS) $(X11LINK_DYNAMIC) $(SALLIB)
.IF "$(ENABLE_QUICKSTART_LIBPNG)"=="TRUE"
APP1STDLIBS += $(LIBPNG_LIBS)
.ENDIF
.IF "$(OS)"=="SOLARIS"
APP1STDLIBS+= -lsocket
.ENDIF