Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
4967a9d8
Kaydet (Commit)
4967a9d8
authored
Nis 07, 2012
tarafından
Matúš Kukan
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
libmerged: add fsstorage, svl, sot, vcl
Change-Id: Ibebf00d99fdf8212afbdba21ca13844d2ff1c412
üst
95ebf4e3
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
74 additions
and
29 deletions
+74
-29
Library_merged.mk
Library_merged.mk
+70
-11
Makefile
android/experimental/DocumentLoader/Makefile
+0
-4
DocumentLoader.java
.../src/org/libreoffice/android/examples/DocumentLoader.java
+0
-1
Makefile
android/experimental/LibreOffice4Android/Makefile
+0
-4
DocumentLoader.java
...e4Android/src/org/libreoffice/android/DocumentLoader.java
+0
-1
LibreOfficeUIActivity.java
...Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
+0
-1
Makefile
android/qa/desktop/Makefile
+0
-4
Makefile
android/qa/sc/Makefile
+0
-3
pre_MergedLibsList.mk
solenv/gbuild/extensions/pre_MergedLibsList.mk
+4
-0
No files found.
Library_merged.mk
Dosyayı görüntüle @
4967a9d8
...
...
@@ -23,6 +23,11 @@
$(eval
$(call
gb_Library_Library,merged))
# gb_MERGEDLIBS is defined in solenv/gbuild/extensions/pre_MergedLibsList.mk
$(eval
$(call
gb_Library_use_library_objects,merged,\
$(gb_MERGEDLIBS)
\
))
$(eval
$(call
gb_Library_use_libraries,merged,\
basegfx
\
comphelper
\
...
...
@@ -34,21 +39,21 @@ $(eval $(call gb_Library_use_libraries,merged,\
sal
\
salhelper
\
sax
\
sot
\
svl
\
tl
\
ucbhelper
\
utl
\
vcl
\
xmlreader
\
$(gb_STDLIBS)
\
))
$(eval
$(call
gb_Library_use_externals,merged,\
graphite
\
icule
\
icuuc
\
jpeg
\
lcms2
\
libxml2
\
telepathy
\
nss3
\
zlib
\
))
...
...
@@ -58,21 +63,57 @@ $(eval $(call gb_Library_use_externals,merged,\
))
endif
# gb_MERGEDLIBS is defined in solenv/gbuild/extensions/pre_MergedLibsList.mk
$(eval
$(call
gb_Library_use_librar
y_object
s,merged,\
$(gb_MERGEDLIBS)
\
ifneq
($(OS),IOS)
$(eval
$(call
gb_Library_use_librar
ie
s,merged,\
jvmaccess
\
))
endif
ifeq
($(GUIBASE),unx)
$(eval
$(call
gb_Library_use_externals,merged,\
fontconfig
\
freetype
\
))
endif
ifeq
($(OS),LINUX)
$(eval
$(call
gb_Library_use_libraries,merged,\
dl
\
m
\
pthread
\
))
endif
ifeq
($(OS),WNT)
$(eval
$(call
gb_Library_use_libraries,merged,\
advapi32
\
gdi32
\
gdiplus
\
imm32
\
mpr
\
msimg32
\
$(gb_Library_win32_OLDNAMES)
\
ole32
\
oleaut32
\
shell32
\
user32
\
uuid
\
version
\
winmm
\
winspool
\
))
endif
ifeq
($(OS),MACOSX)
$(eval
$(call
gb_Library_use_libraries,merged,\
AppleRemote
\
objc
\
))
$(eval
$(call
gb_Library_use_externals,merged,\
carbon
\
cocoa
\
corefoundation
\
quicktime
\
))
endif
...
...
@@ -80,12 +121,30 @@ ifeq ($(OS),ANDROID)
$(eval
$(call
gb_Library_use_libraries,merged,\
libotouch
\
))
$(eval
$(call
gb_Library_add_libs,merged,\
-llog
\
-landroid
\
-llo-bootstrap
\
))
endif
ifeq
($(OS),MACOSX)
$(eval
$(call
gb_Library_use_libraries,merged,\
objc
\
Cocoa
\
ifeq
($(OS),IOS)
$(eval
$(call
gb_Library_use_externals,merged,\
corefoundation
\
uikit
\
))
endif
ifneq
($(ENABLE_LIBRSVG),NO)
$(eval
$(call
gb_Library_use_externals,merged,\
cairo
\
))
endif
ifeq
($(ENABLE_TELEPATHY),TRUE)
$(eval
$(call
gb_Library_use_externals,merged,\
gtk
\
telepathy
\
))
endif
...
...
android/experimental/DocumentLoader/Makefile
Dosyayı görüntüle @
4967a9d8
...
...
@@ -69,7 +69,6 @@ copy-stuff:
forlo
\
foruilo
\
frmlo
\
fsstorage.uno
\
gcc3_uno
\
hwplo
\
i18nisolang1gcc3
\
...
...
@@ -103,11 +102,9 @@ copy-stuff:
scfiltlo
\
sddlo
\
smdlo
\
sotlo
\
stocservices.uno
\
store
\
svgfilterlo
\
svllo
\
swdlo
\
swlo
\
t602filterlo
\
...
...
@@ -127,7 +124,6 @@ copy-stuff:
vbaswobj.uno
\
wpftdrawlo
\
wpftwriterlo
\
vcllo
\
xml2
\
xmlfdlo
\
xmlreader
\
...
...
android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
Dosyayı görüntüle @
4967a9d8
...
...
@@ -933,7 +933,6 @@ public class DocumentLoader
// Load a lot of shlibs here explicitly in advance because that
// makes debugging work better, sigh
Bootstrap
.
dlopen
(
"libvcllo.so"
);
Bootstrap
.
dlopen
(
"libmergedlo.so"
);
Bootstrap
.
dlopen
(
"libswdlo.so"
);
Bootstrap
.
dlopen
(
"libswlo.so"
);
...
...
android/experimental/LibreOffice4Android/Makefile
Dosyayı görüntüle @
4967a9d8
...
...
@@ -39,7 +39,6 @@ copy-stuff:
forlo
\
foruilo
\
frmlo
\
fsstorage.uno
\
gcc3_uno
\
hwplo
\
hyphenlo
\
...
...
@@ -79,12 +78,10 @@ copy-stuff:
sdlo
\
sddlo
\
smdlo
\
sotlo
\
spelllo
\
stocservices.uno
\
store
\
svgfilterlo
\
svllo
\
swdlo
\
swlo
\
swdlo
\
...
...
@@ -105,7 +102,6 @@ copy-stuff:
vbaswobj.uno
\
wpftdrawlo
\
wpftwriterlo
\
vcllo
\
xml2
\
xmlfdlo
\
xmlreader
\
...
...
android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
Dosyayı görüntüle @
4967a9d8
...
...
@@ -963,7 +963,6 @@ public class DocumentLoader
// Load a lot of shlibs here explicitly in advance because that
// makes debugging work better, sigh
Bootstrap
.
dlopen
(
"libvcllo.so"
);
Bootstrap
.
dlopen
(
"libmergedlo.so"
);
Bootstrap
.
dlopen
(
"libswdlo.so"
);
Bootstrap
.
dlopen
(
"libswlo.so"
);
...
...
android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
Dosyayı görüntüle @
4967a9d8
...
...
@@ -747,7 +747,6 @@ class ListItemAdapter implements ListAdapter{
// Load a lot of shlibs here explicitly in advance because that
// makes debugging work better, sigh
Bootstrap
.
dlopen
(
"libvcllo.so"
);
Bootstrap
.
dlopen
(
"libmergedlo.so"
);
Bootstrap
.
dlopen
(
"libswdlo.so"
);
Bootstrap
.
dlopen
(
"libswlo.so"
);
...
...
android/qa/desktop/Makefile
Dosyayı görüntüle @
4967a9d8
...
...
@@ -101,7 +101,6 @@ copy-stuff: buildrcs
expwrap.uno
\
forlo
\
foruilo
\
fsstorage.uno
\
gcc3_uno
\
hyphenlo
\
i18nisolang1gcc3
\
...
...
@@ -127,11 +126,9 @@ copy-stuff: buildrcs
reflection.uno
\
reg
\
saxlo
\
sotlo
\
spelllo
\
stocservices.uno
\
store
\
svllo
\
test
\
tllo
\
ucbhelper4gcc3
\
...
...
@@ -144,7 +141,6 @@ copy-stuff: buildrcs
unoxmllo
\
utllo
\
vbahelperlo
\
vcllo
\
xml2
\
xmlreader
\
xmlsecurity
\
...
...
android/qa/sc/Makefile
Dosyayı görüntüle @
4967a9d8
...
...
@@ -91,10 +91,8 @@ copy-stuff:
saxlo
\
sclo
\
scfiltlo
\
sotlo
\
stocservices.uno
\
store
\
svllo
\
textinstream.uno
\
test
\
tllo
\
...
...
@@ -108,7 +106,6 @@ copy-stuff:
unoxmllo
\
utllo
\
vbahelperlo
\
vcllo
\
xml2
\
xmlreader
\
xstor
\
...
...
solenv/gbuild/extensions/pre_MergedLibsList.mk
Dosyayı görüntüle @
4967a9d8
...
...
@@ -37,6 +37,7 @@ gb_MERGEDLIBS := \
drawinglayer
\
editeng
\
filterconfig
\
fsstorage
\
fwe
\
fwi
\
fwk
\
...
...
@@ -45,7 +46,9 @@ gb_MERGEDLIBS := \
sb
\
sfx
\
sofficeapp
\
sot
\
spl
\
svl
\
svt
\
svx
\
svxcore
\
...
...
@@ -53,6 +56,7 @@ gb_MERGEDLIBS := \
ucb1
\
ucpfile1
\
uui
\
vcl
\
xmlscript
\
xo
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment