X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab8247f4b9bfdc56b549020cf10d3fe1d7bcfbcd..de4d7713bc86b4cd8444fd48ea882a67273f1d03:/src/msw/makefile.b32 diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index fdf3da93d0..76d1febd5c 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -132,6 +132,7 @@ COMMONOBJS = \ $(MSWDIR)\date.obj \ $(MSWDIR)\hash.obj \ $(MSWDIR)\list.obj \ + $(MSWDIR)\paper.obj \ $(MSWDIR)\string.obj \ $(MSWDIR)\time.obj \ $(MSWDIR)\wxexpr.obj \ @@ -264,16 +265,16 @@ all: all_libs all_execs !if "$(DLL)" == "0" $(LIBTARGET): $(DUMMY).obj $(OBJECTS) - erase $(LIBTARGET) + -erase $(LIBTARGET) tlib $(LIBTARGET) /P512 @&&! --+$(OBJECTS:.obj =.obj -+) -+$(PERIPH_LIBS:.lib =.lib -+) ++$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +) ! !else $(LIBTARGET): $(DUMMY).obj $(OBJECTS) - erase $(LIBTARGET) - erase $(WXLIBDIR)\wx.dll + -erase $(LIBTARGET) + -erase $(WXLIBDIR)\wx.dll tlink32 $(LINK_FLAGS) /v @&&! c0d32.obj $(OBJECTS) $(WXLIBDIR)\wx @@ -551,6 +552,8 @@ $(MSWDIR)\hash.obj: $(COMMDIR)\hash.$(SRCSUFF) $(MSWDIR)\list.obj: $(COMMDIR)\list.$(SRCSUFF) +$(MSWDIR)\paper.obj: $(COMMDIR)\paper.$(SRCSUFF) + $(MSWDIR)\string.obj: $(COMMDIR)\string.$(SRCSUFF) $(MSWDIR)\variant.obj: $(COMMDIR)\variant.$(SRCSUFF) @@ -713,13 +716,13 @@ $(WIN95FLAG) # -Oxt clean: $(PERIPH_CLEAN_TARGET) - erase $(LIBTARGET) - erase *.obj - erase *.pch - erase *.csm - erase *.cfg - erase ..\common\y_tab.c - erase ..\common\lex_yy.c + -erase $(LIBTARGET) + -erase *.obj + -erase *.pch + -erase *.csm + -erase *.cfg + -erase ..\common\y_tab.c + -erase ..\common\lex_yy.c cleanall: clean