From 3dd401b342216d60943710fa09be99e6a3fb5682 Mon Sep 17 00:00:00 2001
From: Calvin Rien <calvin@darktable.com>
Date: Mon, 15 Apr 2013 18:04:13 -0700
Subject: [PATCH] Made Unity project directory structure more plugin compliant.
 Added .sln for spine-csharp that compiles under MonoDevelop.  Modifie
 spine-csharp.csproj to compile under MonoDevelop (mac).

---
 .gitignore                                    |  4 +++
 spine-csharp/spine-csharp.csproj              | 26 +++++++------------
 spine-csharp/spine-csharp.sln                 | 20 ++++++++++++++
 spine-unity/Assets/{src.meta => Plugins.meta} |  2 +-
 .../Assets/{src => Plugins}/Editor.meta       |  2 +-
 .../Editor/Spine.meta}                        |  2 +-
 .../Editor/Spine}/AtlasAssetInspector.cs      |  0
 .../Editor/Spine}/AtlasAssetInspector.cs.meta |  0
 .../Editor => Plugins/Editor/Spine}/Menus.cs  |  0
 .../Editor/Spine}/Menus.cs.meta               |  0
 .../Spine}/SkeletonComponentInspector.cs      |  0
 .../Spine}/SkeletonComponentInspector.cs.meta |  0
 .../Spine}/SkeletonDataAssetInspector.cs      |  0
 .../Spine}/SkeletonDataAssetInspector.cs.meta |  0
 spine-unity/Assets/Plugins/Spine.meta         |  4 +++
 .../{src => Plugins/Spine}/AtlasAsset.cs      |  0
 .../{src => Plugins/Spine}/AtlasAsset.cs.meta |  0
 .../Spine}/SkeletonComponent.cs               |  0
 .../Spine}/SkeletonComponent.cs.meta          |  0
 .../Spine}/SkeletonDataAsset.cs               |  0
 .../Spine}/SkeletonDataAsset.cs.meta          |  0
 .../{src => Plugins/Spine}/spine-csharp.meta  |  0
 .../spine-csharp/Place spine-csharp here.txt  |  0
 spine-unity/Assets/Shaders.meta               |  4 +++
 .../Resources => Shaders}/Skeleton.shader     |  0
 .../Skeleton.shader.meta                      |  0
 26 files changed, 45 insertions(+), 19 deletions(-)
 create mode 100644 spine-csharp/spine-csharp.sln
 rename spine-unity/Assets/{src.meta => Plugins.meta} (56%)
 rename spine-unity/Assets/{src => Plugins}/Editor.meta (56%)
 rename spine-unity/Assets/{src/Resources.meta => Plugins/Editor/Spine.meta} (56%)
 rename spine-unity/Assets/{src/Editor => Plugins/Editor/Spine}/AtlasAssetInspector.cs (100%)
 rename spine-unity/Assets/{src/Editor => Plugins/Editor/Spine}/AtlasAssetInspector.cs.meta (100%)
 rename spine-unity/Assets/{src/Editor => Plugins/Editor/Spine}/Menus.cs (100%)
 rename spine-unity/Assets/{src/Editor => Plugins/Editor/Spine}/Menus.cs.meta (100%)
 rename spine-unity/Assets/{src/Editor => Plugins/Editor/Spine}/SkeletonComponentInspector.cs (100%)
 rename spine-unity/Assets/{src/Editor => Plugins/Editor/Spine}/SkeletonComponentInspector.cs.meta (100%)
 rename spine-unity/Assets/{src/Editor => Plugins/Editor/Spine}/SkeletonDataAssetInspector.cs (100%)
 rename spine-unity/Assets/{src/Editor => Plugins/Editor/Spine}/SkeletonDataAssetInspector.cs.meta (100%)
 create mode 100644 spine-unity/Assets/Plugins/Spine.meta
 rename spine-unity/Assets/{src => Plugins/Spine}/AtlasAsset.cs (100%)
 rename spine-unity/Assets/{src => Plugins/Spine}/AtlasAsset.cs.meta (100%)
 rename spine-unity/Assets/{src => Plugins/Spine}/SkeletonComponent.cs (100%)
 rename spine-unity/Assets/{src => Plugins/Spine}/SkeletonComponent.cs.meta (100%)
 rename spine-unity/Assets/{src => Plugins/Spine}/SkeletonDataAsset.cs (100%)
 rename spine-unity/Assets/{src => Plugins/Spine}/SkeletonDataAsset.cs.meta (100%)
 rename spine-unity/Assets/{src => Plugins/Spine}/spine-csharp.meta (100%)
 rename spine-unity/Assets/{src => Plugins/Spine}/spine-csharp/Place spine-csharp here.txt (100%)
 create mode 100644 spine-unity/Assets/Shaders.meta
 rename spine-unity/Assets/{src/Resources => Shaders}/Skeleton.shader (100%)
 rename spine-unity/Assets/{src/Resources => Shaders}/Skeleton.shader.meta (100%)

