Tweaking include order to avoid b0, b1, etc. macro clash, bump version.

This commit is contained in:
Brad Nelson
2023-01-14 23:14:01 -08:00
parent 75d9185027
commit d78953151a
6 changed files with 5 additions and 5 deletions

View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
VERSION=7.0.7.7 VERSION=7.0.7.8
STABLE_VERSION=7.0.6.19 STABLE_VERSION=7.0.6.19
OLD_STABLE_VERSION=7.0.5.4 OLD_STABLE_VERSION=7.0.5.4
REVISION=$(shell git rev-parse HEAD | head -c 20) REVISION=$(shell git rev-parse HEAD | head -c 20)

View File

@ -18,6 +18,7 @@ static char filename2[PATH_MAX];
{{bits}} {{bits}}
{{core}} {{core}}
{{faults}} {{faults}}
{{calling}}
{{interp}} {{interp}}
{{boot}} {{boot}}

View File

@ -18,7 +18,6 @@
#include "common/tier2_opcodes.h" #include "common/tier2_opcodes.h"
#include "common/floats.h" #include "common/floats.h"
#include "common/calls.h" #include "common/calls.h"
#include "common/calling.h"
#define SIM_HEAP_SIZE (100 * 1024 + 1024 * 1024) #define SIM_HEAP_SIZE (100 * 1024 + 1024 * 1024)
@ -47,6 +46,7 @@ PLATFORM_SIMULATED_OPCODE_LIST
#include "common/bits.h" #include "common/bits.h"
#include "common/core.h" #include "common/core.h"
#include "common/calling.h"
#include "common/interp.h" #include "common/interp.h"
#include "gen/esp32_boot.h" #include "gen/esp32_boot.h"
#include "esp32/main.cpp" #include "esp32/main.cpp"

View File

@ -25,7 +25,6 @@
{{tier2_opcodes}} {{tier2_opcodes}}
{{floats}} {{floats}}
{{calls}} {{calls}}
{{calling}}
{{builtins.h}} {{builtins.h}}
{{builtins.cpp}} {{builtins.cpp}}
{{main.cpp}} {{main.cpp}}

View File

@ -19,7 +19,6 @@
#include "common/tier1_opcodes.h" #include "common/tier1_opcodes.h"
#include "common/tier2_opcodes.h" #include "common/tier2_opcodes.h"
#include "common/floats.h" #include "common/floats.h"
#include "common/calling.h"
#include "common/calls.h" #include "common/calls.h"
#define HEAP_SIZE (10 * 1024 * 1024) #define HEAP_SIZE (10 * 1024 * 1024)
@ -35,6 +34,7 @@
#include "common/bits.h" #include "common/bits.h"
#include "common/core.h" #include "common/core.h"
#include "posix/faults.h" #include "posix/faults.h"
#include "common/calling.h"
#include "common/interp.h" #include "common/interp.h"
#include "gen/posix_boot.h" #include "gen/posix_boot.h"

View File

@ -31,7 +31,6 @@
#include "common/tier1_opcodes.h" #include "common/tier1_opcodes.h"
#include "common/tier2_opcodes.h" #include "common/tier2_opcodes.h"
#include "common/floats.h" #include "common/floats.h"
#include "common/calling.h"
#include "common/calls.h" #include "common/calls.h"
#define HEAP_SIZE (10 * 1024 * 1024) #define HEAP_SIZE (10 * 1024 * 1024)
@ -53,6 +52,7 @@ static void SetupCtrlBreakHandler(void);
#include "common/bits.h" #include "common/bits.h"
#include "common/core.h" #include "common/core.h"
#include "common/calling.h"
#include "windows/interp.h" #include "windows/interp.h"
#include "gen/windows_boot.h" #include "gen/windows_boot.h"