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

Jump to bottom

Add UNITY_WIN_PLATFORM and use for platform check (case UUM-73753). #2045

Merged
merged 1 commit into from
Jul 1, 2024
Merged

Add UNITY_WIN_PLATFORM and use for platform check (case UUM-73753). #2045

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
11 changes: 10 additions & 1 deletion mcs/build/profiles/unityjit.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,16 @@ profile-check:
@:

DEFAULT_REFERENCES = mscorlib
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:UNITY_JIT -d:UNITY -d:WIN_PLATFORM -nowarn:1699 -nostdlib $(PLATFORM_DEBUG_FLAGS)


ifeq ($(HOST_PLATFORM),win32)
# The unityjit profiles for all platforms have had WIN_PLATFORM enabled
# for a number of years/releases. Rather than introduce risk of changing this
# add a unity specific version to selectively control changes to platform specific code.
PLATFORM_FLAGS = -d:UNITY_WIN_PLATFORM
endif

PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:UNITY_JIT -d:UNITY -d:WIN_PLATFORM $(PLATFORM_FLAGS) -nowarn:1699 -nostdlib $(PLATFORM_DEBUG_FLAGS)
API_BIN_PROFILE = v4.7.1

FRAMEWORK_VERSION = 4.5
Expand Down
2 changes: 1 addition & 1 deletion mcs/class/System.IO.Compression/corefx/Interop.Libraries.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ internal static partial class Interop
{
internal static partial class Libraries
{
#if WIN_PLATFORM
#if (WIN_PLATFORM && !UNITY_JIT) || UNITY_WIN_PLATFORM
internal const string CompressionNative = "__Internal";
#else
internal const string CompressionNative = "System.Native";
Expand Down