ause117: #i110472# define target java version

solenv/config/sdev300.ini

@@ -280,12 +280,14 @@ finish
 			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
 			ILIB %LIB%$;%JDKLIB%
 			LIB %LIB%$;%JDKLIB%
+            JAVA_TARGET_FLAG -target 1.4
 		}
 		jdk15
 		{
 			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
 			ILIB %LIB%$;%JDKLIB%
 			LIB %LIB%$;%JDKLIB%
+            JAVA_TARGET_FLAG -target 1.5
 		}
 		l10n
 		{
@@ -297,6 +299,7 @@ finish
 			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
 			ILIB %LIB%$;%JDKLIB%
 			LIB %LIB%$;%JDKLIB%
+            JAVA_TARGET_FLAG -target 1.6
 		}
 	}
 	order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 cax cap common_a

solenv/inc/settings.mk

@@ -173,6 +173,8 @@ JAVARESPONSE=
 .ENDIF
 .ENDIF
 
+JAVAFLAGS+=$(JAVA_TARGET_FLAG)
+
 #END JAVA
 
 CDEFS=

solenv/inc/unxmacxi.mk

@@ -49,10 +49,5 @@ CFLAGSENABLESYMBOLS=-g1
 CFLAGSENABLESYMBOLS=-g
 .ENDIF
 
-.IF "$(SNOW_LEOPARD_10_4)"!=""
-JAVACOMPILER+=-target 1.5
-.EXPORT: DYLD_INSERT_LIBRARIES
-.ENDIF # "$(SNOW_LEOPARD_10_4)"!=""
-
 # Include generic Mac OS X makefile
 .INCLUDE : unxmacx.mk