diff -r d5e927d5853b -r 7cee158cb8cd build/Makefile.project --- a/build/Makefile.project Tue Sep 14 21:06:50 2010 +0300 +++ b/build/Makefile.project Wed Sep 15 12:05:25 2010 +0300 @@ -49,6 +49,9 @@ # Use release written in file include $(RD_JAVA_S60_RELEASE_FILE) else + ifneq ($(wildcard $(addsuffix Symbianv4.sis,$(S60_STUBSIS_DIRS))),) + RD_JAVA_S60_RELEASE = 10.1 + else ifneq ($(wildcard $(addsuffix Series60v5.2.sis,$(S60_STUBSIS_DIRS))),) RD_JAVA_S60_RELEASE = 9.2 else @@ -63,6 +66,7 @@ endif endif endif + endif # Export the release info, so that no autodetermination is needed after this export RD_JAVA_S60_RELEASE endif @@ -184,6 +188,14 @@ PROJECT_DEFINES += RD_JAVA_PROXIMITY_LISTENER_ENABLED endif +# Java PIM Multiple Calendar exsist in 9.2 only(can not be used if 5.0 and for 10.1 as native support doesn't exsist) +ifdef RD_JAVA_S60_RELEASE_9_2 + RD_JAVA_PIM_MULTICAL_ENABLED = 1 +endif +ifdef RD_JAVA_PIM_MULTICAL_ENABLED + PROJECT_DEFINES += RD_JAVA_PIM_MULTICAL_ENABLED +endif + ifeq ($(OPENC_BETA_PATCH),1) PROJECT_DEFINES += RD_JAVA_OPENC_BETA_PATCH endif