From 686b21c044e2f80b86a990cbbe0e7c09e3a1c328 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Sun, 12 Feb 2017 18:02:15 +0100
Subject: [PATCH] Change target location for Mods.Cnc to mods/common

---
 Makefile                               | 2 +-
 OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj | 8 ++++----
 mods/all/mod.yaml                      | 2 +-
 mods/cnc/mod.yaml                      | 2 +-
 mods/d2k/mod.yaml                      | 3 +--
 mods/ra/mod.yaml                       | 3 +--
 mods/ts/mod.yaml                       | 4 +---
 7 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index ef8b85bc0d..1dcda999e9 100644
--- a/Makefile
+++ b/Makefile
@@ -148,7 +148,7 @@ STD_MOD_DEPS	= $(STD_MOD_LIBS)
 
 # Command and Conquer
 mod_cnc_SRCS := $(shell find OpenRA.Mods.Cnc/ -iname '*.cs')
-mod_cnc_TARGET = mods/cnc/OpenRA.Mods.Cnc.dll
+mod_cnc_TARGET = mods/common/OpenRA.Mods.Cnc.dll
 mod_cnc_KIND = library
 mod_cnc_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET)
 mod_cnc_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET)
diff --git a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
index 55129da5df..e9de67301b 100644
--- a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
+++ b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
@@ -165,21 +165,21 @@
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Target Name="AfterBuild">
-    <MakeDir Directories="$(SolutionDir)mods/cnc/"/>
+    <MakeDir Directories="$(SolutionDir)mods/common/"/>
     <Copy
       SourceFiles="$(TargetPath)"
-      DestinationFolder="$(SolutionDir)mods/cnc/"/>
+      DestinationFolder="$(SolutionDir)mods/common/"/>
     <!--
         We need to copy OpenRA.Mods.Cnc.pdb (not `.dll.pdb`). This is only necessary on Windows.
         Mono outputs a `.dll.mdb` so we can just append `.mdb` directly.
     -->
     <Copy
       SourceFiles="$(TargetDir)$(TargetName).pdb"
-      DestinationFolder="$(SolutionDir)mods/cnc/"
+      DestinationFolder="$(SolutionDir)mods/common/"
       Condition="'$(OS)' == 'Windows_NT'"/>
     <Copy
       SourceFiles="$(TargetPath).mdb"
-      DestinationFolder="$(SolutionDir)mods/cnc/"
+      DestinationFolder="$(SolutionDir)mods/common/"
       Condition="'$(OS)' == 'Unix'"/>
     <!-- Uncomment these lines when debugging or adding to this target
     <Message Text="DEBUG OS:                     $(OS)"/>
diff --git a/mods/all/mod.yaml b/mods/all/mod.yaml
index 5a24940a90..decae77587 100644
--- a/mods/all/mod.yaml
+++ b/mods/all/mod.yaml
@@ -16,8 +16,8 @@ Chrome:
 
 Assemblies:
 	./mods/common/OpenRA.Mods.Common.dll
+	./mods/common/OpenRA.Mods.Cnc.dll
 	./mods/d2k/OpenRA.Mods.D2k.dll
-	./mods/cnc/OpenRA.Mods.Cnc.dll
 
 ChromeLayout:
 
diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml
index 8564297371..9b5bf204df 100644
--- a/mods/cnc/mod.yaml
+++ b/mods/cnc/mod.yaml
@@ -88,7 +88,7 @@ Chrome:
 
 Assemblies:
 	common|OpenRA.Mods.Common.dll
-	cnc|OpenRA.Mods.Cnc.dll
+	common|OpenRA.Mods.Cnc.dll
 
 ChromeLayout:
 	cnc|chrome/mainmenu.yaml
diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml
index 8ac3d1efa6..0ddd51c470 100644
--- a/mods/d2k/mod.yaml
+++ b/mods/d2k/mod.yaml
@@ -14,7 +14,6 @@ Packages:
 	~^Content/d2k/v2/Music
 	.
 	$d2k: d2k
-	$cnc: cnc
 	./mods/common: common
 
 	~SOUND.RS
@@ -63,7 +62,7 @@ Chrome:
 
 Assemblies:
 	common|OpenRA.Mods.Common.dll
-	cnc|OpenRA.Mods.Cnc.dll
+	common|OpenRA.Mods.Cnc.dll
 	d2k|OpenRA.Mods.D2k.dll
 
 ChromeLayout:
diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml
index 2e0e935c22..757119d44d 100644
--- a/mods/ra/mod.yaml
+++ b/mods/ra/mod.yaml
@@ -14,7 +14,6 @@ Packages:
 	~^Content/ra/v2/movies
 	.
 	$ra: ra
-	$cnc: cnc
 	./mods/common: common
 	~main.mix
 	~conquer.mix
@@ -80,7 +79,7 @@ Chrome:
 
 Assemblies:
 	common|OpenRA.Mods.Common.dll
-	cnc|OpenRA.Mods.Cnc.dll
+	common|OpenRA.Mods.Cnc.dll
 
 ChromeLayout:
 	common|chrome/ingame.yaml
diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml
index 023069b9f5..469e2076d5 100644
--- a/mods/ts/mod.yaml
+++ b/mods/ts/mod.yaml
@@ -13,8 +13,6 @@ Packages:
 	.
 	$ts: ts
 	./mods/common: common
-	$ra: ra
-	$cnc: cnc
 
 # Tiberian Sun
 	~scores.mix
@@ -126,7 +124,7 @@ Chrome:
 
 Assemblies:
 	common|OpenRA.Mods.Common.dll
-	cnc|OpenRA.Mods.Cnc.dll
+	common|OpenRA.Mods.Cnc.dll
 
 ChromeLayout:
 	common|chrome/ingame.yaml