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

Switch to the newer Roslyn compiler on Linux/macOS.

Browse Source
This commit is contained in:
Paul Chote
2019-03-23 10:56:05 +00:00
committed by Oliver Brakmann
parent 5b00586de2
commit d53338ca5e
6 changed files with 7 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -38,7 +38,7 @@ script:
- sudo dpkg -i nsis_3.03-2_amd64.deb - sudo dpkg -i nsis_3.03-2_amd64.deb
- makensis -VERSION - makensis -VERSION
- travis_retry make all-dependencies - travis_retry make all-dependencies
- make all SDK="-sdk:4.5" - make all
- make check - make check
- make check-scripts - make check-scripts
- make test - make test

4
Makefile
View File

@@ -37,8 +37,8 @@
############################## TOOLCHAIN ############################### ############################## TOOLCHAIN ###############################
# #
CSC = mcs CSC = csc
CSFLAGS = -nologo -warn:4 -codepage:utf8 -langversion:5 -unsafe -warnaserror CSFLAGS = -nologo -warn:4 -langversion:5 -unsafe -warnaserror
DEFINE = TRACE DEFINE = TRACE
COMMON_LIBS = System.dll System.Core.dll System.Numerics.dll thirdparty/download/ICSharpCode.SharpZipLib.dll thirdparty/download/FuzzyLogicLibrary.dll thirdparty/download/MaxMind.Db.dll thirdparty/download/Eluant.dll thirdparty/download/rix0rrr.BeaconLib.dll COMMON_LIBS = System.dll System.Core.dll System.Numerics.dll thirdparty/download/ICSharpCode.SharpZipLib.dll thirdparty/download/FuzzyLogicLibrary.dll thirdparty/download/MaxMind.Db.dll thirdparty/download/Eluant.dll thirdparty/download/rix0rrr.BeaconLib.dll

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

@@ -194,18 +194,10 @@
<Copy <Copy
SourceFiles="$(TargetPath)" SourceFiles="$(TargetPath)"
DestinationFolder="$(SolutionDir)mods/common/"/> DestinationFolder="$(SolutionDir)mods/common/"/>
<!--
csc generates .pdb symbol files (not `.dll.pdb`).
mcs generates .dll.mdb symbol files.
-->
<Copy <Copy
SourceFiles="$(TargetDir)$(TargetName).pdb" SourceFiles="$(TargetDir)$(TargetName).pdb"
DestinationFolder="$(SolutionDir)mods/common/" DestinationFolder="$(SolutionDir)mods/common/"
Condition="Exists('$(TargetDir)$(TargetName).pdb')"/> Condition="Exists('$(TargetDir)$(TargetName).pdb')"/>
<Copy
SourceFiles="$(TargetPath).mdb"
DestinationFolder="$(SolutionDir)mods/common/"
Condition="Exists('$(TargetPath).mdb')"/>
<!-- 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)"/>
<Message Text="DEBUG SolutionDir: $(SolutionDir)"/> <Message Text="DEBUG SolutionDir: $(SolutionDir)"/>

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

@@ -976,18 +976,10 @@
<Copy <Copy
SourceFiles="$(TargetPath)" SourceFiles="$(TargetPath)"
DestinationFolder="$(SolutionDir)mods/common/"/> DestinationFolder="$(SolutionDir)mods/common/"/>
<!--
csc generates .pdb symbol files (not `.dll.pdb`).
mcs generates .dll.mdb symbol files.
-->
<Copy <Copy
SourceFiles="$(TargetDir)$(TargetName).pdb" SourceFiles="$(TargetDir)$(TargetName).pdb"
DestinationFolder="$(SolutionDir)mods/common/" DestinationFolder="$(SolutionDir)mods/common/"
Condition="Exists('$(TargetDir)$(TargetName).pdb')"/> Condition="Exists('$(TargetDir)$(TargetName).pdb')"/>
<Copy
SourceFiles="$(TargetPath).mdb"
DestinationFolder="$(SolutionDir)mods/common/"
Condition="Exists('$(TargetPath).mdb')"/>
<!-- 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)"/>
<Message Text="DEBUG SolutionDir: $(SolutionDir)"/> <Message Text="DEBUG SolutionDir: $(SolutionDir)"/>

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

@@ -118,18 +118,10 @@
<Copy <Copy
SourceFiles="$(TargetPath)" SourceFiles="$(TargetPath)"
DestinationFolder="$(SolutionDir)mods/d2k/"/> DestinationFolder="$(SolutionDir)mods/d2k/"/>
<!--
csc generates .pdb symbol files (not `.dll.pdb`).
mcs generates .dll.mdb symbol files.
-->
<Copy <Copy
SourceFiles="$(TargetDir)$(TargetName).pdb" SourceFiles="$(TargetDir)$(TargetName).pdb"
DestinationFolder="$(SolutionDir)mods/d2k/" DestinationFolder="$(SolutionDir)mods/d2k/"
Condition="Exists('$(TargetDir)$(TargetName).pdb')"/> Condition="Exists('$(TargetDir)$(TargetName).pdb')"/>
<Copy
SourceFiles="$(TargetPath).mdb"
DestinationFolder="$(SolutionDir)mods/d2k/"
Condition="Exists('$(TargetPath).mdb')"/>
<!-- 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)"/>
<Message Text="DEBUG SolutionDir: $(SolutionDir)"/> <Message Text="DEBUG SolutionDir: $(SolutionDir)"/>

2
packaging/windows/buildpackage.sh
View File

@@ -30,7 +30,7 @@ fi
function makelauncher() function makelauncher()
{ {
sed "s|DISPLAY_NAME|$2|" WindowsLauncher.cs.in | sed "s|MOD_ID|$3|" | sed "s|FAQ_URL|${FAQ_URL}|" > WindowsLauncher.cs sed "s|DISPLAY_NAME|$2|" WindowsLauncher.cs.in | sed "s|MOD_ID|$3|" | sed "s|FAQ_URL|${FAQ_URL}|" > WindowsLauncher.cs
mcs WindowsLauncher.cs -warn:4 -codepage:utf8 -warnaserror -out:"$1" -t:winexe ${LAUNCHER_LIBS} -win32icon:"$4" csc WindowsLauncher.cs -warn:4 -warnaserror -out:"$1" -t:winexe ${LAUNCHER_LIBS} -win32icon:"$4"
rm WindowsLauncher.cs rm WindowsLauncher.cs
mono "${SRCDIR}/fixheader.exe" "$1" > /dev/null mono "${SRCDIR}/fixheader.exe" "$1" > /dev/null
} }