390c390
< WX-OUTDIR	=$(OUTDIR)/$(WX)
---
> WX-OUTDIR	=$(OUTDIR)/wx_wxcore
402c402
< WX-HCFLAGS	=$(HCFLAGS) -package-name $(WX)
---
> WX-HCFLAGS	=$(HCFLAGS) -package-name $(WX) -i$(WX-SRCDIR) -i$(WXCORE-SRCDIR) -odir $(WX-IMPORTSDIR) -hidir $(WX-IMPORTSDIR)
462c462,463
< WXD-FLAGS	= --wxc $(WXC) -o $(WXCORE-SRCDIR)/$(WXCORE-HPATH)
---
> WXD-FLAGS	= --wxc $(WXC) -o $(WXCORE-SRCDIR)/$(WXCORE-HPATH) 
> WXD-HCFLAGS	= $(HCFLAGS) -ignore-package data-1.0  -i$(WXD-SRCDIR) -odir $(WXD-OUTDIR) -hidir $(WXD-OUTDIR)
484c485
< 	@$(call compile-hs,$@,$<,$(HCFLAGS) $(PKG-PARSEC) -i$(WXD-OUTDIR))
---
> 	@$(call compile-hs,$@,$<,$(WXD-HCFLAGS) $(PKG-PARSEC) -i$(WXD-OUTDIR))
496c497
< WXCORE-OUTDIR	=$(OUTDIR)/$(WXCORE)
---
> WXCORE-OUTDIR	=$(OUTDIR)/wx_wxcore
516c517,522
< WXCORE-STUB-OBJS=$(call make-objs, $(WXCORE-IMPORTSDIR), $(patsubst %,%_stub,$(WXCORE-STUBS)))
---
> # the *_stub.o files are not placed in the right directory. 
> #  E.g. instead of out/wxcore/imports/Graphics/UI/WXCore/Events_stub.o it is in 
> #	           out/wxcore/imports/Events_stub.o
> # this is caused by -odir out/wxcore/imports, which let the Events.o go to the right directory but not the stubs.
> WXCORE-STUBS-NOTDIR=$(call notdir, $(WXCORE-STUBS))
> WXCORE-STUB-OBJS=$(call make-objs, $(WXCORE-IMPORTSDIR), $(patsubst %,%_stub,$(WXCORE-STUBS-NOTDIR)))
529,530c535
< WXCORE-HCFLAGS	=$(HCFLAGS) -fvia-C -package-name $(WXCORE)
< 
---
> WXCORE-HCFLAGS	=$(HCFLAGS) -fvia-C -package-name $(WXCORE) -i$(WXCORE-SRCDIR) -odir $(WXCORE-IMPORTSDIR) -hidir $(WXCORE-IMPORTSDIR)