strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CWS-TOOLING: integrate CWS ause117

Browse source
This commit is contained in:
Jens-Heiner Rechtien 2010-04-13 13:27:41 +02:00
commit bf9af673cc
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
solenv/config/sdev300.ini
View file

@ -281,12 +281,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
{
@ -298,6 +300,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

6
solenv/inc/settings.mk
View file

@ -173,6 +173,8 @@ JAVARESPONSE=
.ENDIF
.ENDIF
JAVAFLAGS+=$(JAVA_TARGET_FLAG)
#END JAVA
CDEFS=
@ -818,8 +820,8 @@ L10N_MODULE*=$(SOLARSRC)$/l10n
ALT_L10N_MODULE*=$(SOLARSRC)$/l10n_so
.IF "$(WITH_LANG)"!=""
.INCLUDE .IGNORE: $(L10N_MODULE)/localization_present.mk
.INCLUDE .IGNORE: $(ALT_L10N_MODULE)/localization_present.mk
.INCLUDE .IGNORE: $(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/inc/localization_present.mk
.INCLUDE .IGNORE: $(ALT_L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/inc/localization_present.mk
# check for localizations not hosted in l10n module. if a file exists there
# it won't in l10n

5
solenv/inc/unxmacxi.mk
View file

@ -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