diff -r 7cee158cb8cd -r 26b2b12093af javamanager/preinstaller/build/javapreinstaller_0x2002DCC6.mmp --- a/javamanager/preinstaller/build/javapreinstaller_0x2002DCC6.mmp Wed Sep 15 12:05:25 2010 +0300 +++ b/javamanager/preinstaller/build/javapreinstaller_0x2002DCC6.mmp Wed Oct 13 14:23:59 2010 +0300 @@ -45,7 +45,6 @@ MACRO RD_JAVA_HTTP_EMC_ENABLED MACRO RD_JAVA_NGA_ENABLED MACRO RD_JAVA_PROXIMITY_LISTENER_ENABLED -MACRO RD_JAVA_PIM_MULTICAL_ENABLED MACRO RD_JAVA_OPENC_BETA_PATCH MACRO RD_JAVA_INSTALLERUI_ENABLED MACRO RD_JAVA_PREWARM @@ -53,6 +52,7 @@ MACRO RD_JAVA_MIDPRMS_DB MACRO __SYMBIAN32__ MACRO J9EPOC32 +MACRO RD_JAVA_OMJ_FSERVER SYSTEMINCLUDE ../../../../../mw/qt/mkspecs/common/symbian SYSTEMINCLUDE ../../inc @@ -69,12 +69,10 @@ LIBRARY efsrv.lib -LIBRARY platformenv.lib +LIBRARY PlatformEnv.lib LIBRARY javacomms.lib LIBRARY charconv.lib LIBRARY javastorage.lib -LIBRARY apparc.lib -LIBRARY apgrfx.lib LIBRARY javautils.lib LIBRARY libpthread.lib LIBRARY libstdcppv5.lib @@ -87,10 +85,12 @@ LIBRARY mediaclientaudio.lib LIBRARY eikcoctl.lib LIBRARY eiksrv.lib +LIBRARY apparc.lib LIBRARY avkon.lib LIBRARY ws32.lib LIBRARY hal.lib LIBRARY gdi.lib +LIBRARY apgrfx.lib CAPABILITY all -tcb @@ -101,7 +101,7 @@ #endif OPTION GCCE -fvisibility-inlines-hidden -VERSION 10.525 +VERSION 10.0 ARMFPU softvfp