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 /scp2 | |
| 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 'scp2')
| -rwxr-xr-x | scp2/source/ooo/ure.scp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index c24225c00203..9c9ce858339c 100755 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -303,6 +303,8 @@ Unixlink gid_Unixlink_File_Dl_Store End #endif +#if defined SOLAR_JAVA + File gid_File_Dl_Jvmaccess LIB_FILE_BODY; Dir = SCP2_URE_DL_DIR; @@ -339,7 +341,6 @@ Unixlink gid_Unixlink_File_Dl_Jvmfwk End #endif -#if defined SOLAR_JAVA File gid_File_Dl_Sunjavaplugin LIB_FILE_BODY; Dir = SCP2_URE_DL_DIR; @@ -347,9 +348,7 @@ File gid_File_Dl_Sunjavaplugin Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "0AC6C688-876C-40C5-B24E-9257003FDC3E"; End -#endif -#if defined SOLAR_JAVA File gid_File_Dl_JrepropertiesClass TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; @@ -357,6 +356,7 @@ File gid_File_Dl_JrepropertiesClass Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "0C4B8DCF-18D1-47D9-8BB7-A5C1D9268016"; End + #endif File gid_File_Dl_Profile_Jvmfwk3rc |