diff --git a/contrib/utils/convertrc/makefile.wat b/contrib/utils/convertrc/makefile.wat index d27085308e..3e4a1cf5d3 100644 --- a/contrib/utils/convertrc/makefile.wat +++ b/contrib/utils/convertrc/makefile.wat @@ -4,10 +4,16 @@ # WXDIR = $(%WXWIN) +EXTRACPPFLAGS = -I$(WXDIR)\contrib\include +THISDIR = $(WXDIR)\contrib\utils\convertrc PROGRAM = wxconvert -EXTRALIBS = $(WXDIR)\lib\wxxrc.lib -OBJECTS=convert.obj rc2xml.obj rc2wxr.obj wxr2xml.obj +EXTRALIBS = $(WXDIR)\lib\wxxrc_w.lib +OBJECTS=& + $(OUTPUTDIR)\convert.obj & + $(OUTPUTDIR)\rc2xml.obj & + $(OUTPUTDIR)\rc2wxr.obj & + $(OUTPUTDIR)\wxr2xml.obj !include $(WXDIR)\src\makeprog.wat diff --git a/contrib/utils/wxrc/makefile.wat b/contrib/utils/wxrc/makefile.wat index 4a5d318872..ac1ff9c3fa 100644 --- a/contrib/utils/wxrc/makefile.wat +++ b/contrib/utils/wxrc/makefile.wat @@ -4,10 +4,12 @@ # WXDIR = $(%WXWIN) +EXTRACPPFLAGS = -I$(WXDIR)\contrib\include +THISDIR = $(WXDIR)\contrib\utils\wxrc PROGRAM = wxrc -EXTRALIBS = $(WXDIR)\lib\wxxrc.lib -OBJECTS = $(PROGRAM).obj +EXTRALIBS = $(WXDIR)\lib\wxxrc_w.lib +OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj !include $(WXDIR)\src\makeprog.wat diff --git a/contrib/utils/wxrcedit/makefile.wat b/contrib/utils/wxrcedit/makefile.wat index 00a62ff36b..40d5f88bf9 100644 --- a/contrib/utils/wxrcedit/makefile.wat +++ b/contrib/utils/wxrcedit/makefile.wat @@ -4,10 +4,22 @@ # WXDIR = $(%WXWIN) +EXTRACPPFLAGS = -I$(WXDIR)\contrib\include +THISDIR = $(WXDIR)\contrib\utils\wxrcedit PROGRAM = wxrcedit -EXTRALIBS = $(WXDIR)\lib\wxxrc.lib -OBJECTS=edapp.obj editor.obj nodehnd.obj xmlhelpr.obj preview.obj nodesdb.obj pe_basic.obj pe_adv.obj propedit.obj propframe.obj splittree.obj +EXTRALIBS = $(WXDIR)\lib\wxxrc_w.lib +OBJECTS=$(OUTPUTDIR)\edapp.obj & + $(OUTPUTDIR)\editor.obj & + $(OUTPUTDIR)\nodehnd.obj & + $(OUTPUTDIR)\xmlhelpr.obj & + $(OUTPUTDIR)\preview.obj & + $(OUTPUTDIR)\nodesdb.obj & + $(OUTPUTDIR)\pe_basic.obj & + $(OUTPUTDIR)\pe_adv.obj & + $(OUTPUTDIR)\propedit.obj & + $(OUTPUTDIR)\propframe.obj & + $(OUTPUTDIR)\splittree.obj !include $(WXDIR)\src\makeprog.wat diff --git a/utils/wxrc/makefile.wat b/utils/wxrc/makefile.wat index 4a5d318872..ac1ff9c3fa 100644 --- a/utils/wxrc/makefile.wat +++ b/utils/wxrc/makefile.wat @@ -4,10 +4,12 @@ # WXDIR = $(%WXWIN) +EXTRACPPFLAGS = -I$(WXDIR)\contrib\include +THISDIR = $(WXDIR)\contrib\utils\wxrc PROGRAM = wxrc -EXTRALIBS = $(WXDIR)\lib\wxxrc.lib -OBJECTS = $(PROGRAM).obj +EXTRALIBS = $(WXDIR)\lib\wxxrc_w.lib +OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj !include $(WXDIR)\src\makeprog.wat