author | llornkcor <llornkcor> | 2003-07-10 02:40:10 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2003-07-10 02:40:10 (UTC) |
commit | 155d68c1e7d7dc0fed2534ac43d6d77ce2781f55 (patch) (unidiff) | |
tree | e6edaa5a7040fe6c224c3943d1094dcf02e4f74c /qmake/Makefile | |
parent | 86703e8a5527ef114facd02c005b6b3a7e62e263 (diff) | |
download | opie-155d68c1e7d7dc0fed2534ac43d6d77ce2781f55.zip opie-155d68c1e7d7dc0fed2534ac43d6d77ce2781f55.tar.gz opie-155d68c1e7d7dc0fed2534ac43d6d77ce2781f55.tar.bz2 |
update qmake to 1.05a
-rw-r--r-- | qmake/Makefile | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/qmake/Makefile b/qmake/Makefile index 90b0f07..01bb1a1 100644 --- a/qmake/Makefile +++ b/qmake/Makefile | |||
@@ -8,13 +8,13 @@ CXX = g++ | |||
8 | 8 | ||
9 | #qmake code | 9 | #qmake code |
10 | OBJS=project.o main.o makefile.o unixmake2.o unixmake.o borland_bmake.o \ | 10 | OBJS=project.o main.o makefile.o unixmake2.o unixmake.o borland_bmake.o \ |
11 | msvc_nmake.o msvc_dsp.o msvc_vcproj.o option.o winmakefile.o \ | 11 | mingw_make.o msvc_nmake.o msvc_dsp.o msvc_vcproj.o option.o winmakefile.o \ |
12 | projectgenerator.o metrowerks_xml.o pbuilder_pbx.o msvc_objectmodel.o | 12 | projectgenerator.o metrowerks_xml.o pbuilder_pbx.o msvc_objectmodel.o |
13 | 13 | ||
14 | #qt code | 14 | #qt code |
15 | QOBJS=qstring.o qtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o \ | 15 | QOBJS=qstring.o qtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o \ |
16 | qdatastream.o qgarray.o qbuffer.o qglist.o qptrcollection.o qfile.o \ | 16 | qdatastream.o qgarray.o qbuffer.o qglist.o qptrcollection.o qfile.o \ |
17 | qfile_unix.o qregexp.o qgvector.o qgcache.o qbitarray.o qdir.o \ | 17 | qfile_unix.o qregexp.o qgvector.o qgcache.o qbitarray.o qdir.o quuid.o \ |
18 | qfileinfo_unix.o qdir_unix.o qfileinfo.o qdatetime.o qstringlist.o qmap.o \ | 18 | qfileinfo_unix.o qdir_unix.o qfileinfo.o qdatetime.o qstringlist.o qmap.o \ |
19 | qconfig.o | 19 | qconfig.o |
20 | 20 | ||
@@ -98,6 +98,9 @@ qbitarray.o: $(OPIEDIR)/qmake/tools/qbitarray.cpp | |||
98 | qdir.o: $(OPIEDIR)/qmake/tools/qdir.cpp | 98 | qdir.o: $(OPIEDIR)/qmake/tools/qdir.cpp |
99 | $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qdir.cpp | 99 | $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qdir.cpp |
100 | 100 | ||
101 | quuid.o: $(OPIEDIR)/qmake/tools/quuid.cpp | ||
102 | $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/quuid.cpp | ||
103 | |||
101 | qfileinfo_unix.o: $(OPIEDIR)/qmake/tools/qfileinfo_unix.cpp | 104 | qfileinfo_unix.o: $(OPIEDIR)/qmake/tools/qfileinfo_unix.cpp |
102 | $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qfileinfo_unix.cpp | 105 | $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qfileinfo_unix.cpp |
103 | 106 | ||
@@ -143,6 +146,9 @@ unixmake2.o: generators/unix/unixmake2.cpp | |||
143 | borland_bmake.o: generators/win32/borland_bmake.cpp | 146 | borland_bmake.o: generators/win32/borland_bmake.cpp |
144 | $(CXX) -c -o $@ $(CXXFLAGS) generators/win32/borland_bmake.cpp | 147 | $(CXX) -c -o $@ $(CXXFLAGS) generators/win32/borland_bmake.cpp |
145 | 148 | ||
149 | mingw_make.o: generators/win32/mingw_make.cpp | ||
150 | $(CXX) -c -o $@ $(CXXFLAGS) generators/win32/mingw_make.cpp | ||
151 | |||
146 | msvc_objectmodel.o: generators/win32/msvc_objectmodel.cpp | 152 | msvc_objectmodel.o: generators/win32/msvc_objectmodel.cpp |
147 | $(CXX) -c -o $@ $(CXXFLAGS) generators/win32/msvc_objectmodel.cpp | 153 | $(CXX) -c -o $@ $(CXXFLAGS) generators/win32/msvc_objectmodel.cpp |
148 | 154 | ||