diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:27:57 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:27:57 +0200 |
| commit | 5012e466ce473b27b4ff6dbfab53a6c97a4041ca (patch) | |
| tree | 1430faa05e0e2b2fedda8022561cfbc15a6b74f8 /solenv/gbuild/platform/solaris.mk | |
| parent | 6f0156d40c3f8269d9fd6410f614755dc1bb14f4 (diff) | |
| parent | 649a3a418160979179ccdfd997edb8dbf83a6d25 (diff) | |
resyncing to master
Diffstat (limited to 'solenv/gbuild/platform/solaris.mk')
| -rw-r--r-- | solenv/gbuild/platform/solaris.mk | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index e0547b8de4ec..b78ab48d3341 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -130,7 +130,14 @@ gb_COMPILERNOOPTFLAGS := gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs) -# convert parametters filesystem root to native notation +# convert parameters filesystem root to native notation +# does some real work only on windows, make sure not to +# break the dummy implementations on unx* +define gb_Helper_convert_native +$(1) +endef + +# convert parameters filesystem root to native notation # does some real work only on windows, make sure not to # break the dummy implementations on unx* define gb_Helper_convert_native @@ -236,6 +243,7 @@ gb_Library_TARGETTYPEFLAGS := -Bdynamic -z text -G gb_Library_SYSPRE := lib gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_ gb_Library_PLAINEXT := .so +gb_Library_DLLEXT := .so gb_Library_RTEXT := C52$(gb_Library_PLAINEXT) gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT) @@ -249,6 +257,7 @@ gb_STDLIBS := \ gb_Library_PLAINLIBS_NONE += \ $(gb_STDLIBS) \ dl \ + fontconfig \ freetype \ GL \ GLU \ @@ -392,5 +401,17 @@ gb_Library_COMPONENTPREFIXES := \ OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \ URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \ NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \ +# UnoApiTarget + +gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc +gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET) +gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge +gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET) +gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare +gb_UnoApiTarget_REGCOMPARECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET) +gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker +gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET) +gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview +gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET) # vim: set noet sw=4: |