Skip to content
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

Fixes the generation of source projects #1883

Merged
merged 1 commit into from
May 19, 2022
Merged

Fixes the generation of source projects #1883

Show file tree
Hide file tree
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
7 changes: 6 additions & 1 deletion Bootstrap.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,15 @@ FOR /F "usebackq delims=" %%i in (`!VsWhereCmdLine!`) DO (
IF EXIST "%%i\VC\Auxiliary\Build\vcvars32.bat" (
CALL "%%i\VC\Auxiliary\Build\vcvars32.bat" && nmake MSDEV="%PremakeVsVersion%" -f Bootstrap.mak windows
EXIT /B %ERRORLEVEL%
) ELSE (
IF EXIST "%%i\VC\Auxiliary\Build\vcvars64.bat" (
CALL "%%i\VC\Auxiliary\Build\vcvars64.bat" && nmake MSDEV="%PremakeVsVersion%" -f Bootstrap.mak windows
EXIT /B %ERRORLEVEL%
)
)
)

ECHO Could not find vcvars32.bat to setup Visual Studio environment
ECHO Could not find vcvars32.bat or vcvars64.bat to setup Visual Studio environment
EXIT /B 2

REM :VsWhereVisualBootstrap
Expand Down
7 changes: 6 additions & 1 deletion premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,10 @@
--
{ "Win32", "Same as x86" },
{ "x64", "Same as x86_64" },
--
{ "default", "Generates default platforms for targets, x86 and x86_64 projects for Windows." }
},
default = "x86",
default = "default",
}

--
Expand Down Expand Up @@ -166,6 +168,9 @@
filter { "system:windows", "options:arch=x86_64 or arch=x64" }
platforms { "x64" }

filter { "system:windows", "options:arch=default" }
platforms { "x86", "x64" }

filter "configurations:Debug"
defines "_DEBUG"
flags { "Symbols" }
Expand Down
1 change: 1 addition & 0 deletions scripts/package.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

if os.ishost("windows") then
allowedCompilers = {
"vs2022",
"vs2019",
"vs2017",
"vs2015",
Expand Down