From 105742b3ffda9b7f085b26c36681a0b331871a42 Mon Sep 17 00:00:00 2001 From: Sergey Zhemoytel Date: Sat, 13 Jul 2024 14:21:49 +0000 Subject: [PATCH] 1.1.1 --- fheroes2.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fheroes2.spec b/fheroes2.spec index 2439ea4..a5ee729 100644 --- a/fheroes2.spec +++ b/fheroes2.spec @@ -49,10 +49,10 @@ into your /usr/share/games/fheroes2/{maps,data} directories respectively. %setup -q %build -export CC=%{_llvmdir}/bin/clang -export CXX=%{_llvmdir}/bin/clang++ -export AR=%{_llvmdir}/bin/llvm-ar -export NM=%{_llvmdir}/bin/llvm-nm +#export CC=%{_llvmdir}/bin/clang +#export CXX=%{_llvmdir}/bin/clang++ +#export AR=%{_llvmdir}/bin/llvm-ar +#export NM=%{_llvmdir}/bin/llvm-nm export LLD=%{_llvmdir}/bin/lld export READELF=readelf @@ -71,8 +71,8 @@ export CXXFLAGS="$CFLAGS" -DUSE_SDL_VERSION=SDL2 \ -DENABLE_IMAGE=ON \ -DGET_HOMM2_DEMO=ON \ - -DCMAKE_C_COMPILER=clang \ - -DCMAKE_CXX_COMPILER=clang++ \ + -DCMAKE_C_COMPILER=%{_llvmdir}/bin/clang \ + -DCMAKE_CXX_COMPILER=%{_llvmdir}/bin/clang++ \ -DCMAKE_CXX_FLAGS="-std=c++17" \ -DCMAKE_CXX_FLAGS="-nostdinc++ -I/usr/include/libstdc++-gcc10 -I/usr/include/libstdc++-gcc10/%{_host} -Wc++11-narrowing " \ -DCMAKE_C_FLAGS="-nostdinc++ -I/usr/include/libstdc++-gcc10 -I/usr/include/libstdc++-gcc10/%{_host} -Wc++11-narrowing " \