Skip to content

Commit b2016d4

Browse files
committed
Fix for source generation
1 parent e7ad311 commit b2016d4

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

Bootstrap.bat

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,15 @@ FOR /F "usebackq delims=" %%i in (`!VsWhereCmdLine!`) DO (
9797
IF EXIST "%%i\VC\Auxiliary\Build\vcvars32.bat" (
9898
CALL "%%i\VC\Auxiliary\Build\vcvars32.bat" && nmake MSDEV="%PremakeVsVersion%" -f Bootstrap.mak windows
9999
EXIT /B %ERRORLEVEL%
100+
) ELSE (
101+
IF EXIST "%%i\VC\Auxiliary\Build\vcvars64.bat" (
102+
CALL "%%i\VC\Auxiliary\Build\vcvars64.bat" && nmake MSDEV="%PremakeVsVersion%" -f Bootstrap.mak windows
103+
EXIT /B %ERRORLEVEL%
104+
)
100105
)
101106
)
102107

103-
ECHO Could not find vcvars32.bat to setup Visual Studio environment
108+
ECHO Could not find vcvars32.bat or vcvars64.bat to setup Visual Studio environment
104109
EXIT /B 2
105110

106111
REM :VsWhereVisualBootstrap

premake5.lua

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,10 @@
112112
--
113113
{ "Win32", "Same as x86" },
114114
{ "x64", "Same as x86_64" },
115+
--
116+
{ "default", "Generates default platforms for targets, x86 and x86_64 projects for Windows." }
115117
},
116-
default = "x86",
118+
default = "default",
117119
}
118120

119121
--
@@ -166,6 +168,9 @@
166168
filter { "system:windows", "options:arch=x86_64 or arch=x64" }
167169
platforms { "x64" }
168170

171+
filter { "system:windows", "options:arch=default" }
172+
platforms { "x86", "x64" }
173+
169174
filter "configurations:Debug"
170175
defines "_DEBUG"
171176
flags { "Symbols" }

scripts/package.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
if os.ishost("windows") then
2626
allowedCompilers = {
27+
"vs2022",
2728
"vs2019",
2829
"vs2017",
2930
"vs2015",

0 commit comments

Comments
 (0)