blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

Move Windows dep build from MinGW/GCC to msys/MSVC #105502

Merged
Ray molenkamp merged 27 commits from Anthony-Roberts/blender:move-to-msys2 into main 2023-06-10 23:05:55 +02:00
Conversation 16 Commits 27 Files Changed 39 +1064 -552

27 Commits

Author SHA1 Message Date
Ray molenkamp c66713e971 Merge branch 'main' into move-to-msys2 2023-06-10 22:49:44 +02:00
Anthony Roberts 9a4cf2003c Merge branch 'main' into move-to-msys2 2023-06-08 10:21:45 +02:00
Anthony Roberts 3e2278e40e Address review comments related to ffmpeg 2023-06-08 09:19:19 +01:00
Anthony Roberts 60adbaaab5 Merge branch 'main' into move-to-msys2 2023-06-06 17:46:04 +02:00
Anthony Roberts 431e1c9b0a Limit xvid removal to just xvidcore 2023-06-02 09:22:20 +01:00
Anthony Roberts 0494bdf9e1 Revert "Purge XVID references" 
This reverts commit 1cbc7cdd64.
 2023-06-02 09:14:44 +01:00
Anthony Roberts b31e931a54 Fix ffmpeg path issues (again) 2023-06-01 11:13:43 +01:00
Anthony Roberts b8e6de1108 Merge branch 'main' into move-to-msys2 2023-06-01 11:51:38 +02:00
Anthony Roberts 1cbc7cdd64 Purge XVID references 2023-06-01 10:48:41 +01:00
Anthony Roberts 187e926287 Update fftw lib name 2023-06-01 10:22:18 +01:00
Anthony Roberts 14055a4aa0 Merge remote-tracking branch 'origin/main' into move-to-msys2-proper-main 2023-06-01 10:09:11 +01:00
Anthony Roberts 46121381c5 Remove xvidcore for all platforms 2023-04-27 10:58:22 +01:00
Anthony Roberts 19b867f5ff Fix accidental inclusion of new DLL name 2023-04-26 15:52:47 +01:00
Anthony Roberts 7e764af02e Add accommodation for lib rename 2023-04-26 15:14:31 +01:00
Anthony Roberts 8f235a1320 Merge remote-tracking branch 'origin-upstream/main' into move-to-msys2 2023-04-21 11:00:21 +00:00
Anthony Roberts 8d182433cb Make zlib static 2023-04-20 17:47:29 +01:00
Anthony Roberts 88aed9314c FIx openJPEG ffmpeg inclusion 2023-03-24 16:38:55 +00:00
Anthony Roberts 8da9d63ed7 Fix accidentally inverted if 2023-03-15 10:58:52 +00:00
Anthony Roberts a0f7fe5a75 Stop pacman running if packages already installed 2023-03-13 10:27:13 +00:00
Anthony Roberts 6269855603 Fix incorrect string in VPX 2023-03-13 10:10:47 +00:00
Anthony Roberts 5734678d4d Add missed diff files 2023-03-13 10:09:15 +00:00
Anthony Roberts 759a2f16c7 Remove pacman package upgrade step 2023-03-08 10:26:09 +00:00
Anthony Roberts bc541d9ff3 Fix flow control error in CMake file 2023-03-08 10:23:18 +00:00
Anthony Roberts 1809defa62 Remove feature enablement checks for manifest 2023-03-08 10:22:33 +00:00
Anthony Roberts 4491909d50 Add specific NASM and ar-lib versions to msys2 2023-03-07 16:22:16 +00:00
Anthony Roberts bdf9601ce0 Fix several cmake errors 2023-03-07 14:31:23 +00:00
Anthony Roberts 5f4ffc7710 Move Windows dep build from MinGW/GCC to msys/MSVC 
Currently, Windows dependencies are built with MinGW/GCC - this commit
removes that, in favour of building them with MSVC, via msys2. This
unifies the Windows build to use MSVC entirely for dependencies.

Done as part of the foundational work for Windows ARM64 platforms.
 2023-03-06 16:50:53 +00:00