AuroraPipeline/premake
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #1883 from nickclark2016/issues/1862

Browse Source 
Fixes the generation of source projects
This commit is contained in:
Nick Clark 2022-05-19 10:53:06 -05:00 committed by GitHub
commit 0b39163bb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Bootstrap.bat
View File

@ -97,10 +97,15 @@ FOR /F "usebackq delims=" %%i in (`!VsWhereCmdLine!`) DO (
IF EXIST "%%i\VC\Auxiliary\Build\vcvars32.bat" ( IF EXIST "%%i\VC\Auxiliary\Build\vcvars32.bat" (
CALL "%%i\VC\Auxiliary\Build\vcvars32.bat" && nmake MSDEV="%PremakeVsVersion%" -f Bootstrap.mak windows CALL "%%i\VC\Auxiliary\Build\vcvars32.bat" && nmake MSDEV="%PremakeVsVersion%" -f Bootstrap.mak windows
EXIT /B %ERRORLEVEL% 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 EXIT /B 2
REM :VsWhereVisualBootstrap REM :VsWhereVisualBootstrap

7
premake5.lua
View File

@ -112,8 +112,10 @@
-- --
{ "Win32", "Same as x86" }, { "Win32", "Same as x86" },
{ "x64", "Same as x86_64" }, { "x64", "Same as x86_64" },
--
{ "default", "Generates default platforms for targets, x86 and x86_64 projects for Windows." }
}, },
default = "x86", default = "default",
} }
-- --
@ -166,6 +168,9 @@
filter { "system:windows", "options:arch=x86_64 or arch=x64" } filter { "system:windows", "options:arch=x86_64 or arch=x64" }
platforms { "x64" } platforms { "x64" }
filter { "system:windows", "options:arch=default" }
platforms { "x86", "x64" }
filter "configurations:Debug" filter "configurations:Debug"
defines "_DEBUG" defines "_DEBUG"
flags { "Symbols" } flags { "Symbols" }

1
scripts/package.lua
View File

@ -24,6 +24,7 @@
if os.ishost("windows") then if os.ishost("windows") then
allowedCompilers = { allowedCompilers = {
"vs2022",
"vs2019", "vs2019",
"vs2017", "vs2017",
"vs2015", "vs2015",