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

[EXPERIMENTAL] support for .NET 4.6 runtime. #248

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[EXPERIMENTAL] support for .NET 4.6 runtime. #248

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file modified dist/unity-webview.unitypackage
View file
Open in desktop
Binary file not shown.
Binary file modified dist/unity-webview.zip
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions plugins/Mac/WebView.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,8 +325,8 @@
MACOSX_DEPLOYMENT_TARGET = 10.6;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"-L/Applications/Unity/Unity.app/Contents/Frameworks/MonoEmbedRuntime/osx",
"-lmono.0",
"-L/Applications/Unity/Unity.app/Contents/Frameworks/MonoBleedingEdge/MonoEmbedRuntime/osx",
"-lmonobdwgc-2.0",
);
SDKROOT = macosx;
};
Expand Down Expand Up @@ -362,8 +362,8 @@
HEADER_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.6;
OTHER_LDFLAGS = (
"-L/Applications/Unity/Unity.app/Contents/Frameworks/MonoEmbedRuntime/osx",
"-lmono.0",
"-L/Applications/Unity/Unity.app/Contents/Frameworks/MonoBleedingEdge/MonoEmbedRuntime/osx",
"-lmonobdwgc-2.0",
);
SDKROOT = macosx;
};
Expand Down
6 changes: 3 additions & 3 deletions plugins/Mac/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ xcodebuild -target WebView -configuration Release -arch i386 -arch x86_64 build
xcodebuild -target WebViewSeparated -configuration Release -arch x86_64 build CONFIGURATION_BUILD_DIR='DerivedData'
mkdir -p $DSTDIR


# adjust libmono.0.dylib paths
for i in WebView WebViewSeparated
do
pushd DerivedData/$i.bundle/Contents/MacOS
install_name_tool -change @executable_path/../Frameworks/MonoEmbedRuntime/osx/libmono.0.dylib @rpath/libmono.0.dylib $i
install_name_tool -add_rpath @executable_path/../Frameworks/MonoEmbedRuntime/osx/ $i
install_name_tool -add_rpath @executable_path/../Frameworks/Mono/MonoEmbedRuntime/osx/ $i
install_name_tool -change @executable_path/../Frameworks/MonoEmbedRuntime/osx/libmonobdwgc-2.0.dylib @rpath/libmonobdwgc-2.0.dylib $i
install_name_tool -add_rpath @executable_path/../Frameworks/MonoBleedingEdge/MonoEmbedRuntime/osx/ $i
popd
done

Expand Down
38 changes: 32 additions & 6 deletions sample/ProjectSettings/GraphicsSettings.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,61 @@
--- !u!30 &1
GraphicsSettings:
m_ObjectHideFlags: 0
serializedVersion: 5
serializedVersion: 12
m_Deferred:
m_Mode: 1
m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
m_DeferredReflections:
m_Mode: 1
m_Shader: {fileID: 74, guid: 0000000000000000f000000000000000, type: 0}
m_ScreenSpaceShadows:
m_Mode: 1
m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0}
m_LegacyDeferred:
m_Mode: 1
m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0}
m_DepthNormals:
m_Mode: 1
m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0}
m_MotionVectors:
m_Mode: 1
m_Shader: {fileID: 75, guid: 0000000000000000f000000000000000, type: 0}
m_LightHalo:
m_Mode: 1
m_Shader: {fileID: 105, guid: 0000000000000000f000000000000000, type: 0}
m_LensFlare:
m_Mode: 1
m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0}
m_AlwaysIncludedShaders:
- {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_ShaderSettings:
useScreenSpaceShadows: 0
m_BuildTargetShaderSettings: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}
m_CustomRenderPipeline: {fileID: 0}
m_TransparencySortMode: 0
m_TransparencySortAxis: {x: 0, y: 0, z: 1}
m_DefaultRenderingPath: 1
m_DefaultMobileRenderingPath: 1
m_TierSettings: []
m_LightmapStripping: 0
m_FogStripping: 0
m_InstancingStripping: 0
m_LightmapKeepPlain: 1
m_LightmapKeepDirCombined: 1
m_LightmapKeepDirSeparate: 1
m_LightmapKeepDynamicPlain: 1
m_LightmapKeepDynamicDirCombined: 1
m_LightmapKeepDynamicDirSeparate: 1
m_LightmapKeepShadowMask: 1
m_LightmapKeepSubtractive: 1
m_FogKeepLinear: 1
m_FogKeepExp: 1
m_FogKeepExp2: 1
m_AlbedoSwatchInfos: []
m_LightsUseLinearIntensity: 0
m_LightsUseColorTemperature: 0