push a SCSharpMac project for the coreanimation rewrite

toshok · Sep 30, 2011 · 58d0ec7 · 58d0ec7
1 parent 6ae3f30
commit 58d0ec7
Show file tree

Hide file tree

Showing 79 changed files with 6,131 additions and 75 deletions.
diff --git a/SCSharp/SCSharp.Core.dll.csproj b/SCSharp/SCSharp.Core.dll.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,6 +10,7 @@
     <AppDesignerFolder>Properties\SCSharp.dll</AppDesignerFolder>
     <RootNamespace>SCSharp</RootNamespace>
     <AssemblyName>SCSharp</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/SCSharp/SCSharp.Smk.dll.csproj b/SCSharp/SCSharp.Smk.dll.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,6 +10,7 @@
     <AppDesignerFolder>Properties\SCSharp.Smk.dll</AppDesignerFolder>
     <RootNamespace>SCSharp.Smk</RootNamespace>
     <AssemblyName>SCSharp.Smk</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -33,8 +34,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Xml" />
-    <Reference Include="Tao.Sdl, Version=1.2.9.1, Culture=neutral, PublicKeyToken=9c7a200e36c0094e">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Tao.Sdl">
       <HintPath>..\sdldotnet-bin\Tao.Sdl.dll</HintPath>
     </Reference>
   </ItemGroup>

diff --git a/SCSharp/SCSharp.UI.dll.csproj b/SCSharp/SCSharp.UI.dll.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,6 +10,7 @@
     <AppDesignerFolder>Properties\SCSharp.UI.dll</AppDesignerFolder>
     <RootNamespace>SCSharp.UI</RootNamespace>
     <AssemblyName>SCSharp.UI</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -33,13 +34,11 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Xml" />
-    <Reference Include="SdlDotNet, Version=4.0.3.0, Culture=neutral, PublicKeyToken=26ad4f7e10c61408">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="System.Configuration" />
+    <Reference Include="SdlDotNet">
       <HintPath>..\sdldotnet-bin\SdlDotNet.dll</HintPath>
     </Reference>
-    <Reference Include="System.Configuration" />
-    <Reference Include="Tao.Sdl, Version=1.2.9.1, Culture=neutral, PublicKeyToken=9c7a200e36c0094e">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Tao.Sdl">
       <HintPath>..\sdldotnet-bin\Tao.Sdl.dll</HintPath>
     </Reference>
   </ItemGroup>

diff --git a/SCSharp/SCSharp.UI/ButtonElement.cs b/SCSharp/SCSharp.UI/ButtonElement.cs
@@ -33,7 +33,10 @@
 using System.Text;
 using System.Threading;
 
-using SdlDotNet;
+using SdlDotNet.Core;
+using SdlDotNet.Graphics;
+using SdlDotNet.Input;
+
 using System.Drawing;
 
 namespace SCSharp.UI

diff --git a/SCSharp/SCSharp.UI/Cinematic.cs b/SCSharp/SCSharp.UI/Cinematic.cs
@@ -32,7 +32,10 @@
 using System.IO;
 using System.Threading;
 
-using SdlDotNet;
+using SdlDotNet.Core;
+using SdlDotNet.Graphics;
+using SdlDotNet.Input;
+
 using System.Drawing;
 
 namespace SCSharp.UI
@@ -95,7 +98,8 @@ void PlayerFrameReady ()
 				else
 					zoom = vert_zoom;
 
-				surf.Scale (zoom);
+				// FIXME: newSDL
+				//surf.Scale (zoom);
 			}
 
 			/* signal to the painter to redraw the screen */

diff --git a/SCSharp/SCSharp.UI/ComboBoxElement.cs b/SCSharp/SCSharp.UI/ComboBoxElement.cs
@@ -34,7 +34,10 @@
 using System.Text;
 using System.Threading;
 
-using SdlDotNet;
+using SdlDotNet.Core;
+using SdlDotNet.Graphics;
+using SdlDotNet.Input;
+
 using System.Drawing;
 
 namespace SCSharp.UI

diff --git a/SCSharp/SCSharp.UI/ConnectionScreen.cs b/SCSharp/SCSharp.UI/ConnectionScreen.cs
@@ -32,7 +32,10 @@
 using System.IO;
 using System.Threading;
 
-using SdlDotNet;
+using SdlDotNet.Core;
+using SdlDotNet.Graphics;
+using SdlDotNet.Input;
+
 using System.Drawing;
 
 namespace SCSharp.UI