diff --git a/.gitignore b/.gitignore
index c7100f29c..3e754f03c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,7 @@ spine-unity/Assets/src/spine-csharp/*
 spine-unity/ProjectSettings
 spine-unity/Temp
 spine-unity/Library
+*.userprefs
+*.pidb
+Assembly-*.csproj
+Assembly-*.pidb
diff --git a/spine-csharp/spine-csharp.csproj b/spine-csharp/spine-csharp.csproj
index 65297ac44..5051990ac 100644
--- a/spine-csharp/spine-csharp.csproj
+++ b/spine-csharp/spine-csharp.csproj
@@ -1,15 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectGuid>{94144E22-2431-4A8F-AC04-DEC22F7EDD8F}</ProjectGuid>
-    <ProjectTypeGuids>{6D335F3A-9D43-41b4-9D22-F6F17C4BE596};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spine</RootNamespace>
     <AssemblyName>spine-csharp</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <XnaFrameworkVersion>v4.0</XnaFrameworkVersion>
     <XnaPlatform>Windows</XnaPlatform>
@@ -43,19 +44,12 @@
     <XnaCompressContent>true</XnaCompressContent>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="mscorlib">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System">
-      <Private>False</Private>
-    </Reference>
+    <Reference Include="mscorlib" />
+    <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Net">
-      <Private>False</Private>
     </Reference>
+    <Reference Include="System.Net" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -81,11 +75,11 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\Microsoft.Xna.GameStudio.targets" />
   <!--
-      To modify your build process, add your task inside one of the targets below and uncomment it. 
+      To modify your build process, add your task inside one of the targets below and uncomment it.
       Other similar extension points exist, see Microsoft.Common.targets.
       <Target Name="BeforeBuild">
       </Target>
       <Target Name="AfterBuild">
       </Target>
     -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/spine-csharp/spine-csharp.sln b/spine-csharp/spine-csharp.sln
new file mode 100644
index 000000000..6a1ff3fb5
--- /dev/null
+++ b/spine-csharp/spine-csharp.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "spine-csharp", "spine-csharp.csproj", "{E27CE91F-0B52-4A75-BE98-2FC2A8994CCE}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x86 = Debug|x86
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{E27CE91F-0B52-4A75-BE98-2FC2A8994CCE}.Debug|x86.ActiveCfg = Debug|x86
+		{E27CE91F-0B52-4A75-BE98-2FC2A8994CCE}.Debug|x86.Build.0 = Debug|x86
+		{E27CE91F-0B52-4A75-BE98-2FC2A8994CCE}.Release|x86.ActiveCfg = Release|x86
+		{E27CE91F-0B52-4A75-BE98-2FC2A8994CCE}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = spine-csharp.csproj
+	EndGlobalSection
+EndGlobal
diff --git a/spine-unity/Assets/src.meta b/spine-unity/Assets/Plugins.meta
similarity index 56%
rename from spine-unity/Assets/src.meta
rename to spine-unity/Assets/Plugins.meta
index 97dc442fe..5ff654631 100644
--- a/spine-unity/Assets/src.meta
+++ b/spine-unity/Assets/Plugins.meta
@@ -1,4 +1,4 @@
 fileFormatVersion: 2
-guid: 169f112a58a7a014eb09b87c01e426dd
+guid: 89dad76e10ea944ee9f29109535294be
 DefaultImporter:
   userData: 
diff --git a/spine-unity/Assets/src/Editor.meta b/spine-unity/Assets/Plugins/Editor.meta
similarity index 56%
rename from spine-unity/Assets/src/Editor.meta
rename to spine-unity/Assets/Plugins/Editor.meta
index e78311055..a7344dfce 100644
--- a/spine-unity/Assets/src/Editor.meta
+++ b/spine-unity/Assets/Plugins/Editor.meta
@@ -1,4 +1,4 @@
 fileFormatVersion: 2
-guid: f65f926cf250c204a9658087bc501fab
+guid: 65ba3309ea8c447678ade95f3fa398da
 DefaultImporter:
   userData: 
diff --git a/spine-unity/Assets/src/Resources.meta b/spine-unity/Assets/Plugins/Editor/Spine.meta
similarity index 56%
rename from spine-unity/Assets/src/Resources.meta
rename to spine-unity/Assets/Plugins/Editor/Spine.meta
index b9b7e85e4..3078e89c1 100644
--- a/spine-unity/Assets/src/Resources.meta
+++ b/spine-unity/Assets/Plugins/Editor/Spine.meta
@@ -1,4 +1,4 @@
 fileFormatVersion: 2
-guid: 411b02e44c34aea459ea6ef154df73d4
+guid: 3ac78ae082927411cba77d73efde27d4
 DefaultImporter:
   userData: 
diff --git a/spine-unity/Assets/src/Editor/AtlasAssetInspector.cs b/spine-unity/Assets/Plugins/Editor/Spine/AtlasAssetInspector.cs
similarity index 100%
rename from spine-unity/Assets/src/Editor/AtlasAssetInspector.cs
rename to spine-unity/Assets/Plugins/Editor/Spine/AtlasAssetInspector.cs
diff --git a/spine-unity/Assets/src/Editor/AtlasAssetInspector.cs.meta b/spine-unity/Assets/Plugins/Editor/Spine/AtlasAssetInspector.cs.meta
similarity index 100%
rename from spine-unity/Assets/src/Editor/AtlasAssetInspector.cs.meta
rename to spine-unity/Assets/Plugins/Editor/Spine/AtlasAssetInspector.cs.meta
diff --git a/spine-unity/Assets/src/Editor/Menus.cs b/spine-unity/Assets/Plugins/Editor/Spine/Menus.cs
similarity index 100%
rename from spine-unity/Assets/src/Editor/Menus.cs
rename to spine-unity/Assets/Plugins/Editor/Spine/Menus.cs
diff --git a/spine-unity/Assets/src/Editor/Menus.cs.meta b/spine-unity/Assets/Plugins/Editor/Spine/Menus.cs.meta
similarity index 100%
rename from spine-unity/Assets/src/Editor/Menus.cs.meta
rename to spine-unity/Assets/Plugins/Editor/Spine/Menus.cs.meta
diff --git a/spine-unity/Assets/src/Editor/SkeletonComponentInspector.cs b/spine-unity/Assets/Plugins/Editor/Spine/SkeletonComponentInspector.cs
similarity index 100%
rename from spine-unity/Assets/src/Editor/SkeletonComponentInspector.cs
rename to spine-unity/Assets/Plugins/Editor/Spine/SkeletonComponentInspector.cs
diff --git a/spine-unity/Assets/src/Editor/SkeletonComponentInspector.cs.meta b/spine-unity/Assets/Plugins/Editor/Spine/SkeletonComponentInspector.cs.meta
similarity index 100%
rename from spine-unity/Assets/src/Editor/SkeletonComponentInspector.cs.meta
rename to spine-unity/Assets/Plugins/Editor/Spine/SkeletonComponentInspector.cs.meta
diff --git a/spine-unity/Assets/src/Editor/SkeletonDataAssetInspector.cs b/spine-unity/Assets/Plugins/Editor/Spine/SkeletonDataAssetInspector.cs
similarity index 100%
rename from spine-unity/Assets/src/Editor/SkeletonDataAssetInspector.cs
rename to spine-unity/Assets/Plugins/Editor/Spine/SkeletonDataAssetInspector.cs
diff --git a/spine-unity/Assets/src/Editor/SkeletonDataAssetInspector.cs.meta b/spine-unity/Assets/Plugins/Editor/Spine/SkeletonDataAssetInspector.cs.meta
similarity index 100%
rename from spine-unity/Assets/src/Editor/SkeletonDataAssetInspector.cs.meta
rename to spine-unity/Assets/Plugins/Editor/Spine/SkeletonDataAssetInspector.cs.meta
diff --git a/spine-unity/Assets/Plugins/Spine.meta b/spine-unity/Assets/Plugins/Spine.meta
new file mode 100644
index 000000000..b0d5f2364
--- /dev/null
+++ b/spine-unity/Assets/Plugins/Spine.meta
@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: c6674329008ae4c65a7b7e8f1b2a6523
+DefaultImporter:
+  userData: 
diff --git a/spine-unity/Assets/src/AtlasAsset.cs b/spine-unity/Assets/Plugins/Spine/AtlasAsset.cs
similarity index 100%
rename from spine-unity/Assets/src/AtlasAsset.cs
rename to spine-unity/Assets/Plugins/Spine/AtlasAsset.cs
diff --git a/spine-unity/Assets/src/AtlasAsset.cs.meta b/spine-unity/Assets/Plugins/Spine/AtlasAsset.cs.meta
similarity index 100%
rename from spine-unity/Assets/src/AtlasAsset.cs.meta
rename to spine-unity/Assets/Plugins/Spine/AtlasAsset.cs.meta
diff --git a/spine-unity/Assets/src/SkeletonComponent.cs b/spine-unity/Assets/Plugins/Spine/SkeletonComponent.cs
similarity index 100%
rename from spine-unity/Assets/src/SkeletonComponent.cs
rename to spine-unity/Assets/Plugins/Spine/SkeletonComponent.cs
diff --git a/spine-unity/Assets/src/SkeletonComponent.cs.meta b/spine-unity/Assets/Plugins/Spine/SkeletonComponent.cs.meta
similarity index 100%
rename from spine-unity/Assets/src/SkeletonComponent.cs.meta
rename to spine-unity/Assets/Plugins/Spine/SkeletonComponent.cs.meta
diff --git a/spine-unity/Assets/src/SkeletonDataAsset.cs b/spine-unity/Assets/Plugins/Spine/SkeletonDataAsset.cs
similarity index 100%
rename from spine-unity/Assets/src/SkeletonDataAsset.cs
rename to spine-unity/Assets/Plugins/Spine/SkeletonDataAsset.cs
diff --git a/spine-unity/Assets/src/SkeletonDataAsset.cs.meta b/spine-unity/Assets/Plugins/Spine/SkeletonDataAsset.cs.meta
similarity index 100%
rename from spine-unity/Assets/src/SkeletonDataAsset.cs.meta
rename to spine-unity/Assets/Plugins/Spine/SkeletonDataAsset.cs.meta
diff --git a/spine-unity/Assets/src/spine-csharp.meta b/spine-unity/Assets/Plugins/Spine/spine-csharp.meta
similarity index 100%
rename from spine-unity/Assets/src/spine-csharp.meta
rename to spine-unity/Assets/Plugins/Spine/spine-csharp.meta
diff --git a/spine-unity/Assets/src/spine-csharp/Place spine-csharp here.txt b/spine-unity/Assets/Plugins/Spine/spine-csharp/Place spine-csharp here.txt
similarity index 100%
rename from spine-unity/Assets/src/spine-csharp/Place spine-csharp here.txt
rename to spine-unity/Assets/Plugins/Spine/spine-csharp/Place spine-csharp here.txt
diff --git a/spine-unity/Assets/Shaders.meta b/spine-unity/Assets/Shaders.meta
new file mode 100644
index 000000000..445001627
--- /dev/null
+++ b/spine-unity/Assets/Shaders.meta
@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: b41395738f68d4fbba8311d333db62b1
+DefaultImporter:
+  userData: 
diff --git a/spine-unity/Assets/src/Resources/Skeleton.shader b/spine-unity/Assets/Shaders/Skeleton.shader
similarity index 100%
rename from spine-unity/Assets/src/Resources/Skeleton.shader
rename to spine-unity/Assets/Shaders/Skeleton.shader
diff --git a/spine-unity/Assets/src/Resources/Skeleton.shader.meta b/spine-unity/Assets/Shaders/Skeleton.shader.meta
similarity index 100%
rename from spine-unity/Assets/src/Resources/Skeleton.shader.meta
rename to spine-unity/Assets/Shaders/Skeleton.shader.meta