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

Move DefineConstants="MONO" into OpenRA.Game.csproj.

Browse Source
This commit is contained in:
Paul Chote
2021-01-09 17:48:14 +00:00
committed by Matthias Mailänder
parent b486112c98
commit 15c926b6b9
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -72,7 +72,7 @@ OPENRA_UTILITY = ENGINE_DIR=".." $(MONO) --debug bin/OpenRA.Utility.dll
# #
all: all:
@command -v $(firstword $(MSBUILD)) >/dev/null || (echo "OpenRA requires the '$(MSBUILD)' tool provided by Mono >= 5.18."; exit 1) @command -v $(firstword $(MSBUILD)) >/dev/null || (echo "OpenRA requires the '$(MSBUILD)' tool provided by Mono >= 5.18."; exit 1)
@$(MSBUILD) -t:Build -restore -p:Configuration=Release -p:TargetPlatform=$(TARGETPLATFORM) -p:Mono=true -p:DefineConstants="MONO" @$(MSBUILD) -t:Build -restore -p:Configuration=Release -p:TargetPlatform=$(TARGETPLATFORM) -p:Mono=true
ifeq ($(TARGETPLATFORM), unix-generic) ifeq ($(TARGETPLATFORM), unix-generic)
@./configure-system-libraries.sh @./configure-system-libraries.sh
endif endif
@@ -86,7 +86,7 @@ clean:
check: check:
@echo @echo
@echo "Compiling in debug mode..." @echo "Compiling in debug mode..."
@$(MSBUILD) -t:build -restore -p:Configuration=Debug -p:TargetPlatform=$(TARGETPLATFORM) -p:Mono=true -p:DefineConstants="MONO" @$(MSBUILD) -t:build -restore -p:Configuration=Debug -p:TargetPlatform=$(TARGETPLATFORM) -p:Mono=true
@echo @echo
@echo "Checking for explicit interface violations..." @echo "Checking for explicit interface violations..."
@$(OPENRA_UTILITY) all --check-explicit-interfaces @$(OPENRA_UTILITY) all --check-explicit-interfaces

3
OpenRA.Game/OpenRA.Game.csproj
View File

@@ -31,6 +31,9 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<Optimize>false</Optimize> <Optimize>false</Optimize>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Mono)' != ''">
<DefineConstants>MONO</DefineConstants>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="OpenRA-Eluant" Version="1.0.17" /> <PackageReference Include="OpenRA-Eluant" Version="1.0.17" />
<PackageReference Include="OpenRA-Open.NAT" Version="1.0.0" /> <PackageReference Include="OpenRA-Open.NAT" Version="1.0.0" />

2
packaging/functions.sh
View File

@@ -34,7 +34,7 @@ install_assemblies_mono() {
rm -rf "${SRC_PATH}/OpenRA."*/obj rm -rf "${SRC_PATH}/OpenRA."*/obj
rm -rf "${SRC_PATH:?}/bin" rm -rf "${SRC_PATH:?}/bin"
msbuild -verbosity:m -nologo -t:Build -restore -p:Configuration=Release -p:TargetPlatform="${TARGETPLATFORM}" -p:Mono=true -p:DefineConstants="MONO" msbuild -verbosity:m -nologo -t:Build -restore -p:Configuration=Release -p:TargetPlatform="${TARGETPLATFORM}" -p:Mono=true
if [ "${TARGETPLATFORM}" = "unix-generic" ]; then if [ "${TARGETPLATFORM}" = "unix-generic" ]; then
./configure-system-libraries.sh ./configure-system-libraries.sh
fi fi