Change target location for Mods.Cnc to mods/common

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)

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)"/>

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:
 

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

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:

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

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