Skip to content

C
core
Kaydet (Commit) c76ed2e7 authored tarafından Petr Mladek's avatar Petr Mladek
Dosyalara gözat
Seçenekler

Merge remote-tracking branch 'origin/libreoffice-3-4'

üst b9531cc3 65a99181
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
odk/settings/settings.mk
Dosyayı görüntüle @ c76ed2e7
...@@ -502,9 +502,11 @@ PLATFORM=kfreebsd ...@@ -502,9 +502,11 @@ PLATFORM=kfreebsd
ifeq "$(PROCTYPE)" "x86_64" ifeq "$(PROCTYPE)" "x86_64"
PACKAGE_LIB_DIR=kfreebsd_x86_64.plt PACKAGE_LIB_DIR=kfreebsd_x86_64.plt
UNOPKG_PLATFORM=kFreeBSD_x86_64 UNOPKG_PLATFORM=kFreeBSD_x86_64
STLPORT=no
else else
PACKAGE_LIB_DIR=kfreebsd_x86.plt PACKAGE_LIB_DIR=kfreebsd_x86.plt
UNOPKG_PLATFORM=kFreeBSD_x86 UNOPKG_PLATFORM=kFreeBSD_x86
STLPORT=no
endif endif
else else
PLATFORM=freebsd PLATFORM=freebsd
...@@ -568,6 +570,10 @@ CPPUHELPERLIB=-luno_cppuhelper$(COMID) ...@@ -568,6 +570,10 @@ CPPUHELPERLIB=-luno_cppuhelper$(COMID)
SALHELPERLIB=-luno_salhelper$(COMID) SALHELPERLIB=-luno_salhelper$(COMID)
REGLIB=-lreg REGLIB=-lreg
STORELIB=-lstore STORELIB=-lstore
ifeq "$(STLPORT)" "yes"
endif
else
STLPORTLIB=
EMPTYSTRING= EMPTYSTRING=
PATH_SEPARATOR=: PATH_SEPARATOR=:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment