From b166dc4261fee8dd7dab7be743dcaca6948831f4 Mon Sep 17 00:00:00 2001 From: mrdudz Date: Fri, 18 Nov 2022 18:19:31 +0100 Subject: [PATCH] hopefully thats it --- .github/workflows/snapshot-on-push-master.yml | 46 +++++++++---------- src/cc65/codegen.c | 8 +++- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/.github/workflows/snapshot-on-push-master.yml b/.github/workflows/snapshot-on-push-master.yml index 717ad348b..769d778d5 100644 --- a/.github/workflows/snapshot-on-push-master.yml +++ b/.github/workflows/snapshot-on-push-master.yml @@ -49,29 +49,29 @@ jobs: - name: Do some simple style checks shell: bash run: make -j2 checkstyle -# - name: Build the tools. -# shell: bash -# run: | -# make -j2 bin USER_CFLAGS=-Werror -# make -j2 util -# - name: Build the platform libraries. -# shell: bash -# run: make -j2 lib QUIET=1 -# - name: Run the regression tests. -# shell: bash -# run: make test QUIET=1 -# - name: Test that the samples can be built. -# shell: bash -# run: make -j2 samples -# - name: Remove the output from the samples tests. -# shell: bash -# run: make -C samples clean -# - name: Remove programs in util directory -# shell: bash -# run: make -C util clean -# - name: Build the document files. -# shell: bash -# run: make -j2 doc + - name: Build the tools. + shell: bash + run: | + make -j2 bin USER_CFLAGS=-Werror + make -j2 util + - name: Build the platform libraries. + shell: bash + run: make -j2 lib QUIET=1 + - name: Run the regression tests. + shell: bash + run: make test QUIET=1 + - name: Test that the samples can be built. + shell: bash + run: make -j2 samples + - name: Remove the output from the samples tests. + shell: bash + run: make -C samples clean + - name: Remove programs in util directory + shell: bash + run: make -C util clean + - name: Build the document files. + shell: bash + run: make -j2 doc - name: Build and package 64-bit Windows versions of the tools. run: | make -C src clean diff --git a/src/cc65/codegen.c b/src/cc65/codegen.c index ad3a4d99b..251c973ee 100644 --- a/src/cc65/codegen.c +++ b/src/cc65/codegen.c @@ -65,8 +65,12 @@ #include "util.h" #include "codegen.h" -/* this is a terrible hack that tries to combat the ever reoccuring issue with - mingw and PRIXPTR */ +/* This is a terrible hack that tries to combat the ever reoccuring issue with + Mingw and PRIXPTR - the macro should have been defined like this for us in + the first place. + NOTE: "I64u" works in the github actions now, so if your local mingw64 fails, + you probably have to update. +*/ #if defined(__MINGW64__) #undef PRIXPTR #define PRIXPTR "I64u"