diff --git a/SCSharp/SCSharp.UI/CreditsScreen.cs b/SCSharp/SCSharp.UI/CreditsScreen.cs
@@ -34,7 +34,9 @@
 using System.Reflection;
 using System.Threading;
 
-using SdlDotNet;
+using SdlDotNet.Core;
+using SdlDotNet.Graphics;
+
 using System.Drawing;
 
 namespace SCSharp.UI

diff --git a/SCSharp/SCSharp.UI/CursorAnimator.cs b/SCSharp/SCSharp.UI/CursorAnimator.cs
@@ -29,7 +29,9 @@
 //
 
 using System;
-using SdlDotNet;
+using SdlDotNet.Core;
+using SdlDotNet.Graphics;
+
 
 using System.Drawing;
 using System.Drawing.Imaging;

diff --git a/SCSharp/SCSharp.UI/DialogBoxElement.cs b/SCSharp/SCSharp.UI/DialogBoxElement.cs
@@ -33,7 +33,10 @@
 using System.Text;
 using System.Threading;
 
-using SdlDotNet;
+using SdlDotNet.Core;
+using SdlDotNet.Graphics;
+using SdlDotNet.Input;
+
 using System.Drawing;
 
 namespace SCSharp.UI

diff --git a/SCSharp/SCSharp.UI/EntryDialog.cs b/SCSharp/SCSharp.UI/EntryDialog.cs
@@ -33,7 +33,10 @@
 using System.Text;
 using System.Threading;
 
-using SdlDotNet;
+using SdlDotNet.Core;
+using SdlDotNet.Graphics;
+using SdlDotNet.Input;
+
 using System.Drawing;
 
 namespace SCSharp.UI

diff --git a/SCSharp/SCSharp.UI/Game.cs b/SCSharp/SCSharp.UI/Game.cs
@@ -32,7 +32,10 @@
 using System.IO;
 using System.Threading;
 
-using SdlDotNet;
+using SdlDotNet.Core;
+using SdlDotNet.Graphics;
+using SdlDotNet.Input;
+
 using System.Drawing;
 
 using System.Text;
