Changeset 7225 in vbox

Timestamp:

Feb 29, 2008 5:28:53 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: Fixed moc defines and includes (finally they've put a preprocessor in it).

File:

• trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk

@@ -645 +645 @@
         $$(call MSG_TOOL,moc,$(target),$(mochdr),$$@)
         $$(QUIET)$$(MKDIR) -p $$(@D)
-        $$(QUIET)$$(VBOX_MOC4) $($(target)_DEFS) $(mochdr) -o $$@
+        $$(QUIET)$$(VBOX_MOC4) $(foreach def,$($(target)_DEFS),-D$(def)) \
+                           $(foreach inc,$($(target)_INCS),-I$(inc)) \
+                           $(mochdr) -o $$@
 
 endef
@@ -666 +668 @@
         $$(call MSG_TOOL,moc,$(target),$(mocsrc),$$@)
         $$(QUIET)$$(MKDIR) -p $$(@D)
-        $$(QUIET)$$(VBOX_MOC4) $($(target)_DEFS) -i $(mocsrc) -o $$@
+        $$(QUIET)$$(VBOX_MOC4) $(foreach def,$($(target)_DEFS),-D$(def)) \
+                           $(foreach inc,$($(target)_INCS),-I$(inc)) \
+                           -i $(mocsrc) -o $$@
 
 endef
@@ -687 +691 @@
         $$(call MSG_TOOL,moc,$(target),$(mocuihdr),$$@)
         $$(QUIET)$$(MKDIR) -p $$(@D)
-        $$(QUIET)$$(VBOX_MOC4) $($(target)_DEFS) -i $(mocuihdr) -o $$@
+        $$(QUIET)$$(VBOX_MOC4) $(foreach def,$($(target)_DEFS),-D$(def)) \
+                           $(foreach inc,$($(target)_INCS),-I$(inc)) \
+                           -i $(mocuihdr) -o $$@
 
 endef
@@ -716 +722 @@
 $(mocsrc): $(uihdr) | $$(call DIRDEP,$(dir $(mocsrc)))
         $$(call MSG_TOOL,moc,$(target),$(uihdr),$$@)
-        $$(QUIET)$$(VBOX_MOC4) $($(target)_DEFS) $(uihdr) -o $$@
+        $$(QUIET)$$(VBOX_MOC4) $(foreach def,$($(target)_DEFS),-D$(def)) \
+                           $(foreach inc,$($(target)_INCS),-I$(inc)) \
+                           $(uihdr) -o $$@
 
 endef