Mono compatibility changes
This commit is contained in:
parent
9e13975aed
commit
817e1ced95
4 changed files with 23 additions and 5 deletions
|
|
@ -19,7 +19,9 @@ namespace Server.RemoteAdmin
|
||||||
{
|
{
|
||||||
PacketHandlers.Register( 0xF1, 0, false, new OnPacketReceive( OnReceive ) );
|
PacketHandlers.Register( 0xF1, 0, false, new OnPacketReceive( OnReceive ) );
|
||||||
|
|
||||||
|
#if !MONO
|
||||||
Core.MultiConsoleOut.Add( new EventTextWriter( new EventTextWriter.OnConsoleChar( OnConsoleChar ), new EventTextWriter.OnConsoleLine( OnConsoleLine ), new EventTextWriter.OnConsoleStr( OnConsoleString ) ) );
|
Core.MultiConsoleOut.Add( new EventTextWriter( new EventTextWriter.OnConsoleChar( OnConsoleChar ), new EventTextWriter.OnConsoleLine( OnConsoleLine ), new EventTextWriter.OnConsoleStr( OnConsoleString ) ) );
|
||||||
|
#endif
|
||||||
Timer.DelayCall( TimeSpan.FromMinutes( 2.5 ), TimeSpan.FromMinutes( 2.5 ), new TimerCallback( CleanUp ) );
|
Timer.DelayCall( TimeSpan.FromMinutes( 2.5 ), TimeSpan.FromMinutes( 2.5 ), new TimerCallback( CleanUp ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -86,7 +86,9 @@ namespace Server.Network
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
s.LingerState.Enabled = false;
|
s.LingerState.Enabled = false;
|
||||||
|
#if !MONO
|
||||||
s.ExclusiveAddressUse = false;
|
s.ExclusiveAddressUse = false;
|
||||||
|
#endif
|
||||||
|
|
||||||
s.Bind( ipep );
|
s.Bind( ipep );
|
||||||
s.Listen( 8 );
|
s.Listen( 8 );
|
||||||
|
|
|
||||||
|
|
@ -75,7 +75,9 @@ namespace Server {
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
#if !MONO
|
||||||
PerformanceCounterCategory.Create( PerformanceCategoryName, PerformanceCategoryDesc, PerformanceCounterCategoryType.SingleInstance, counters );
|
PerformanceCounterCategory.Create( PerformanceCategoryName, PerformanceCategoryDesc, PerformanceCounterCategoryType.SingleInstance, counters );
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
numberOfWorldSaves = new PerformanceCounter( PerformanceCategoryName, "Save - Count", false );
|
numberOfWorldSaves = new PerformanceCounter( PerformanceCategoryName, "Save - Count", false );
|
||||||
|
|
|
||||||
|
|
@ -82,14 +82,14 @@ namespace Server
|
||||||
StringBuilder sb = null;
|
StringBuilder sb = null;
|
||||||
|
|
||||||
#if MONO
|
#if MONO
|
||||||
AppendDefine( ref sb, "MONO" );
|
AppendDefine( ref sb, "/d:MONO" );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//These two defines are legacy, ie, depreciated.
|
//These two defines are legacy, ie, depreciated.
|
||||||
if( Core.Is64Bit )
|
if( Core.Is64Bit )
|
||||||
AppendDefine( ref sb, "x64" );
|
AppendDefine( ref sb, "/d:x64" );
|
||||||
|
|
||||||
AppendDefine( ref sb, "Framework_2_0" );
|
AppendDefine( ref sb, "/d:Framework_2_0" );
|
||||||
|
|
||||||
return (sb == null ? null : sb.ToString());
|
return (sb == null ? null : sb.ToString());
|
||||||
}
|
}
|
||||||
|
|
@ -99,7 +99,7 @@ namespace Server
|
||||||
if( sb == null )
|
if( sb == null )
|
||||||
sb = new StringBuilder();
|
sb = new StringBuilder();
|
||||||
else
|
else
|
||||||
sb.Append( ';' );
|
sb.Append( ' ' );
|
||||||
|
|
||||||
sb.Append( define );
|
sb.Append( define );
|
||||||
}
|
}
|
||||||
|
|
@ -216,7 +216,7 @@ namespace Server
|
||||||
string defines = GetDefines();
|
string defines = GetDefines();
|
||||||
|
|
||||||
if( defines != null )
|
if( defines != null )
|
||||||
parms.CompilerOptions = string.Format( "/D:{0}", defines );
|
parms.CompilerOptions = defines;
|
||||||
|
|
||||||
if( Core.HaltOnWarning )
|
if( Core.HaltOnWarning )
|
||||||
parms.WarningLevel = 4;
|
parms.WarningLevel = 4;
|
||||||
|
|
@ -226,11 +226,23 @@ namespace Server
|
||||||
|
|
||||||
Display( results );
|
Display( results );
|
||||||
|
|
||||||
|
#if !MONO
|
||||||
if( results.Errors.Count > 0 )
|
if( results.Errors.Count > 0 )
|
||||||
{
|
{
|
||||||
assembly = null;
|
assembly = null;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
if( results.Errors.Count > 0 ) {
|
||||||
|
foreach( CompilerError err in results.Errors ) {
|
||||||
|
if ( !err.IsWarning ) {
|
||||||
|
assembly = null;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
if( cache && Path.GetFileName( path ) == "Scripts.CS.dll" )
|
if( cache && Path.GetFileName( path ) == "Scripts.CS.dll" )
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue