equal
deleted
inserted
replaced
9 |
9 |
10 QT_ROOT:=../../.. |
10 QT_ROOT:=../../.. |
11 TARGETDIR:=$(EPOCROOT)/$(INSTALLPATH) |
11 TARGETDIR:=$(EPOCROOT)/$(INSTALLPATH) |
12 SOURCEDIR:=$(EXTENSION_ROOT)/$(QT_ROOT)/bin |
12 SOURCEDIR:=$(EXTENSION_ROOT)/$(QT_ROOT)/bin |
13 TOOLSSRCDIR:=$(EXTENSION_ROOT)/$(QT_ROOT)/src/tools |
13 TOOLSSRCDIR:=$(EXTENSION_ROOT)/$(QT_ROOT)/src/tools |
|
14 LANGUAGETOOLSDIR:=$(EXTENSION_ROOT)/$(QT_ROOT)/tools/linguist |
14 CONFIGURE_APP:=configure$(DOTEXE) |
15 CONFIGURE_APP:=configure$(DOTEXE) |
15 |
16 |
16 $(call makepath,$(TARGETDIR)) |
17 $(call makepath,$(TARGETDIR)) |
17 |
18 |
18 ifeq ($(OSTYPE),unix) |
19 ifeq ($(OSTYPE),unix) |
23 else |
24 else |
24 PLATFORM:=$(PLATFORM.WIN32) |
25 PLATFORM:=$(PLATFORM.WIN32) |
25 endif |
26 endif |
26 |
27 |
27 TARGET_TOOLS:=$(TARGETDIR)/qmake$(DOTEXE) $(TARGETDIR)/moc$(DOTEXE) $(TARGETDIR)/rcc$(DOTEXE) $(TARGETDIR)/uic$(DOTEXE) $(TARGETDIR)/lrelease$(DOTEXE) |
28 TARGET_TOOLS:=$(TARGETDIR)/qmake$(DOTEXE) $(TARGETDIR)/moc$(DOTEXE) $(TARGETDIR)/rcc$(DOTEXE) $(TARGETDIR)/uic$(DOTEXE) $(TARGETDIR)/lrelease$(DOTEXE) |
28 QT_TOOLS:= $(TOOLSSRCDIR)/uic $(TOOLSSRCDIR)/moc $(TOOLSSRCDIR)/rcc |
29 QT_TOOLS:= $(TOOLSSRCDIR)/uic $(TOOLSSRCDIR)/moc $(TOOLSSRCDIR)/rcc $(LANGUAGETOOLSDIR)/lrelease |
29 SOURCE_TOOLS:=$(SOURCEDIR)/qmake$(DOTEXE) $(SOURCEDIR)/moc$(DOTEXE) $(SOURCEDIR)/rcc$(DOTEXE) $(SOURCEDIR)/uic$(DOTEXE) $(SOURCEDIR)/lrelease$(DOTEXE) |
30 SOURCE_TOOLS:=$(SOURCEDIR)/qmake$(DOTEXE) $(SOURCEDIR)/moc$(DOTEXE) $(SOURCEDIR)/rcc$(DOTEXE) $(SOURCEDIR)/uic$(DOTEXE) $(SOURCEDIR)/lrelease$(DOTEXE) |
30 |
31 |
31 define QtConfiguration |
32 define QtConfiguration |
32 ifeq ($(OSTYPE),unix) |
33 ifeq ($(OSTYPE),unix) |
33 $(TARGET_TOOLS): $(QT_TOOLS) |
34 $(TARGET_TOOLS): $(QT_TOOLS) |
55 endif |
56 endif |
56 |
57 |
57 |
58 |
58 $(SOURCEDIR)/qmake$(DOTEXE): $(EXTENSION_ROOT)/$(QT_ROOT)/$(CONFIGURE_APP) |
59 $(SOURCEDIR)/qmake$(DOTEXE): $(EXTENSION_ROOT)/$(QT_ROOT)/$(CONFIGURE_APP) |
59 $(call startrule,qtconf) \ |
60 $(call startrule,qtconf) \ |
60 cd $(EXTENSION_ROOT)/$(QT_ROOT) && \ |
61 cd $(EXTENSION_ROOT)/$(QT_ROOT) && unset INCLUDE && unset LIB && $(EXTENSION_ROOT)/$(QT_ROOT)/$(CONFIGURE_APP) -platform $(PLATFORM) -xplatform $(XPLATFORM) $(OPTIONS) \ |
61 $(EXTENSION_ROOT)/$(QT_ROOT)/$(CONFIGURE_APP) -platform $(PLATFORM) -xplatform $(XPLATFORM) $(OPTIONS) \ |
|
62 $(call endrule,qtconf) |
62 $(call endrule,qtconf) |
|
63 $(call startrule,syncqt) \ |
|
64 cd $(EXTENSION_ROOT)/$(QT_ROOT)/bin/ && \ |
|
65 perl syncqt -base-dir $(EXTENSION_ROOT)/$(QT_ROOT) -copy -oneway -outdir $(EPOCROOT)/epoc32/include/ -outsubdir mw |
|
66 $(call endrule,syncqt) |
63 $(call startrule,mkspecexport) \ |
67 $(call startrule,mkspecexport) \ |
64 $(GNUCP) -R $(EXTENSION_ROOT)/$(QT_ROOT)/mkspecs $(TARGETDIR) |
68 $(GNUCP) -R $(EXTENSION_ROOT)/$(QT_ROOT)/mkspecs $(TARGETDIR) |
65 $(call endrule,mkspecexport) |
69 $(call endrule,mkspecexport) |
66 endef |
70 endef |
67 |
71 |