--- a/radioapp/radioenginewrapper/stub/radioenginewrapper_stub.pro	Fri Aug 06 09:29:48 2010 +0300
+++ b/radioapp/radioenginewrapper/stub/radioenginewrapper_stub.pro	Mon Aug 23 14:17:50 2010 +0300
@@ -2,7 +2,7 @@
 # Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
@@ -14,87 +14,75 @@
 # Description:
 #
 
+TMP_DIR_NAME = enginewrapper_stub
 include(../../buildflags.pri)
 
 TEMPLATE    = lib
-TARGET      = radioenginewrapper_stub
+TARGET      = fmradioenginewrapper_stub
 CONFIG      += dll
 DEFINES     += BUILD_WRAPPER_DLL
-win32:DESTDIR = ../bin
-
-# Wrapper does not depend on QtGui or Orbit
-QT          = core
-CONFIG      -= gui hb
+    
 USE_DUMMY_RADIO_DATA:QT += xml
 
+INCLUDEPATH += ../inc
+INCLUDEPATH += ../../../common
+
+# Common headers
+HEADERS     += radiowrapperexport.h
+HEADERS     += radio_global.h
+HEADERS     += radiologger.h
+HEADERS     += radioenginewrapper.h
+HEADERS     += radiosettingsif.h
+HEADERS     += radiosettings.h
+HEADERS     += radiostationhandlerif.h
+HEADERS     += radioenginewrapperobserver.h
+
+INTERNAL_HEADERS += radiosettings_p.h
+
+#USE_DUMMY_RADIO_DATA:HEADERS += t_radiodataparser.h
+
+# Common sources
+SOURCES     += radiosettings.cpp
+SOURCES     += radiologger.cpp
+SOURCES     += radioenginewrapperobserver.cpp
+
+# Symbian specific stuff
 symbian: {
-    DEFINES += SYMBIAN
-    TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.CAPABILITY = CAP_GENERAL_DLL
-    
     INCLUDEPATH += ../../../radioengine/utils/api
     INCLUDEPATH += ../../../radioengine/settings/api
     INCLUDEPATH += ../../../radioengine/engine/api
-    MMP_RULES += SMPSAFE
-}
-
-win32: {
-    INCLUDEPATH += inc/win32
-}
-INCLUDEPATH += ../inc
-INCLUDEPATH += ../commoninc
-
-
-symbian:LIBS *= -lradioengineutils_stub
-symbian:LIBS *= -lradioenginesettings_stub
-symbian:LIBS *= -lradioengine_stub
-symbian:LIBS *= -lflogger
-
-DEPENDPATH += $$INCLUDEPATH ../src
 
-# $$_PRO_FILE_PWD_ points to the directory of the pro file
-MOC_DIR = $$_PRO_FILE_PWD_/tmp
+    LIBS *= -lfmradioengineutils_stub
+    LIBS *= -lfmradioenginesettings_stub
+    LIBS *= -lfmradioengine_stub
 
-# Input
-HEADERS += radiowrapperexport.h
-HEADERS += radio_global.h
-HEADERS += radiologger.h
-HEADERS += radioenginewrapper.h
-HEADERS += radiosettings.h
-HEADERS += radiostationhandlerif.h
-
-INTERNAL_HEADERS += radiosettings_p.h
-
-symbian: {
-    HEADERS += cradioenginehandler.h
+    HEADERS += radioenginehandler.h
     HEADERS += mradioenginehandlerobserver.h
-    HEADERS += radiofrequencyscanninghandler.h
     HEADERS += radiocontroleventlistener.h
     HEADERS += radiordslistener.h
-    
-    INTERNAL_HEADERS += radioenginewrapper_p.h
-}
-
-#USE_DUMMY_RADIO_DATA:HEADERS += t_radiodataparser.h
 
-win32:HEADERS += radioenginewrapper_win32_p.h
-win32:HEADERS += $$INTERNAL_HEADERS
+    INTERNAL_HEADERS += radioenginewrapper_p.h
 
-SOURCES += radiosettings.cpp
-SOURCES += radiologger.cpp
-
-symbian: {
     SOURCES += radiosettings_p.cpp
     SOURCES += radioenginewrapper.cpp
     SOURCES += radioenginewrapper_p.cpp
-    SOURCES += cradioenginehandler.cpp
-    SOURCES += radiofrequencyscanninghandler.cpp
+    SOURCES += radioenginehandler.cpp
     SOURCES += radiocontroleventlistener.cpp
     SOURCES += radiordslistener.cpp
 }
 
 #USE_DUMMY_RADIO_DATA:SOURCES += t_radiodataparser.cpp
 
-win32:SOURCES += radiosettings_win32_p.cpp
-win32:SOURCES += radioenginewrapper_win32.cpp
-win32:SOURCES += radioenginewrapper_win32_p.cpp
+# Win32 specific stuff
+win32: {
+    INCLUDEPATH += inc/win32
+
+    HEADERS += radioenginewrapper_win32_p.h
+    HEADERS += $$INTERNAL_HEADERS
+
+    SOURCES += radiosettings_win32_p.cpp
+    SOURCES += radioenginewrapper_win32.cpp
+    SOURCES += radioenginewrapper_win32_p.cpp
+}
+
+DEPENDPATH  += $$INCLUDEPATH ../src