diff options
| author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2010-02-10 14:57:51 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-23 08:23:07 (GMT) |
| commit | 295e3dd7e07c7a1788e3dce4446eab9a608f99e6 (patch) | |
| tree | b6c52403eeac9b06aedf59415a3a9e4f00b05f36 /qmake/Makefile.win32 | |
| parent | ba301c2e265f3132906254b145fad394eeb4091f (diff) | |
| download | Qt-295e3dd7e07c7a1788e3dce4446eab9a608f99e6.zip Qt-295e3dd7e07c7a1788e3dce4446eab9a608f99e6.tar.gz Qt-295e3dd7e07c7a1788e3dce4446eab9a608f99e6.tar.bz2 | |
Factored epocRoot implementation out of qmake
This function is now implemented in its own source file, rather
than being embedded within the Symbian qmake generator.
The motivation for this is to allow code to be shared between
qmake and configure - the latter needs to determine the epoc
root path in order to perform feature detection on Symbian SDKs.
Reviewed-by: Miikka Heikkinen
(cherry picked from commit 6ebcf2c24b43fdc1d6da50e9d7ec9dd63dd507d7)
Diffstat (limited to 'qmake/Makefile.win32')
| -rw-r--r-- | qmake/Makefile.win32 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index bbc37c1..a598350 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -78,6 +78,7 @@ OBJS = project.obj main.obj makefile.obj unixmake.obj unixmake2.obj mingw borland_bmake.obj msvc_nmake.obj msvc_vcproj.obj \ msvc_objectmodel.obj symmake.obj initprojectdeploy_symbian.obj \ registry.obj \ + epocroot.obj \ symmake_abld.obj symmake_sbsv2.obj !IFDEF QMAKE_OPENSOURCE_EDITION @@ -201,6 +202,7 @@ clean:: -del symmake_sbsv2.obj -del initprojectdeploy_symbian.obj -del registry.obj + -del epocroot.obj -del pbuilder_pbx.obj -del qxmlstream.obj -del qxmlutils.obj @@ -400,6 +402,9 @@ initprojectdeploy_symbian.obj: $(SOURCE_PATH)/qmake/generators/symbian/initproje registry.obj: $(SOURCE_PATH)/tools/shared/windows/registry.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/windows/registry.cpp +epocroot.obj: $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp + $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp + md5.obj: $(SOURCE_PATH)\src\3rdparty\md5\md5.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\3rdparty\md5\md5.cpp |