|
6159
|
1 This file is part of MXE. See LICENSE.md for licensing information. |
|
|
2 |
|
|
3 Contains ad hoc patches for cross building. |
|
|
4 |
|
|
5 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
|
|
6 From: Tony Theodore <tonyt@logyst.com> |
|
|
7 Date: Sun, 25 Apr 2021 19:23:19 +1000 |
|
|
8 Subject: [PATCH 1/2] fix windres whitespace handling |
|
|
9 |
|
|
10 |
|
|
11 diff --git a/ffbuild/common.mak b/ffbuild/common.mak |
|
|
12 index 1111111..2222222 100644 |
|
|
13 --- a/ffbuild/common.mak |
|
|
14 +++ b/ffbuild/common.mak |
|
|
15 @@ -82,7 +82,7 @@ COMPILE_NVCC = $(call COMPILE,NVCC) |
|
|
16 -$(if $(ASMSTRIPFLAGS), $(STRIP) $(ASMSTRIPFLAGS) $@) |
|
|
17 |
|
|
18 %.o: %.rc |
|
|
19 - $(WINDRES) $(IFLAGS) --preprocessor "$(DEPWINDRES) -E -xc-header -DRC_INVOKED $(CC_DEPFLAGS)" -o $@ $< |
|
|
20 + $(WINDRES) $(IFLAGS) --preprocessor "$(DEPWINDRES)" $(addprefix --preprocessor-arg ,-E -xc-header -DRC_INVOKED $(CC_DEPFLAGS)) -o $@ $< |
|
|
21 |
|
|
22 %.i: %.c |
|
|
23 $(CC) $(CCFLAGS) $(CC_E) $< |
|
|
24 |
|
|
25 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
|
|
26 From: Mark Brand <mabrand@mabrand.nl> |
|
|
27 Date: Mon, 4 Apr 2022 00:33:50 +0200 |
|
|
28 Subject: [PATCH 2/2] avoid warning: cast from pointer to integer of different |
|
|
29 size [-Wpointer-to-int-cast] |
|
|
30 |
|
|
31 when checking opus |
|
|
32 |
|
|
33 diff --git a/configure b/configure |
|
|
34 index 1111111..2222222 100755 |
|
|
35 --- a/configure |
|
|
36 +++ b/configure |
|
|
37 @@ -1336,7 +1336,7 @@ check_func_headers(){ |
|
|
38 done |
|
|
39 echo "#include <stdint.h>" |
|
|
40 for func in $funcs; do |
|
|
41 - echo "long check_$func(void) { return (long) $func; }" |
|
|
42 + echo "intptr_t check_$func(void) { return (intptr_t) $func; }" |
|
|
43 done |
|
|
44 echo "int main(void) { int ret = 0;" |
|
|
45 # LTO could optimize out the test functions without this |
