X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3d4c6a214ac5b00dbf5e314e369471135db81c0d..cc79e53c16604eabc54354d73215197ad168d99a:/src/msw/makefile.nt?ds=sidebyside diff --git a/src/msw/makefile.nt b/src/msw/makefile.nt index e4a1cdba0e..fc72bd0aba 100644 --- a/src/msw/makefile.nt +++ b/src/msw/makefile.nt @@ -2,7 +2,7 @@ # File: makefile.nt # Author: Julian Smart # Created: 1997 -# Updated: +# Updated: # Copyright: (c) 1997, Julian Smart # # "%W% %G%" @@ -71,6 +71,8 @@ GENERICOBJS= \ $(GENDIR)\tabg.obj \ $(GENDIR)\textdlgg.obj +# $(COMMDIR)\fileconf.obj \ + COMMONOBJS = \ $(COMMDIR)\cmndata.obj \ $(COMMDIR)\config.obj \ @@ -78,7 +80,6 @@ COMMONOBJS = \ $(COMMDIR)\dynarray.obj \ $(COMMDIR)\event.obj \ $(COMMDIR)\file.obj \ - $(COMMDIR)\fileconf.obj \ $(COMMDIR)\filefn.obj \ $(COMMDIR)\gdicmn.obj \ $(COMMDIR)\intl.obj \ @@ -107,16 +108,13 @@ COMMONOBJS = \ $(COMMDIR)\time.obj \ $(COMMDIR)\wxexpr.obj \ $(COMMDIR)\y_tab.obj \ - $(COMMDIR)\stream.obj \ + $(COMMDIR)\extended.obj \ + $(COMMDIR)\process.obj \ $(COMMDIR)\fstream.obj \ $(COMMDIR)\mstream.obj \ - $(COMMDIR)\datstrm.obj \ - $(COMMDIR)\extended.obj \ - $(COMMDIR)\process.obj - -# $(COMMDIR)\wxstrgnu\wxstrgnu.obj \ -# $(COMMDIR)\wxstrgnu\wxregex.obj \ -# $(COMMDIR)\matrix.obj \ + $(COMMDIR)\zstream.obj \ + $(COMMDIR)\stream.obj \ + $(COMMDIR)\datstrm.obj MSWOBJS = \ $(MSWDIR)\app.obj \ @@ -178,6 +176,7 @@ MSWOBJS = \ $(MSWDIR)\radiobut.obj \ $(MSWDIR)\region.obj \ $(MSWDIR)\registry.obj \ + $(MSWDIR)\regconf.obj \ $(MSWDIR)\scrolbar.obj \ $(MSWDIR)\settings.obj \ $(MSWDIR)\slidrmsw.obj \ @@ -564,6 +563,11 @@ $(MSWDIR)/registry.obj: $*.$(SRCSUFF) $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@ << +$(MSWDIR)/regconf.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@ +<< + $(MSWDIR)/scrolbar.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@ @@ -892,6 +896,26 @@ $(COMMDIR)/time.obj: $*.$(SRCSUFF) $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@ << +$(COMMDIR)\stream.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@ +<< + +$(COMMDIR)\fstream.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@ +<< + +$(COMMDIR)\mstream.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@ +<< + +$(COMMDIR)\zstream.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@ +<< + $(COMMDIR)\datstrm.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@