Mercurial > hg > index.cgi
changeset 468:7577bfee48bb
Merge changeset a6c9129e5948 from lwasm5 development branch
| author | William Astle <lost@l-w.ca> |
|---|---|
| date | Thu, 01 Mar 2018 21:31:50 -0700 |
| parents | 51bed8c8dc53 (current diff) a6c9129e5948 (diff) |
| children | 9393a6b8886c |
| files | lwlib/lw_version.h |
| diffstat | 6 files changed, 33 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Wed Feb 28 23:35:12 2018 -0700 +++ b/Makefile Thu Mar 01 21:31:50 2018 -0700 @@ -27,7 +27,7 @@ RANLIB := $(BUILDTPREFIX)$(RANLIB) endif -CPPFLAGS += -I lwlib +CPPFLAGS += -I lwlib -Icommon LDFLAGS += -Llwlib -llw CFLAGS ?= -O3 -Wall -Wno-char-subscripts
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/version.h Thu Mar 01 21:31:50 2018 -0700 @@ -0,0 +1,27 @@ +/* +lw_version.h + +Copyright © 2018 William Astle + +This file is part of LWTOOLS. + +LWTOOLS is free software: you can redistribute it and/or modify it under the +terms of the GNU General Public License as published by the Free Software +Foundation, either version 3 of the License, or (at your option) any later +version. + +This program is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +more details. + +You should have received a copy of the GNU General Public License along with +this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef lw_version_h_seen___ +#define lw_version_h_seen___ + +#define PACKAGE_STRING "lwtools 5.0beta" + +#endif /* lw_version_h_seen___ */
--- a/lwar/main.c Wed Feb 28 23:35:12 2018 -0700 +++ b/lwar/main.c Thu Mar 01 21:31:50 2018 -0700 @@ -29,7 +29,7 @@ #include <sys/stat.h> #include <lw_cmdline.h> -#include <lw_version.h> +#include <version.h> #include "lwar.h"
--- a/lwasm/lwasm.h Wed Feb 28 23:35:12 2018 -0700 +++ b/lwasm/lwasm.h Thu Mar 01 21:31:50 2018 -0700 @@ -29,7 +29,8 @@ #include <lw_expr.h> #include <lw_stringlist.h> #include <lw_stack.h> -#include <lw_version.h> + +#include <version.h> // these are allowed chars BELOW 0x80 for symbols // first is symbol start chars, second is anywhere in symbol
--- a/lwlib/lw_version.h Wed Feb 28 23:35:12 2018 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -/* -lw_version.h - -Copyright © 2015 William Astle - -This file is part of LWTOOLS. - -LWTOOLS is free software: you can redistribute it and/or modify it under the -terms of the GNU General Public License as published by the Free Software -Foundation, either version 3 of the License, or (at your option) any later -version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef ___lw_version_h_seen___ -#define ___lw_version_h_seen___ - -#define PACKAGE_STRING "lwtools 4.15+" - -#endif /* ___lw_version_h_seen___ */