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

[browser] new EmccEnableAssertions and EmccEnvironment MSBuild props #82954

Merged
merged 16 commits into from
Mar 15, 2023
Merged

[browser] new EmccEnableAssertions and EmccEnvironment MSBuild props #82954

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3ff2586
EmccAssertions and EmccEnvironment MSBuild props
pavelsavara Mar 3, 2023
428388d
fix
pavelsavara Mar 3, 2023
7f79220
symbols as separate asset type
pavelsavara Mar 3, 2023
17ec387
Merge branch 'main' into browser_asserts
pavelsavara Mar 3, 2023
028d598
fix
pavelsavara Mar 3, 2023
d8b92c2
Merge branch 'main' into browser_asserts
pavelsavara Mar 6, 2023
9b7b5d6
feedback
pavelsavara Mar 6, 2023
d359adb
feedback
pavelsavara Mar 6, 2023
dd7561f
Update src/tasks/WasmAppBuilder/WasmAppBuilder.cs
pavelsavara Mar 7, 2023
51391ea
Merge branch 'main' into browser_asserts
pavelsavara Mar 14, 2023
9d442a8
feedback
pavelsavara Mar 14, 2023
4c2d6b8
fix
pavelsavara Mar 14, 2023
f78df93
Merge branch 'main' into browser_asserts
pavelsavara Mar 14, 2023
6706d3f
EmccExportedLibraryFunction
pavelsavara Mar 14, 2023
a060952
feedback
pavelsavara Mar 14, 2023
ef636bb
Update src/mono/wasm/runtime/assets.ts
pavelsavara Mar 15, 2023
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
2 changes: 2 additions & 0 deletions src/mono/sample/wasm/browser-advanced/Wasm.Advanced.Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<EnableAggressiveTrimming>true</EnableAggressiveTrimming>
<PublishTrimmed>true</PublishTrimmed>
<WasmEnableWebcil>true</WasmEnableWebcil>
<EmccAssertions>true</EmccAssertions>
<EmccEnvironment>web</EmccEnvironment>
<!-- add OpenGL emulation -->
<EmccExtraLDFlags> -s USE_CLOSURE_COMPILER=1 -s LEGACY_GL_EMULATION=1 -lGL -lSDL -lidbfs.js</EmccExtraLDFlags>
<!-- just to prove we don't do JS eval() -->
Expand Down
3 changes: 3 additions & 0 deletions src/mono/wasm/build/WasmApp.Native.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,10 @@
</PropertyGroup>
<ItemGroup>
<!-- order matters -->
<!-- some flags will be duplicated on the commandline and in the .rsp file. The last wins. -->
<_EmccLDSFlags Include="-s INITIAL_MEMORY=$(EmccInitialHeapSize)" />
<_EmccLDSFlags Condition="'$(EmccEnvironment)' != ''" Include="-s ENVIRONMENT=$(EmccEnvironment)" />
<_EmccLDSFlags Condition="'$(EmccAssertions)' == 'true'" Include="-s ASSERTIONS=1" />

<_WasmNativeFileForLinking Include="%(_BitcodeFile.ObjectFile)" />
<_WasmNativeFileForLinking Include="%(_WasmSourceFileToCompile.ObjectFile)" />
Expand Down
2 changes: 2 additions & 0 deletions src/mono/wasm/build/WasmApp.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
- $(EmccFlags) - Emcc flags used for both compiling native files, and linking
- $(EmccExtraLDFlags) - Extra emcc flags for linking
- $(EmccExtraCFlags) - Extra emcc flags for compiling native files
- $(EmccAssertions) - Corresponds to `ASSERTIONS` arg for emcc. Default false.
pavelsavara marked this conversation as resolved.
Show resolved Hide resolved
- $(EmccEnvironment) - Corresponds to `ENVIRONMENT` arg for emcc. Default is `web,webview,worker,node,shell`.
- $(EmccInitialHeapSize) - Initial heap size specified with `emcc`. Default value: 16777216 or size of the DLLs, whichever is larger.
Corresponds to `INITIAL_MEMORY` arg for emcc.
(previously named EmccTotalMemory, which is still kept as an alias)
Expand Down
3 changes: 1 addition & 2 deletions src/mono/wasm/wasm.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,6 @@
<EmccExportedRuntimeMethod Include="FS_createDataFile" />
<EmccExportedRuntimeMethod Include="removeRunDependency" />
<EmccExportedRuntimeMethod Include="addRunDependency" />
<EmccExportedRuntimeMethod Include="FS_readFile" />
pavelsavara marked this conversation as resolved.
Show resolved Hide resolved
<EmccExportedRuntimeMethod Include="addFunction" />
<EmccExportedRuntimeMethod Include="getWasmTableEntry" />

Expand Down Expand Up @@ -330,7 +329,7 @@
<CMakeConfigurationEmccFlags Condition="'$(Configuration)' == 'Debug'">-g -Os -s -DDEBUG=1 -DENABLE_AOT_PROFILER=1 -DENABLE_BROWSER_PROFILER=1</CMakeConfigurationEmccFlags>
<CMakeConfigurationEmccFlags Condition="'$(Configuration)' == 'Release'">-Oz -DENABLE_BROWSER_PROFILER=1</CMakeConfigurationEmccFlags>

<CMakeConfigurationLinkFlags Condition="'$(Configuration)' == 'Debug'" >$(CMakeConfigurationEmccFlags)</CMakeConfigurationLinkFlags>
<CMakeConfigurationLinkFlags Condition="'$(Configuration)' == 'Debug'" >$(CMakeConfigurationEmccFlags) -s ASSERTIONS=1 </CMakeConfigurationLinkFlags>
pavelsavara marked this conversation as resolved.
Show resolved Hide resolved
<CMakeConfigurationLinkFlags Condition="'$(Configuration)' == 'Release'">-O2</CMakeConfigurationLinkFlags>

<CMakeConfigurationLinkFlags>$(CMakeConfigurationLinkFlags) -s EXPORT_ES6=1</CMakeConfigurationLinkFlags>
Expand Down