@@ -335,7 +338,7 @@ void PointerMotion (object o, MouseMotionEventArgs args)
 		{
 			cached_cursor_x = args.X;
 			cached_cursor_y = args.Y;
-			
+
 			if (cursor != null)
 				cursor.SetPosition (cached_cursor_x, cached_cursor_y);
 
@@ -347,7 +350,7 @@ void MouseButtonDown (object o, MouseButtonEventArgs args)
 		{
 			cached_cursor_x = args.X;
 			cached_cursor_y = args.Y;
-			
+
 			if (cursor != null)
 				cursor.SetPosition (cached_cursor_x, cached_cursor_y);
 

diff --git a/SCSharp/SCSharp.UI/GameMenuDialog.cs b/SCSharp/SCSharp.UI/GameMenuDialog.cs
@@ -33,7 +33,9 @@
 using System.Text;
 using System.Threading;
 
-using SdlDotNet;
+using SdlDotNet.Core;
+using SdlDotNet.Graphics;
+
 using System.Drawing;
 
 namespace SCSharp.UI

diff --git a/SCSharp/SCSharp.UI/GameModeDialog.cs b/SCSharp/SCSharp.UI/GameModeDialog.cs
@@ -32,7 +32,9 @@
 using System.IO;
 using System.Threading;
 
-using SdlDotNet;
+using SdlDotNet.Core;
+using SdlDotNet.Graphics;
+
 using System.Drawing;
 
 namespace SCSharp.UI

diff --git a/SCSharp/SCSharp.UI/GameScreen.cs b/SCSharp/SCSharp.UI/GameScreen.cs
@@ -33,7 +33,10 @@
 using System.Threading;
 using System.Collections.Generic;
 
-using SdlDotNet;
+using SdlDotNet.Core;
+using SdlDotNet.Graphics;
+using SdlDotNet.Input;
+
 using System.Drawing;
 
 namespace SCSharp.UI

diff --git a/SCSharp/SCSharp.UI/GlobalResources.cs b/SCSharp/SCSharp.UI/GlobalResources.cs
@@ -32,7 +32,9 @@
 using System.IO;
 using System.Threading;
 
-using SdlDotNet;
+using SdlDotNet.Core;
+using SdlDotNet.Graphics;
+
 
 namespace SCSharp.UI
 {

diff --git a/SCSharp/SCSharp.UI/GrpButtonElement.cs b/SCSharp/SCSharp.UI/GrpButtonElement.cs
@@ -33,7 +33,10 @@
 using System.Text;
 using System.Threading;
 
-using SdlDotNet;
+using SdlDotNet.Core;
+using SdlDotNet.Graphics;
+using SdlDotNet.Input;
+
 using System.Drawing;
 
 namespace SCSharp.UI

diff --git a/SCSharp/SCSharp.UI/GrpElement.cs b/SCSharp/SCSharp.UI/GrpElement.cs
@@ -33,7 +33,10 @@
 using System.Text;
 using System.Threading;
 
-using SdlDotNet;
+using SdlDotNet.Core;
+using SdlDotNet.Graphics;
+using SdlDotNet.Input;
+
 using System.Drawing;
 
 namespace SCSharp.UI

diff --git a/SCSharp/SCSharp.UI/GuiUtil.cs b/SCSharp/SCSharp.UI/GuiUtil.cs
@@ -37,7 +37,11 @@
 
 using System.Drawing;
 using System.Drawing.Imaging;
-using SdlDotNet;
+using SdlDotNet.Core;
+using SdlDotNet.Graphics;
+using SdlDotNet.Input;
+using SdlDotNet.Audio;
+
 
 /* for the surface creation hack below */
 using System.Reflection;

diff --git a/SCSharp/SCSharp.UI/ImageElement.cs b/SCSharp/SCSharp.UI/ImageElement.cs
@@ -33,7 +33,10 @@
 using System.Text;
 using System.Threading;
 
-using SdlDotNet;
+using SdlDotNet.Core;
+using SdlDotNet.Graphics;
+using SdlDotNet.Input;
+
 using System.Drawing;
 
 namespace SCSharp.UI

diff --git a/SCSharp/SCSharp.UI/LabelElement.cs b/SCSharp/SCSharp.UI/LabelElement.cs
@@ -33,7 +33,10 @@
 using System.Text;
 using System.Threading;
 
-using SdlDotNet;
+using SdlDotNet.Core;
+using SdlDotNet.Graphics;
+using SdlDotNet.Input;
+
 using System.Drawing;
 
 namespace SCSharp.UI

diff --git a/SCSharp/SCSharp.UI/ListBoxElement.cs b/SCSharp/SCSharp.UI/ListBoxElement.cs
@@ -34,7 +34,10 @@
 using System.Text;
 using System.Threading;
 
-using SdlDotNet;
+using SdlDotNet.Core;
+using SdlDotNet.Graphics;
+using SdlDotNet.Input;
+
 using System.Drawing;
 
 namespace SCSharp.UI

diff --git a/SCSharp/SCSharp.UI/LoadSavedScreen.cs b/SCSharp/SCSharp.UI/LoadSavedScreen.cs
@@ -32,7 +32,9 @@
 using System.IO;
 using System.Threading;
 
-using SdlDotNet;
+using SdlDotNet.Core;
+using SdlDotNet.Graphics;
+
 using System.Drawing;
 
 namespace SCSharp.UI

diff --git a/SCSharp/SCSharp.UI/LoginScreen.cs b/SCSharp/SCSharp.UI/LoginScreen.cs
@@ -32,7 +32,10 @@
 using System.IO;
 using System.Threading;
 
-using SdlDotNet;
+using SdlDotNet.Core;
+using SdlDotNet.Graphics;
+using SdlDotNet.Input;
+
 using System.Drawing;
 
 namespace SCSharp.UI

diff --git a/SCSharp/SCSharp.UI/MainMenu.cs b/SCSharp/SCSharp.UI/MainMenu.cs
@@ -33,7 +33,9 @@
 using System.IO;
 using System.Threading;
 
-using SdlDotNet;
+using SdlDotNet.Core;
+using SdlDotNet.Graphics;
+
 using System.Drawing;
 
 namespace SCSharp.UI

diff --git a/SCSharp/SCSharp.UI/MapRenderer.cs b/SCSharp/SCSharp.UI/MapRenderer.cs
@@ -33,7 +33,9 @@
 using System.Drawing;
 using System.IO;
 
-using SdlDotNet;
+using SdlDotNet.Core;
+using SdlDotNet.Graphics;
+
 
 namespace SCSharp.UI
 {

diff --git a/SCSharp/SCSharp.UI/MarkupScreen.cs b/SCSharp/SCSharp.UI/MarkupScreen.cs
@@ -34,7 +34,10 @@
 using System.Reflection;
 using System.Threading;
 
-using SdlDotNet;
+using SdlDotNet.Core;
+using SdlDotNet.Graphics;
+using SdlDotNet.Input;
+
 using System.Drawing;
 
 namespace SCSharp.UI