diff options
| author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2010-02-10 14:57:51 (GMT) |
|---|---|---|
| committer | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2010-02-19 10:23:21 (GMT) |
| commit | 6ebcf2c24b43fdc1d6da50e9d7ec9dd63dd507d7 (patch) | |
| tree | 8b637adc5f9c4cd43677fe0c74309fb59e8ac3ba /qmake/Makefile.win32-g++ | |
| parent | 5254184c07b4da800e29000a251ed2a026bd2be5 (diff) | |
| download | Qt-6ebcf2c24b43fdc1d6da50e9d7ec9dd63dd507d7.zip Qt-6ebcf2c24b43fdc1d6da50e9d7ec9dd63dd507d7.tar.gz Qt-6ebcf2c24b43fdc1d6da50e9d7ec9dd63dd507d7.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
Diffstat (limited to 'qmake/Makefile.win32-g++')
| -rw-r--r-- | qmake/Makefile.win32-g++ | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++ index ebc7fe2..169de3c 100644 --- a/qmake/Makefile.win32-g++ +++ b/qmake/Makefile.win32-g++ @@ -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_dsp.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 @@ -283,6 +284,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 |