From 73321eceb96f263f10857667d7b3726a5098e770 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 17 Mar 2021 20:36:31 -0400
Subject: split compile flag into separate Windows + XNA flags (#767)

---
 src/SMAPI/Framework/InternalExtensions.cs |  2 +-
 src/SMAPI/Framework/SCore.cs              |  4 ++--
 src/SMAPI/SMAPI.csproj                    | 17 ++++++++++-------
 3 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'src/SMAPI')

diff --git a/src/SMAPI/Framework/InternalExtensions.cs b/src/SMAPI/Framework/InternalExtensions.cs
index ba1879da..449aa2b7 100644
--- a/src/SMAPI/Framework/InternalExtensions.cs
+++ b/src/SMAPI/Framework/InternalExtensions.cs
@@ -181,7 +181,7 @@ namespace StardewModdingAPI.Framework
         {
             // get field name
             const string fieldName =
-#if SMAPI_FOR_WINDOWS
+#if SMAPI_FOR_XNA
                 "inBeginEndPair";
 #else
                 "_beginCalled";
diff --git a/src/SMAPI/Framework/SCore.cs b/src/SMAPI/Framework/SCore.cs
index e98dc04c..c758a793 100644
--- a/src/SMAPI/Framework/SCore.cs
+++ b/src/SMAPI/Framework/SCore.cs
@@ -12,7 +12,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Xna.Framework;
-#if SMAPI_FOR_WINDOWS
+#if SMAPI_FOR_XNA
 using System.Windows.Forms;
 #endif
 using Newtonsoft.Json;
@@ -217,7 +217,7 @@ namespace StardewModdingAPI.Framework
                     this.Toolkit.JsonHelper.JsonSettings.Converters.Add(converter);
 
                 // add error handlers
-#if SMAPI_FOR_WINDOWS
+#if SMAPI_FOR_XNA
                 Application.ThreadException += (sender, e) => this.Monitor.Log($"Critical thread exception: {e.Exception.GetLogSummary()}", LogLevel.Error);
                 Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException);
 #endif
diff --git a/src/SMAPI/SMAPI.csproj b/src/SMAPI/SMAPI.csproj
index 6344cb2f..ceef33df 100644
--- a/src/SMAPI/SMAPI.csproj
+++ b/src/SMAPI/SMAPI.csproj
@@ -12,6 +12,8 @@
     <ApplicationIcon>icon.ico</ApplicationIcon>
   </PropertyGroup>
 
+  <Import Project="..\..\build\common.targets" />
+
   <ItemGroup>
     <PackageReference Include="LargeAddressAware" Version="1.0.5" />
     <PackageReference Include="Mono.Cecil" Version="0.11.3" />
@@ -30,20 +32,22 @@
     <Reference Include="xTile" HintPath="$(GamePath)\xTile.dll" Private="False" />
   </ItemGroup>
 
+  <!-- Windows only -->
+  <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
+    <Reference Include="Netcode" HintPath="$(GamePath)\Netcode.dll" Private="False" />
+    <Reference Include="System.Windows.Forms" />
+  </ItemGroup>
+
+  <!-- Game framework -->
   <Choose>
-    <!-- Windows -->
-    <When Condition="$(OS) == 'Windows_NT'">
+    <When Condition="$(DefineConstants.Contains(SMAPI_FOR_XNA))">
       <ItemGroup>
-        <Reference Include="Netcode" HintPath="$(GamePath)\Netcode.dll" Private="False" />
         <Reference Include="Microsoft.Xna.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" Private="False" />
         <Reference Include="Microsoft.Xna.Framework.Game, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" Private="False" />
         <Reference Include="Microsoft.Xna.Framework.Graphics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" Private="False" />
         <Reference Include="Microsoft.Xna.Framework.Xact, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" Private="False" />
-        <Reference Include="System.Windows.Forms" />
       </ItemGroup>
     </When>
-
-    <!-- Linux/Mac -->
     <Otherwise>
       <ItemGroup>
         <Reference Include="MonoGame.Framework" HintPath="$(GamePath)\MonoGame.Framework.dll" Private="False" />
@@ -67,5 +71,4 @@
   </ItemGroup>
 
   <Import Project="..\SMAPI.Internal\SMAPI.Internal.projitems" Label="Shared" />
-  <Import Project="..\..\build\common.targets" />
 </Project>
-- 
cgit