diff options
author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-12-17 13:13:03 +0000 |
---|---|---|
committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-12-17 13:13:03 +0000 |
commit | 1fc7394d452c59c1f0c2ec806c4cd5703476a2e6 (patch) | |
tree | 7f061cf2e267fd898c7b1aee288e34705baded3c /extensions/source/nsplugin | |
parent | bcbaeec46c50230e65aedddae9716befb3de665b (diff) |
#i10000# disable unresolved external check for solaris - caused by baseline/gtk requirement conflict in SO env
Diffstat (limited to 'extensions/source/nsplugin')
-rw-r--r-- | extensions/source/nsplugin/source/makefile.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/extensions/source/nsplugin/source/makefile.mk b/extensions/source/nsplugin/source/makefile.mk index ec2371012888..78f43ac3902e 100644 --- a/extensions/source/nsplugin/source/makefile.mk +++ b/extensions/source/nsplugin/source/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: hr $ $Date: 2004-12-10 18:01:52 $ +# last change: $Author: hjs $ $Date: 2004-12-17 14:13:03 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -83,7 +83,6 @@ INC+= -DNP_LINUX .ENDIF PKGCONFIG_MODULES=gtk+-2.0 .INCLUDE: pkg_config.mk -CFLAGS+=$(PKGCONFIG_CFLAGS) .ENDIF .IF "$(GUI)"=="WNT" INC+= -DENGLISH @@ -110,6 +109,9 @@ SHL1STDLIBS+= shell32.lib # --- Plugin executable ------------------------- +.IF "$(OS)"=="SOLARIS" +LINKFLAGSAPP!:=$(LINKFLAGSAPP:s/-z defs/-z nodefs/) +.ENDIF # "$(OS)"=="SOLARIS" APP1TARGET=nsplugin$(EXEPOSTFIX) APP1OBJS=\ $(SLO)$/so_instance.obj\ |