Mercurial > dwindows
changeset 2881:ac404083dc6b
Rename the Version file Version.mk since it is included by the Makefiles.
The C++ headers attempt to include <version> and it picks up that file.
| author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
|---|---|
| date | Thu, 22 Dec 2022 13:57:38 +0000 |
| parents | 2ba0959eb3cf |
| children | 99311a9091af |
| files | Makefile.in Version Version.mk makefile.emx makefile.vc |
| diffstat | 5 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Tue Dec 20 20:23:02 2022 +0000 +++ b/Makefile.in Thu Dec 22 13:57:38 2022 +0000 @@ -4,7 +4,7 @@ CXX = @CXX@ PLATCCFLAGS = @PLATCCFLAGS@ MLFLAGS = -L. -include $(srcdir)/Version +include $(srcdir)/Version.mk CCFLAGS = @CFLAGS@ $(PLATCCFLAGS) @ARCH@ -D@DW_DEFINE@ -DBUILD_DLL -DDW_RESOURCES -DVER_REV=$(VER_REV) CXXFLAGS= -std=c++11 LFLAGS = @LIBS@ @ARCH@ @@ -209,7 +209,7 @@ zip: zip dwindows$(VER_MAJ)$(VER_MIN).zip $(srcdir)/*.txt $(srcdir)/makefile.* $(srcdir)/*.c $(srcdir)/dw.h $(srcdir)/dwcompat.h \ - $(srcdir)/install.sh $(srcdir)/*.in $(srcdir)/configure $(srcdir)/Version \ + $(srcdir)/install.sh $(srcdir)/*.in $(srcdir)/configure $(srcdir)/Version.mk \ $(srcdir)/ac*.m4 $(srcdir)/dwindows-config.1 $(srcdir)/config.sub $(srcdir)/config.guess $(srcdir)/image/test.* \ $(srcdir)/win/*.c $(srcdir)/win/*.cpp $(srcdir)/win/*.h $(srcdir)/win/*.ico $(srcdir)/win/*.txt $(srcdir)/win/*.def $(srcdir)/win/*.rc $(srcdir)/win/*.manifest \ $(srcdir)/os2/*.c $(srcdir)/os2/*.ico $(srcdir)/os2/*.txt $(srcdir)/os2/*.def \ @@ -221,7 +221,7 @@ dist: (cd $(srcdir)/..;ln -sf dwindows $(SRCDIR)) (cd $(srcdir)/..;tar -cvf - $(SRCDIR)/*.txt $(SRCDIR)/makefile.* $(SRCDIR)/*.c $(SRCDIR)/dw.h $(SRCDIR)/dwcompat.h \ - $(SRCDIR)/install.sh $(SRCDIR)/*.in $(SRCDIR)/configure $(SRCDIR)/Version \ + $(SRCDIR)/install.sh $(SRCDIR)/*.in $(SRCDIR)/configure $(SRCDIR)/Version.mk \ $(SRCDIR)/ac*.m4 $(SRCDIR)/dwindows-config.1 $(SRCDIR)/config.sub $(SRCDIR)/config.guess $(SRCDIR)/image/test.* \ $(SRCDIR)/win/*.c $(SRCDIR)/win/*.cpp $(SRCDIR)/win/*.h $(SRCDIR)/win/*.txt $(SRCDIR)/win/*.def $(SRCDIR)/win/*.ico $(SRCDIR)/win/*.rc $(SRCDIR)/win/*.manifest \ $(SRCDIR)/os2/*.c $(SRCDIR)/os2/*.ico $(SRCDIR)/os2/*.txt $(SRCDIR)/os2/*.def \
--- a/Version Tue Dec 20 20:23:02 2022 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -# Set these here to change the version for all platforms -DW_MAJOR_VERSION=3 -DW_MINOR_VERSION=3
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Version.mk Thu Dec 22 13:57:38 2022 +0000 @@ -0,0 +1,3 @@ +# Set these here to change the version for all platforms +DW_MAJOR_VERSION=3 +DW_MINOR_VERSION=3
--- a/makefile.emx Tue Dec 20 20:23:02 2022 +0000 +++ b/makefile.emx Thu Dec 22 13:57:38 2022 +0000 @@ -7,7 +7,7 @@ RC = rc MAKE = make COMPRESS = lxlite -include Version +include Version.mk VER = $(DW_MAJOR_VERSION)$(DW_MINOR_VERSION) VERDOT = $(DW_MAJOR_VERSION).$(DW_MINOR_VERSION) AVERREV := $(shell os2\svnrev.cmd)
--- a/makefile.vc Tue Dec 20 20:23:02 2022 +0000 +++ b/makefile.vc Thu Dec 22 13:57:38 2022 +0000 @@ -1,7 +1,7 @@ # # Visual C Makefile for Dynamic Windows # -!include Version +!include Version.mk VER = $(DW_MAJOR_VERSION)$(DW_MINOR_VERSION) VERDOT = $(DW_MAJOR_VERSION).$(DW_MINOR_VERSION) VERREV = 0