Skip to content

Fix incorrect platform detection in setenvvar.bat on VS2022 #8866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tomneko wants to merge 1 commit into
base: B3_0_Release
Choose a base branch
from
+6 −5
Open

Fix incorrect platform detection in setenvvar.bat on VS2022 #8866

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions builds/win32/setenvvar.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@

@echo off

::set FB_PROCESSOR_ARCHITECTURE=AMD64
:: 1. Determine target platform
if "%Platform%"=="x86" set FB_TARGET_PLATFORM=Win32
if "%Platform%"=="x64" set FB_TARGET_PLATFORM=x64

:: Default target CPU architecture is the native environment
if NOT DEFINED FB_PROCESSOR_ARCHITECTURE (
set FB_PROCESSOR_ARCHITECTURE=%PROCESSOR_ARCHITECTURE%
)
:: 2.If Platform variable is not set, use PROCESSOR_ARCHITECTURE
if "%FB_TARGET_PLATFORM%"=="Win32" set FB_PROCESSOR_ARCHITECTURE=x86
if "%FB_TARGET_PLATFORM%"=="x64" set FB_PROCESSOR_ARCHITECTURE=AMD64

::===============================
::Set up the compiler environment
Expand Down