reverted Julians changes to the pragmas

[wxWidgets.git] / src / msw / makefile.mic

diff --git a/src/msw/makefile.mic b/src/msw/makefile.mic
index 7f93fb35ebab4d1f0fde023ed1a811249abdde9f..0f72f50256da3099c9595e5efd41048d2adeaecd 100644 (file)
--- a/src/msw/makefile.mic
+++ b/src/msw/makefile.mic
@@ -51,7 +51,7 @@ GENERICOBJS = \
                $(GENDIR)/panelg.$(OBJSUFF) \
                $(GENDIR)/progdlgg.$(OBJSUFF) \
                $(GENDIR)/sashwin.$(OBJSUFF) \
-               $(GENDIR)/scrolwin.$(OBJSUFF) \
+               $(GENDIR)/scrlwing.$(OBJSUFF) \
                $(GENDIR)/spinctlg.$(OBJSUFF) \
                $(GENDIR)/splash.$(OBJSUFF) \
                $(GENDIR)/splitter.$(OBJSUFF) \
@@ -127,6 +127,7 @@ COMMONOBJS  = \
                $(COMMDIR)/mimecmn.$(OBJSUFF) \
                $(COMMDIR)/module.$(OBJSUFF) \
                $(COMMDIR)/mstream.$(OBJSUFF) \
+               $(COMMDIR)/nbkbase.$(OBJSUFF) \
                $(COMMDIR)/object.$(OBJSUFF) \
                $(COMMDIR)/objstrm.$(OBJSUFF) \
                $(COMMDIR)/paper.$(OBJSUFF) \
@@ -327,6 +328,10 @@ cleanwx:
        -$(RM) ../common/*.bak
        -$(RM) ../generic/*.o
        -$(RM) ../generic/*.bak
+       -$(RM) ../univ/*.o
+       -$(RM) ../univ/*.bak
+       -$(RM) ../unix/*.o
+       -$(RM) ../unix/*.bak
        -$(RM) ../html/*.o
        -$(RM) ../zlib/*.o
        -$(RM) ../zlib/*.bak