From f95045003d48204bd14f3eec4d76d3d8603a5052 Mon Sep 17 00:00:00 2001 From: Rt39 Date: Wed, 10 Jul 2024 01:11:46 +0800 Subject: [PATCH] On WIN32, fix compile errors on non MSVC compilers --- src/libFLAC/CMakeLists.txt | 3 +++ src/share/getopt/getopt.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libFLAC/CMakeLists.txt b/src/libFLAC/CMakeLists.txt index 438399f6c0..c020f1fd04 100644 --- a/src/libFLAC/CMakeLists.txt +++ b/src/libFLAC/CMakeLists.txt @@ -21,6 +21,9 @@ if(FLAC__CPU_X86_64 OR FLAC__CPU_IA32) if(WITH_AVX AND MSVC) set_source_files_properties(fixed_intrin_avx2.c lpc_intrin_avx2.c stream_encoder_intrin_avx2.c lpc_intrin_fma.c PROPERTIES COMPILE_FLAGS /arch:AVX2) endif() + if(WITH_AVX AND WIN32 AND NOT MSVC) + set_source_files_properties(fixed_intrin_avx2.c lpc_intrin_avx2.c stream_encoder_intrin_avx2.c lpc_intrin_fma.c PROPERTIES COMPILE_FLAGS -mavx2) + endif() else() check_cpu_arch_arm64(FLAC__CPU_ARM64) if(FLAC__CPU_ARM64) diff --git a/src/share/getopt/getopt.c b/src/share/getopt/getopt.c index 509c91dd8f..4691d8f7a1 100644 --- a/src/share/getopt/getopt.c +++ b/src/share/getopt/getopt.c @@ -221,7 +221,7 @@ static char *posixly_correct; /* Avoid depending on library functions or files whose names are inconsistent. */ -#ifndef getenv +#if !defined(getenv) && !(defined(__clang__) && defined(_MSC_VER)) extern char *getenv (const char * name); #endif