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 | |||
@@ -1,33 +1,33 @@ | |||
1 | QMAKESPECSDIR=$(OPIEDIR)/mkspecs | 1 | QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
2 | 2 | ||
3 | ######################################################################## | 3 | ######################################################################## |
4 | ## This file was autogenerated by configure, all changes will be lost ## | 4 | ## This file was autogenerated by configure, all changes will be lost ## |
5 | ######################################################################## | 5 | ######################################################################## |
6 | CC = gcc | 6 | CC = gcc |
7 | CXX = g++ | 7 | 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 | ||
21 | CFLAGS= \ | 21 | CFLAGS= \ |
22 | -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ | 22 | -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ |
23 | -I$(OPIEDIR)/qmake/include -I$(OPIEDIR)/qmake/include/qmake -I$(QMAKESPECSDIR)/default \ | 23 | -I$(OPIEDIR)/qmake/include -I$(OPIEDIR)/qmake/include/qmake -I$(QMAKESPECSDIR)/default \ |
24 | -I$(OPIEDIR)/qmake/include/private \ | 24 | -I$(OPIEDIR)/qmake/include/private \ |
25 | -DQT_NO_TEXTCODEC -DQT_LITE_COMPONENT -DQT_NO_STL -DQT_NO_COMPRESS | 25 | -DQT_NO_TEXTCODEC -DQT_LITE_COMPONENT -DQT_NO_STL -DQT_NO_COMPRESS |
26 | CXXFLAGS= $(CFLAGS) | 26 | CXXFLAGS= $(CFLAGS) |
27 | LFLAGS= | 27 | LFLAGS= |
28 | 28 | ||
29 | qmake: $(OBJS) $(QOBJS) | 29 | qmake: $(OBJS) $(QOBJS) |
30 | $(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS) | 30 | $(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS) |
31 | $(if $(OPIEDIR),rm -f $(OPIEDIR)/bin/$@) | 31 | $(if $(OPIEDIR),rm -f $(OPIEDIR)/bin/$@) |
32 | $(if $(OPIEDIR),ln -s ../qmake/$@ $(OPIEDIR)/bin/$@) | 32 | $(if $(OPIEDIR),ln -s ../qmake/$@ $(OPIEDIR)/bin/$@) |
33 | 33 | ||
@@ -85,32 +85,35 @@ qfile_unix.o: $(OPIEDIR)/qmake/tools/qfile_unix.cpp | |||
85 | 85 | ||
86 | qregexp.o: $(OPIEDIR)/qmake/tools/qregexp.cpp | 86 | qregexp.o: $(OPIEDIR)/qmake/tools/qregexp.cpp |
87 | $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qregexp.cpp | 87 | $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qregexp.cpp |
88 | 88 | ||
89 | qgvector.o: $(OPIEDIR)/qmake/tools/qgvector.cpp | 89 | qgvector.o: $(OPIEDIR)/qmake/tools/qgvector.cpp |
90 | $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qgvector.cpp | 90 | $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qgvector.cpp |
91 | 91 | ||
92 | qgcache.o: $(OPIEDIR)/qmake/tools/qgcache.cpp | 92 | qgcache.o: $(OPIEDIR)/qmake/tools/qgcache.cpp |
93 | $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qgcache.cpp | 93 | $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qgcache.cpp |
94 | 94 | ||
95 | qbitarray.o: $(OPIEDIR)/qmake/tools/qbitarray.cpp | 95 | qbitarray.o: $(OPIEDIR)/qmake/tools/qbitarray.cpp |
96 | $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qbitarray.cpp | 96 | $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qbitarray.cpp |
97 | 97 | ||
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 | ||
104 | qdir_unix.o: $(OPIEDIR)/qmake/tools/qdir_unix.cpp | 107 | qdir_unix.o: $(OPIEDIR)/qmake/tools/qdir_unix.cpp |
105 | $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qdir_unix.cpp | 108 | $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qdir_unix.cpp |
106 | 109 | ||
107 | qfileinfo.o: $(OPIEDIR)/qmake/tools/qfileinfo.cpp | 110 | qfileinfo.o: $(OPIEDIR)/qmake/tools/qfileinfo.cpp |
108 | $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qfileinfo.cpp | 111 | $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qfileinfo.cpp |
109 | 112 | ||
110 | qdatetime.o: $(OPIEDIR)/qmake/tools/qdatetime.cpp | 113 | qdatetime.o: $(OPIEDIR)/qmake/tools/qdatetime.cpp |
111 | $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qdatetime.cpp | 114 | $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qdatetime.cpp |
112 | 115 | ||
113 | qstringlist.o: $(OPIEDIR)/qmake/tools/qstringlist.cpp | 116 | qstringlist.o: $(OPIEDIR)/qmake/tools/qstringlist.cpp |
114 | $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qstringlist.cpp | 117 | $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qstringlist.cpp |
115 | 118 | ||
116 | qmap.o: $(OPIEDIR)/qmake/tools/qmap.cpp | 119 | qmap.o: $(OPIEDIR)/qmake/tools/qmap.cpp |
@@ -130,32 +133,35 @@ main.o: main.cpp project.h | |||
130 | 133 | ||
131 | option.o: option.cpp option.h | 134 | option.o: option.cpp option.h |
132 | $(CXX) -c -o $@ $(CXXFLAGS) option.cpp | 135 | $(CXX) -c -o $@ $(CXXFLAGS) option.cpp |
133 | 136 | ||
134 | makefile.o: generators/makefile.cpp | 137 | makefile.o: generators/makefile.cpp |
135 | $(CXX) -c -o $@ $(CXXFLAGS) generators/makefile.cpp | 138 | $(CXX) -c -o $@ $(CXXFLAGS) generators/makefile.cpp |
136 | 139 | ||
137 | unixmake.o: generators/unix/unixmake.cpp | 140 | unixmake.o: generators/unix/unixmake.cpp |
138 | $(CXX) -c -o $@ $(CXXFLAGS) generators/unix/unixmake.cpp | 141 | $(CXX) -c -o $@ $(CXXFLAGS) generators/unix/unixmake.cpp |
139 | 142 | ||
140 | unixmake2.o: generators/unix/unixmake2.cpp | 143 | unixmake2.o: generators/unix/unixmake2.cpp |
141 | $(CXX) -c -o $@ $(CXXFLAGS) generators/unix/unixmake2.cpp | 144 | $(CXX) -c -o $@ $(CXXFLAGS) generators/unix/unixmake2.cpp |
142 | 145 | ||
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 | ||
149 | msvc_vcproj.o: generators/win32/msvc_vcproj.cpp | 155 | msvc_vcproj.o: generators/win32/msvc_vcproj.cpp |
150 | $(CXX) -c -o $@ $(CXXFLAGS) generators/win32/msvc_vcproj.cpp | 156 | $(CXX) -c -o $@ $(CXXFLAGS) generators/win32/msvc_vcproj.cpp |
151 | 157 | ||
152 | msvc_nmake.o: generators/win32/msvc_nmake.cpp | 158 | msvc_nmake.o: generators/win32/msvc_nmake.cpp |
153 | $(CXX) -c -o $@ $(CXXFLAGS) generators/win32/msvc_nmake.cpp | 159 | $(CXX) -c -o $@ $(CXXFLAGS) generators/win32/msvc_nmake.cpp |
154 | 160 | ||
155 | metrowerks_xml.o: generators/mac/metrowerks_xml.cpp | 161 | metrowerks_xml.o: generators/mac/metrowerks_xml.cpp |
156 | $(CXX) -c -o $@ $(CXXFLAGS) generators/mac/metrowerks_xml.cpp | 162 | $(CXX) -c -o $@ $(CXXFLAGS) generators/mac/metrowerks_xml.cpp |
157 | 163 | ||
158 | pbuilder_pbx.o: generators/mac/pbuilder_pbx.cpp | 164 | pbuilder_pbx.o: generators/mac/pbuilder_pbx.cpp |
159 | $(CXX) -c -o $@ $(CXXFLAGS) generators/mac/pbuilder_pbx.cpp | 165 | $(CXX) -c -o $@ $(CXXFLAGS) generators/mac/pbuilder_pbx.cpp |
160 | 166 | ||
161 | msvc_dsp.o: generators/win32/msvc_dsp.cpp | 167 | msvc_dsp.o: generators/win32/msvc_dsp.cpp |