From 5638e0916ac301c36c7eb4d499c18e464ed2d30d Mon Sep 17 00:00:00 2001 From: mrdudz Date: Fri, 18 Nov 2022 17:39:35 +0100 Subject: [PATCH] =?UTF-8?q?sp=C3=BCl=20es=20noch=20einmal,=20Sam?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/snapshot-on-push-master.yml | 4 ++-- src/cc65/codegen.c | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/snapshot-on-push-master.yml b/.github/workflows/snapshot-on-push-master.yml index 674a2cddf..fcefa10d8 100644 --- a/.github/workflows/snapshot-on-push-master.yml +++ b/.github/workflows/snapshot-on-push-master.yml @@ -75,13 +75,13 @@ jobs: - name: Build and package 64-bit Windows versions of the tools. run: | make -C src clean - make -j2 bin USER_CFLAGS="-D__USE_MINGW_ANSI_STDIO=1 -Werror" CROSS_COMPILE=x86_64-w64-mingw32- + make -j2 bin USER_CFLAGS=-Werror CROSS_COMPILE=x86_64-w64-mingw32- make zip mv cc65.zip cc65-snapshot-win64.zip - name: Build and package 32-bit Windows versions of the tools. run: | make -C src clean - make -j2 bin USER_CFLAGS="-D__USE_MINGW_ANSI_STDIO=1 -Werror" CROSS_COMPILE=i686-w64-mingw32- + make -j2 bin USER_CFLAGS=-Werror CROSS_COMPILE=i686-w64-mingw32- make zip mv cc65.zip cc65-snapshot-win32.zip diff --git a/src/cc65/codegen.c b/src/cc65/codegen.c index c9e71de64..b149b7dda 100644 --- a/src/cc65/codegen.c +++ b/src/cc65/codegen.c @@ -65,7 +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 */ +#defined(__MINGW64__) +#undef PRIXPTR +#define PRIXPTR "%p" +#endif /*****************************************************************************/ /* Helpers */