diff --git a/Makefile.in b/Makefile.in index 48b60eeade..2ad58f1150 100644 --- a/Makefile.in +++ b/Makefile.in @@ -607,13 +607,14 @@ BASE_DIST: ALL_DIST cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@ cp $(WXDIR)/@RPM_FILES@ $(DISTDIR)/@RPM_FILES@ cp $(WXDIR)/@RPM_SPEC@ $(DISTDIR)/@RPM_SPEC@ - cp $(WXDIR)/wxBase.dsp $(DISTDIR) + cp $(WXDIR)/wxBase*.ds[pw] $(DISTDIR) cp $(DOCDIR)/base/install.txt $(DISTDIR)/INSTALL.txt cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt cp $(DOCDIR)/base/todo.txt $(DISTDIR)/TODO.txt cp $(SRCDIR)/*.in $(DISTDIR)/src - cp $(WXDIR)/src/common/unzip.h $(DISTDIR)/src/common/unzip.h + cp $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common + cp $(WXDIR)/src/common/unzip.h $(DISTDIR)/src/common list='$(HEADERS)'; for p in $$list; do \ cp $(WXDIR)/include/wx/$$p $(DISTDIR)/include/wx/$$p; \ done diff --git a/distrib/msw/tmake/vc6base.t b/distrib/msw/tmake/vc6base.t index a16aa3580f..5e74fbe9b2 100644 --- a/distrib/msw/tmake/vc6base.t +++ b/distrib/msw/tmake/vc6base.t @@ -125,21 +125,5 @@ SOURCE=.\src\msw\dummy.cpp #$ ExpandGlue("WXCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n"); #$ ExpandGlue("WXMSWCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n"); -# Begin Source File - -SOURCE=.\src\common\y_tab.c - -!IF "$(CFG)" == "wxBase - Win32 Release" - -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "wxBase - Win32 Debug" - -# ADD CPP /W1 -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File # End Target # End Project diff --git a/wxBase.dsp b/wxBase.dsp index 15c6cdbfbe..7748a83922 100644 --- a/wxBase.dsp +++ b/wxBase.dsp @@ -364,21 +364,5 @@ SOURCE=.\src\msw\gsockmsw.c # End Source File -# Begin Source File - -SOURCE=.\src\common\y_tab.c - -!IF "$(CFG)" == "wxBase - Win32 Release" - -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "wxBase - Win32 Debug" - -# ADD CPP /W1 -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File # End Target # End Project