diff options
| author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2010-02-10 14:57:51 +0000 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-23 09:23:07 +0100 |
| commit | 295e3dd7e07c7a1788e3dce4446eab9a608f99e6 (patch) | |
| tree | b6c52403eeac9b06aedf59415a3a9e4f00b05f36 /qmake/Makefile.win32-g++-sh | |
| parent | ba301c2e265f3132906254b145fad394eeb4091f (diff) | |
| download | qt4-tools-295e3dd7e07c7a1788e3dce4446eab9a608f99e6.tar.gz | |
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-g++-sh')
| -rw-r--r-- | qmake/Makefile.win32-g++-sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/qmake/Makefile.win32-g++-sh b/qmake/Makefile.win32-g++-sh index 0772aff847..5061089e0e 100644 --- a/qmake/Makefile.win32-g++-sh +++ b/qmake/Makefile.win32-g++-sh @@ -40,6 +40,7 @@ OBJS = project.o main.o makefile.o unixmake.o unixmake2.o mingw_make.o \ borland_bmake.o msvc_nmake.o msvc_vcproj.o \ msvc_objectmodel.o symmake.o initprojectdeploy_symbian.o \ registry.o \ + epocroot.o \ symmake_abld.o symmake_sbsv2.o ifdef QMAKE_OPENSOURCE_EDITION @@ -279,6 +280,9 @@ initprojectdeploy_symbian.o: $(SOURCE_PATH)/qmake/generators/symbian/initproject registry.o: $(SOURCE_PATH)/tools/shared/windows/registry.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/windows/registry.cpp +epocroot.o: $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp + $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp + project.o: $(SOURCE_PATH)/qmake/project.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h $(CXX) $(CXXFLAGS) project.cpp |