epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change target location for Mods.Cnc to mods/common

Browse Source
This commit is contained in:
reaperrr
2017-02-12 18:02:15 +01:00
parent a3aab6f051
commit 686b21c044
7 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -148,7 +148,7 @@ STD_MOD_DEPS = $(STD_MOD_LIBS)
# Command and Conquer # Command and Conquer
mod_cnc_SRCS := $(shell find OpenRA.Mods.Cnc/ -iname '*.cs') 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_KIND = library
mod_cnc_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET) mod_cnc_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET)
mod_cnc_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET) mod_cnc_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET)

8
OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
View File

@@ -165,21 +165,21 @@
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Target Name="AfterBuild"> <Target Name="AfterBuild">
<MakeDir Directories="$(SolutionDir)mods/cnc/"/> <MakeDir Directories="$(SolutionDir)mods/common/"/>
<Copy <Copy
SourceFiles="$(TargetPath)" 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. 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. Mono outputs a `.dll.mdb` so we can just append `.mdb` directly.
--> -->
<Copy <Copy
SourceFiles="$(TargetDir)$(TargetName).pdb" SourceFiles="$(TargetDir)$(TargetName).pdb"
DestinationFolder="$(SolutionDir)mods/cnc/" DestinationFolder="$(SolutionDir)mods/common/"
Condition="'$(OS)' == 'Windows_NT'"/> Condition="'$(OS)' == 'Windows_NT'"/>
<Copy <Copy
SourceFiles="$(TargetPath).mdb" SourceFiles="$(TargetPath).mdb"
DestinationFolder="$(SolutionDir)mods/cnc/" DestinationFolder="$(SolutionDir)mods/common/"
Condition="'$(OS)' == 'Unix'"/> Condition="'$(OS)' == 'Unix'"/>
<!-- Uncomment these lines when debugging or adding to this target <!-- Uncomment these lines when debugging or adding to this target
<Message Text="DEBUG OS: $(OS)"/> <Message Text="DEBUG OS: $(OS)"/>

2
mods/all/mod.yaml
View File

@@ -16,8 +16,8 @@ Chrome:
Assemblies: Assemblies:
./mods/common/OpenRA.Mods.Common.dll ./mods/common/OpenRA.Mods.Common.dll
./mods/common/OpenRA.Mods.Cnc.dll
./mods/d2k/OpenRA.Mods.D2k.dll ./mods/d2k/OpenRA.Mods.D2k.dll
./mods/cnc/OpenRA.Mods.Cnc.dll
ChromeLayout: ChromeLayout:

2
mods/cnc/mod.yaml
View File

@@ -88,7 +88,7 @@ Chrome:
Assemblies: Assemblies:
common|OpenRA.Mods.Common.dll common|OpenRA.Mods.Common.dll
cnc|OpenRA.Mods.Cnc.dll common|OpenRA.Mods.Cnc.dll
ChromeLayout: ChromeLayout:
cnc|chrome/mainmenu.yaml cnc|chrome/mainmenu.yaml

3
mods/d2k/mod.yaml
View File

@@ -14,7 +14,6 @@ Packages:
~^Content/d2k/v2/Music ~^Content/d2k/v2/Music
. .
$d2k: d2k $d2k: d2k
$cnc: cnc
./mods/common: common ./mods/common: common
~SOUND.RS ~SOUND.RS
@@ -63,7 +62,7 @@ Chrome:
Assemblies: Assemblies:
common|OpenRA.Mods.Common.dll common|OpenRA.Mods.Common.dll
cnc|OpenRA.Mods.Cnc.dll common|OpenRA.Mods.Cnc.dll
d2k|OpenRA.Mods.D2k.dll d2k|OpenRA.Mods.D2k.dll
ChromeLayout: ChromeLayout:

3
mods/ra/mod.yaml
View File

@@ -14,7 +14,6 @@ Packages:
~^Content/ra/v2/movies ~^Content/ra/v2/movies
. .
$ra: ra $ra: ra
$cnc: cnc
./mods/common: common ./mods/common: common
~main.mix ~main.mix
~conquer.mix ~conquer.mix
@@ -80,7 +79,7 @@ Chrome:
Assemblies: Assemblies:
common|OpenRA.Mods.Common.dll common|OpenRA.Mods.Common.dll
cnc|OpenRA.Mods.Cnc.dll common|OpenRA.Mods.Cnc.dll
ChromeLayout: ChromeLayout:
common|chrome/ingame.yaml common|chrome/ingame.yaml

4
mods/ts/mod.yaml
View File

@@ -13,8 +13,6 @@ Packages:
. .
$ts: ts $ts: ts
./mods/common: common ./mods/common: common
$ra: ra
$cnc: cnc
# Tiberian Sun # Tiberian Sun
~scores.mix ~scores.mix
@@ -126,7 +124,7 @@ Chrome:
Assemblies: Assemblies:
common|OpenRA.Mods.Common.dll common|OpenRA.Mods.Common.dll
cnc|OpenRA.Mods.Cnc.dll common|OpenRA.Mods.Cnc.dll
ChromeLayout: ChromeLayout:
common|chrome/ingame.yaml common|chrome/ingame.yaml