diff options
| author | Patrick Luby <pluby@neooffice.org> | 2015-10-04 18:43:11 +0200 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-11-04 09:29:22 +0000 |
| commit | 32bc8ddbf335dd26019edcf12758643b4cff9913 (patch) | |
| tree | 89c974f0077d3277b05106e551f62b87e0bdddd2 /jvmfwk/Library_jvmfwk.mk | |
| parent | d3248d1fd83cca67a11dd593c124694382bf5f34 (diff) | |
tdf#94716 allow Oracle's JDK to be used on OS X 10.10 and 10.11
Change-Id: Ide9b4beebb407e4ceee30f1d99f29d028c848d8c
Reviewed-on: https://gerrit.libreoffice.org/19131
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'jvmfwk/Library_jvmfwk.mk')
| -rw-r--r-- | jvmfwk/Library_jvmfwk.mk | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk index 15f1a26fcb3a..f3373b781b20 100644 --- a/jvmfwk/Library_jvmfwk.mk +++ b/jvmfwk/Library_jvmfwk.mk @@ -54,6 +54,20 @@ $(eval $(call gb_Library_use_externals,jvmfwk,\ valgrind \ )) +ifeq ($(OS),MACOSX) +$(eval $(call gb_Library_add_cxxflags,jvmfwk,\ + $(gb_OBJCXXFLAGS) \ +)) + +$(eval $(call gb_Library_add_objcxxobjects,jvmfwk,\ + jvmfwk/plugins/sunmajor/pluginlib/util_cocoa \ +)) + +$(eval $(call gb_Library_add_libs,jvmfwk,\ + -framework Foundation \ +)) +endif + $(eval $(call gb_Library_add_exception_objects,jvmfwk,\ jvmfwk/plugins/sunmajor/pluginlib/gnujre \ jvmfwk/plugins/sunmajor/pluginlib/otherjre \ |