Repository.mk | 2 +-
android/Bootstrap/Makefile.shared | 2 +-
external/glew/ExternalProject_glew.mk | 2 +-
vcl/Module_vcl.mk | 4 +---
4 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 71e37567789f20ea5e2cb3997d7d40304b3dd746
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Apr 15 08:39:13 2014 +0300
Need libGLESv2 now then
Change-Id: I87e91202a6005ad0bec3569b2619a5b191991502
diff --git a/android/Bootstrap/Makefile.shared
b/android/Bootstrap/Makefile.shared
index fd86421..54bdfa8 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -90,7 +90,7 @@ WHOLELIBS = \
$(OBJLOCAL)/liblo-native-code.so : native-code.cxx dummies.cxx
mkdir -p $(OBJLOCAL)
- $(CXX) -Wl,--gc-sections
-Wl,--version-script=../../Bootstrap/version.map -Wl,--no-keep-files-mapped
-Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o
$(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include
native-code.cxx dummies.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS)
$(LIBS) -lgnustl_static -landroid -ljnigraphics -llog -lz
+ $(CXX) -Wl,--gc-sections
-Wl,--version-script=../../Bootstrap/version.map -Wl,--no-keep-files-mapped
-Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o
$(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include
native-code.cxx dummies.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS)
$(LIBS) -lgnustl_static -lGLESv2 -landroid -ljnigraphics -llog -lz
$(SODEST)/liblo-native-code.so : $(OBJLOCAL)/liblo-native-code.so
mkdir -p $(SODEST)
commit 3f69f376fc1badb930a91507e619c7aa7c9e7f67
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Apr 15 08:38:47 2014 +0300
Stripping confuses the Android NDK tool-chain
Change-Id: I0cf84a6ccb783642a3d50a004325a19b79741b32
diff --git a/external/glew/ExternalProject_glew.mk
b/external/glew/ExternalProject_glew.mk
index 96026a1..97ad954 100644
--- a/external/glew/ExternalProject_glew.mk
+++ b/external/glew/ExternalProject_glew.mk
@@ -25,7 +25,7 @@ else
$(call gb_ExternalProject_get_state_target,glew,build) :
$(call gb_ExternalProject_run,glew,\
$(if $(filter TRUE,$(ENABLE_DEBUG)),STRIP=) LD="$(CC)" \
- $(MAKE) glew.lib $(if $(filter
DESKTOP,$(BUILD_TYPE)),$(if $(filter TRUE,$(ENABLE_DEBUG)),debug)) \
+ $(MAKE) STRIP= glew.lib $(if $(filter
DESKTOP,$(BUILD_TYPE)),$(if $(filter TRUE,$(ENABLE_DEBUG)),debug)) \
)
endif
commit 39ad0a912aee360ff285cb3bdcd5cf351dc3eb3b
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Apr 15 08:37:50 2014 +0300
Build the vclopengl lib for Android, too, i.e. for all our platforms
Change-Id: I244eb4877801ceb0ff22e8591dccd6b801d00d68
diff --git a/Repository.mk b/Repository.mk
index 7d1da27..e3715d5 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -352,7 +352,7 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
$(if $(DISABLE_SCRIPTING),,vbahelper) \
vcl \
vclcanvas \
- $(if $(filter FREEBSD IOS LINUX MACOSX WNT,$(OS)),vclopengl) \
+ vclopengl \
$(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
vclplug_gen \
$(if $(ENABLE_TDE),vclplug_tde) \
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index a5b0b32..5f302a8 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -25,9 +25,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
$(if $(filter DESKTOP,$(BUILD_TYPE)), \
StaticLibrary_vclmain \
Executable_ui-previewer) \
- $(if $(filter FREEBSD IOS LINUX MACOSX WNT,$(OS)), \
- Library_vclopengl \
- ) \
+ Library_vclopengl \
))
$(eval $(call gb_Module_add_l10n_targets,vcl,\
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
