equal
deleted
inserted
replaced
24 QMAKE_CFLAGS_WARN_OFF = |
24 QMAKE_CFLAGS_WARN_OFF = |
25 QMAKE_CFLAGS_RELEASE = |
25 QMAKE_CFLAGS_RELEASE = |
26 QMAKE_CFLAGS_DEBUG = |
26 QMAKE_CFLAGS_DEBUG = |
27 QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses |
27 QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses |
28 |
28 |
29 |
29 MMP_OPTION_KEYWORDS = CW ARMCC GCCE |
30 VERSION_FLAGS.ARMCC = ARMCC_4_0 |
30 VERSION_FLAGS.ARMCC = ARMCC_4_0 |
31 QMAKE_CXX = g++ |
31 QMAKE_CXX = g++ |
32 QMAKE_CXXFLAGS = $$QMAKE_CFLAGS |
32 QMAKE_CXXFLAGS = $$QMAKE_CFLAGS |
33 QMAKE_CXXFLAGS.CW = |
33 QMAKE_CXXFLAGS.CW = |
34 QMAKE_CXXFLAGS.ARMCC = --visibility_inlines_hidden |
34 QMAKE_CXXFLAGS.ARMCC = --visibility_inlines_hidden |
65 QMAKE_LFLAGS_WINDOWS = |
65 QMAKE_LFLAGS_WINDOWS = |
66 QMAKE_LFLAGS_DLL = |
66 QMAKE_LFLAGS_DLL = |
67 QMAKE_LINK_OBJECT_MAX = |
67 QMAKE_LINK_OBJECT_MAX = |
68 QMAKE_LINK_OBJECT_SCRIPT= |
68 QMAKE_LINK_OBJECT_SCRIPT= |
69 |
69 |
70 QMAKE_LIBS = -llibc -llibm -leuser -llibdl |
70 QMAKE_LIBS = -llibc -llibm -leuser -llibdl -lcone -leikcore -lmediaclientaudio -leikcoctl -leiksrv -lapparc -lavkon -lefsrv -lcharconv -lws32 -lhal -lgdi -lapgrfx |
71 QMAKE_LIBS_CORE = $$QMAKE_LIBS -llibpthread -lefsrv |
71 QMAKE_LIBS_CORE = $$QMAKE_LIBS -llibpthread -lefsrv |
72 QMAKE_LIBS_GUI = $$QMAKE_LIBS_CORE -lfbscli -lbitgdi -lhal -lgdi -lws32 -lapgrfx -lcone -leikcore -lmediaclientaudio -leikcoctl -leiksrv -lapparc -lcentralrepository |
72 QMAKE_LIBS_GUI = $$QMAKE_LIBS_CORE -lfbscli -lbitgdi -lhal -lgdi -lws32 -lapgrfx -lcone -leikcore -lmediaclientaudio -leikcoctl -leiksrv -lapparc -lcentralrepository |
73 QMAKE_LIBS_NETWORK = |
73 QMAKE_LIBS_NETWORK = |
74 QMAKE_LIBS_EGL = -llibEGL |
74 QMAKE_LIBS_EGL = -llibEGL |
75 QMAKE_LIBS_OPENGL = |
75 QMAKE_LIBS_OPENGL = |
98 QMAKE_MKDIR = mkdir |
98 QMAKE_MKDIR = mkdir |
99 QMAKE_DEL_DIR = rmdir |
99 QMAKE_DEL_DIR = rmdir |
100 QMAKE_CHK_DIR_EXISTS = test -d |
100 QMAKE_CHK_DIR_EXISTS = test -d |
101 } |
101 } |
102 |
102 |
103 QMAKE_MOC = /epoc32/tools/qt/moc$$(DOTEXE) |
103 QMAKE_MOC = /epoc32/tools/moc$$(DOTEXE) |
104 QMAKE_UIC = /epoc32/tools/qt/uic$$(DOTEXE) |
104 QMAKE_UIC = /epoc32/tools/uic$$(DOTEXE) |
105 QMAKE_IDC = /epoc32/tools/qt/idc$$(DOTEXE) |
105 QMAKE_IDC = /epoc32/tools/idc$$(DOTEXE) |
|
106 QMAKE_RCC = /epoc32/tools/rcc$$(DOTEXE) |
106 |
107 |
107 QMAKE_IDL = midl |
108 QMAKE_IDL = midl |
108 QMAKE_LIB = /epoc32/gcc_mingw/bin/ar -ru |
109 QMAKE_LIB = /epoc32/gcc_mingw/bin/ar -ru |
109 QMAKE_RC = /epoc32/gcc_mingw/bin/windres |
110 QMAKE_RC = /epoc32/gcc_mingw/bin/windres |
110 QMAKE_ZIP = zip -r -9 |
111 QMAKE_ZIP = zip -r -9 |
179 QMAKE_CXXFLAGS.ARMCC += $${QMAKE_CXXFLAGS_FAST_VFP.ARMCC} |
180 QMAKE_CXXFLAGS.ARMCC += $${QMAKE_CXXFLAGS_FAST_VFP.ARMCC} |
180 # [TODO] QMAKE_CXXFLAGS.GCCE += $${QMAKE_CXXFLAGS_FAST_VFP.GCCE} |
181 # [TODO] QMAKE_CXXFLAGS.GCCE += $${QMAKE_CXXFLAGS_FAST_VFP.GCCE} |
181 } |
182 } |
182 } |
183 } |
183 } |
184 } |
184 |
|
185 # QMAKE_CXXFLAGS.ARMCC doesn't provide support for conditional options, so use MMP_RULES # to enable support for newer armcc compilers. |
|
186 # MMP files support combining multiple OPTION statements, so this is not a problem. |
|
187 newArmccRule = \ |
|
188 "$${LITERAL_HASH}if defined(ARMCC) && !defined(ARMCC_2_2) && !defined(ARMCC_3_1)"\ |
|
189 "OPTION ARMCC --import_all_vtbl" \ |
|
190 "$${LITERAL_HASH}endif" |
|
191 MMP_RULES += newArmccRule |
|
192 |
|