Merge the mono source for unity 4.5 and update the build instructions.

angavrilov · Jul 23, 2014 · 71d54c6 · 71d54c6
1 parent ed2b24c
commit 71d54c6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.rst b/README.rst
@@ -217,7 +217,7 @@ Specific component instructions:
 
 1. To build the Mono library on linux, enter the ``mono/`` submodule and execute:
 
-   ``perl build_runtime_linux.pl``
+   ``perl external/buildscripts/build_runtime_linux.pl``
 
 2. To build Mono on windows, open ``mono/msvc/mono.sln`` with Visual Studio Express 2010
    (ignoring messages about disabled features), select target *Release_eglib (Win32)*

diff --git a/mono b/mono
+0 −20		PrepareSTVNDK.pl
+0 −270		PrepareSTVNDK.pm
+0 −50		build_runtime_stv.sh
+11 −2		eglib/src/goutput.c
+0 −0		external/buildscripts/PrepareAndroidSDK.pl
+45 −11		external/buildscripts/PrepareAndroidSDK.pm
+0 −0		external/buildscripts/PrepareBB10NDK.pl
+0 −0		external/buildscripts/PrepareBB10NDK.pm
+0 −0		external/buildscripts/PrepareTizenNDK.pl
+0 −0		external/buildscripts/PrepareTizenNDK.pm
+394 −0		external/buildscripts/SDKDownloader.pm
+0 −0		external/buildscripts/TeamCityCleanerRunner.pl
+0 −0		external/buildscripts/build-mingw32.sh
+0 −0		external/buildscripts/build_all_osx.sh
+3 −0		external/buildscripts/build_classlibs_osx.pl
+1 −1		external/buildscripts/build_ios_xwin.sh
+20 −3		external/buildscripts/build_runtime_android.sh
+10 −9		external/buildscripts/build_runtime_android_x86.sh
+10 −1		external/buildscripts/build_runtime_iphone.sh
+1 −1		external/buildscripts/build_runtime_linux.pl
+22 −12		external/buildscripts/build_runtime_osx.pl
+0 −0		external/buildscripts/build_runtime_osx_all.pl
+2 −1		external/buildscripts/build_runtime_qnx.sh
+69 −0		external/buildscripts/build_runtime_stv.sh
+2 −1		external/buildscripts/build_runtime_tizen.sh
+2 −2		external/buildscripts/build_runtime_win.pl
+2 −2		external/buildscripts/build_runtime_win64.pl
+0 −0		external/buildscripts/build_unityscript_bareminimum_win.pl
+1 −0		external/buildscripts/collect_allbuilds.pl
+0 −0		external/buildscripts/run_classlib_tests.pl
+0 −0		external/buildscripts/run_runtime_tests.pl
+7 −0		libgc/include/private/gcconfig.h
+21 −0		libgc/pthread_support.c
+7 −0		mcs/class/Mono.Security/Mono.Security.X509/X509Certificate.cs
+1 −1		mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs
+1 −1		mcs/class/corlib/Microsoft.Win32/Registry.cs
+2 −2		mcs/class/corlib/System/Type.cs
+0 −4		mono/metadata/boehm-gc.c
+2 −1		mono/metadata/class-internals.h
+8 −1		mono/metadata/class.c
+6 −0		mono/metadata/image.c
+26 −6		mono/metadata/marshal.c
+4 −0		mono/metadata/mono-debug-debugger.c
+3 −0		mono/metadata/object-internals.h
+5 −0		mono/metadata/object.c
+25 −3		mono/metadata/socket-io.c
+90 −21		mono/metadata/verify.c
+4 −0		mono/mini/ChangeLog
+12 −6		mono/mini/aot-compiler.c
+46 −4		mono/mini/debugger-agent.c
+1 −1		mono/mini/method-to-ir.c
+10 −4		mono/mini/mini-amd64.c
+7 −0		mono/mini/tramp-arm.c
+20 −6		mono/utils/mono-poll.c
+3 −0		msvc/mono.def
+1 −1		msvc/mono.vcxproj
+0 −2		runtime/Makefile.am
+1 −1		scripts/script.bat.in
+1 −1		scripts/script.in
+34 −14		unity/unity_liveness.c
+12 −0		unity/unity_utils.c