Anthony Roberts
ee1b2f53cc
Currently on Windows some dependencies are built with MinGW/GCC 3.x this commit removes that, in favor of building them with MSVC via msys2. This will make it easier in the future to offer Win/Arm64 builds of blender. Notable changes: - This change drops support for the external libxvid library in favor of ffmpegs built in support for this format. This has been done with permission from the VFX module. Pull Request: https://projects.blender.org/blender/blender/pulls/108983 https://projects.blender.org/blender/blender/pulls/105502
48 lines
1.3 KiB
Diff
48 lines
1.3 KiB
Diff
diff --git a/Makefile.MSVC b/Makefile.MSVC
|
|
index 6538911..530c9f9 100644
|
|
--- a/Makefile.MSVC
|
|
+++ b/Makefile.MSVC
|
|
@@ -61,6 +61,10 @@ ASM = NO # or it could be ML64 if we want to use it...
|
|
GTK = NO
|
|
! ENDIF
|
|
! ENDIF
|
|
+! IF "$(MSVCVER)" == "ARM64"
|
|
+ASM = NO
|
|
+GTK = NO
|
|
+! ENDIF
|
|
! ELSE
|
|
! IF "$(COMP)" == ""
|
|
COMP = MSVC
|
|
@@ -99,7 +103,13 @@ SNDFILE = NO
|
|
! ENDIF
|
|
|
|
OFF = win32
|
|
+! IF "$(MSVCVER)" == "Win64"
|
|
+MACHINE = /machine:x64
|
|
+! ELSEIF "$(MSVCVER)" == "ARM64"
|
|
+MACHINE = /machine:ARM64
|
|
+! ELSE
|
|
MACHINE = /machine:I386
|
|
+! ENDIF
|
|
LIB_OPTS = /nologo $(MACHINE)
|
|
|
|
! MESSAGE ----------------------------------------------------------------------
|
|
@@ -150,6 +160,8 @@ LIB_OPTS = /nologo $(MACHINE)
|
|
! ELSE
|
|
! IF "$(MSVCVER)" == "Win64"
|
|
! MESSAGE + using MS 64-Bit Compiler
|
|
+! ELSEIF "$(MSVCVER)" == "ARM64"
|
|
+! MESSAGE + using MS ARM64 Compiler
|
|
! ELSE
|
|
! MESSAGE using MS COMPILER
|
|
! IF "$(CPU)" == "P1"
|
|
@@ -209,6 +221,8 @@ CC_OPTS = /nologo /DWin64 /O2b2ity /GAy /Gs1024 /Zp8 /GL /GS- /Zi
|
|
CC_OPTS = /nologo /O2 /Wp64 /Oi /GL /arch:SSE /fp:precise
|
|
! ELSEif "$(CPU)"=="P6"
|
|
CC_OPTS = /nologo /O2 /Ob2 /GAy /Gs1024 /Zp8 /Zi
|
|
+! ELSEIF "$(MSVCVER)" == "ARM64"
|
|
+CC_OPTS = /nologo /O2 /Ob3 /GAy /Zi
|
|
!else
|
|
CC_OPTS = /nologo /O2 /Ob2 /GAy /Gs1024 /QIfdiv /QI0f /YX
|
|
! ENDIF
|