From a6592b3f0c96fc63d6e53400527ed9b09e49414c Mon Sep 17 00:00:00 2001
From: "aleksandr.vodyanov" <aleksandr.vodyanov@avroid.team>
Date: Wed, 12 Mar 2025 16:50:30 +0300
Subject: [PATCH] [DO-1345] fixed profiles for windows (!6)

Reviewed-on: https://git.avroid.tech/Conan/conan_config/pulls/6
Co-authored-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.team>
Co-committed-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.team>
---
 profiles/.windows_x86_64_gcc12_debug.un~        | Bin 0 -> 541 bytes
 profiles/options/windows_options                |   5 +++--
 profiles/windows_x86_64_gcc11~                  |  16 ++++++++++++++++
 ...indows_x86_64_gcc11 => windows_x86_64_gcc12} |   4 +++-
 profiles/windows_x86_64_gcc12_debug             |  13 +++++++++++++
 profiles/windows_x86_64_gcc12_debug~            |  12 ++++++++++++
 6 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 profiles/.windows_x86_64_gcc12_debug.un~
 create mode 100644 profiles/windows_x86_64_gcc11~
 rename profiles/{windows_x86_64_gcc11 => windows_x86_64_gcc12} (71%)
 create mode 100644 profiles/windows_x86_64_gcc12_debug
 create mode 100644 profiles/windows_x86_64_gcc12_debug~

diff --git a/profiles/.windows_x86_64_gcc12_debug.un~ b/profiles/.windows_x86_64_gcc12_debug.un~
new file mode 100644
index 0000000000000000000000000000000000000000..d0ffb1be74bcfe6c7cefad1ccf7c11ab32361326
GIT binary patch
literal 541
zcmWH`%$*;a=aT=Ffhl6+x59O|o;H*|Fsrr{Z2ZFc;%b$ZtlRlH#{U~jSGcJ%Ffi}}
zF$lnDMj#u6K>)@E^V1JbHDG~=#9x5OqmUpe9+=2~Ab=YK6C9<f7y`iP(1%9HR|%lG
S@Sq2>!SRJ5%3#{~d=&s5w<3iA

literal 0
HcmV?d00001

diff --git a/profiles/options/windows_options b/profiles/options/windows_options
index f6940b1..9d13d0a 100644
--- a/profiles/options/windows_options
+++ b/profiles/options/windows_options
@@ -1,10 +1,10 @@
 include(base_options.jinja)
 [options]
 ffmpeg/*:with_programs=False
+ffmpeg/*:with_libvpx=False
 jbig/*:build_executables=False
 libtiff/*:jpeg=libjpeg-turbo
 libyuv/*:with_jpeg=libjpeg-turbo
-qt/*:cross_compile="x86_64-w64-mingw32.shared-"
 qt/*:opengl=desktop
 qt/*:shared=True
 qt/*:with_harfbuzz=True
@@ -21,6 +21,7 @@ qt/*:qtlottie=True
 qt/*:qtmultimedia=True
 qt/*:qtqa=True
 qt/*:qtquickcontrols=True
+qt/*:qtactiveqt=True
 qt/*:qtquickcontrols2=True
 qt/*:qtquicktimeline=True
 qt/*:qtquick3d=True
@@ -39,4 +40,4 @@ qt/*:qtsensors=True
 qt/*:qtspeech=True
 qt/*:qtnetworkauth=True
 qt/*:qtwinextras=True
-qt/*:qtmacextras=False
+t/*:qtmacextras=False
diff --git a/profiles/windows_x86_64_gcc11~ b/profiles/windows_x86_64_gcc11~
new file mode 100644
index 0000000..3bd80b0
--- /dev/null
+++ b/profiles/windows_x86_64_gcc11~
@@ -0,0 +1,16 @@
+include(base_profiles/windows_base)
+include(options/windows_options)
+
+[settings]
+os=Windows
+arch=x86_64
+compiler=gcc
+compiler.version=12
+compiler.libcxx=libstdc++11
+compiler.threads=posix
+compiler.exception=seh
+compiler.cppstd=17
+
+[buildenv]
+#CC=C:/msys64/mingw64/bin
+#CXX=C:/
diff --git a/profiles/windows_x86_64_gcc11 b/profiles/windows_x86_64_gcc12
similarity index 71%
rename from profiles/windows_x86_64_gcc11
rename to profiles/windows_x86_64_gcc12
index a4896ea..56f5b40 100644
--- a/profiles/windows_x86_64_gcc11
+++ b/profiles/windows_x86_64_gcc12
@@ -5,6 +5,8 @@ include(options/windows_options)
 os=Windows
 arch=x86_64
 compiler=gcc
-compiler.version=11.5
+compiler.version=12
 compiler.libcxx=libstdc++11
+compiler.threads=posix
+compiler.exception=seh
 compiler.cppstd=17
diff --git a/profiles/windows_x86_64_gcc12_debug b/profiles/windows_x86_64_gcc12_debug
new file mode 100644
index 0000000..41ed57a
--- /dev/null
+++ b/profiles/windows_x86_64_gcc12_debug
@@ -0,0 +1,13 @@
+include(base_profiles/windows_base)
+include(options/windows_options)
+
+[settings]
+os=Windows
+arch=x86_64
+compiler=gcc
+compiler.version=12
+compiler.libcxx=libstdc++11
+compiler.threads=posix
+compiler.exception=seh
+compiler.cppstd=17
+build_type=Debug
diff --git a/profiles/windows_x86_64_gcc12_debug~ b/profiles/windows_x86_64_gcc12_debug~
new file mode 100644
index 0000000..56f5b40
--- /dev/null
+++ b/profiles/windows_x86_64_gcc12_debug~
@@ -0,0 +1,12 @@
+include(base_profiles/windows_base)
+include(options/windows_options)
+
+[settings]
+os=Windows
+arch=x86_64
+compiler=gcc
+compiler.version=12
+compiler.libcxx=libstdc++11
+compiler.threads=posix
+compiler.exception=seh
+compiler.cppstd=17