diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-04-04 22:46:53 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-04-05 00:18:50 +0300 |
| commit | b7525f1f1d123084b60269f420300afdd405b0d1 (patch) | |
| tree | 0b2e32b3879a27802c0e607b187c1b43ab697c9e /vcl | |
| parent | f5928f09ad53de2c4683000619d29be140a97be8 (diff) | |
Drop jvmaccess and jvmfwk when no SOLAR_JAVA
Just sprinkle #ifdef SOLAR_JAVA into the code instead.
In the source for jvmaccess and jvmfwk such ifdefs can be removed as
it isn't compiled unless SOLAR_JAVA.
Change-Id: Ia8614f8bd6d833582d3b79b5fb75f9153fa79606
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/Library_desktop_detector.mk | 3 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index 88902b4eb940..bce3d93a02b9 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -41,7 +41,8 @@ $(eval $(call gb_Library_use_libraries,desktop_detector,\ cppuhelper \ i18nisolang1 \ i18nutil \ - jvmaccess \ + $(if $(filter TRUE,$(SOLAR_JAVA)), \ + jvmaccess) \ cppu \ sal \ )) diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index c72f6a9de3bd..c5ad854d83c4 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -90,7 +90,7 @@ $(eval $(call gb_Library_add_libs,vcl,\ )) endif -ifneq ($(OS),IOS) +ifeq ($(SOLAR_JAVA),TRUE) $(eval $(call gb_Library_use_libraries,vcl,\ jvmaccess \ )) |