Commit a89685e
dse
PYTHONNET_WIN_DEFINE_CONSTANTS and PYTHONNET_MONO_DEFINE_CONSTANTS introduced. + Fix for building mono versions under windows.
1 parent f4a6608 commit a89685e
1 file changed
Lines changed: 13 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -33,49 +33,53 @@ | |||
| 33 | 33 | <Python2Version Condition="'$(Python2Version)'==''">PYTHON27</Python2Version> | |
| 34 | 34 | <Python3Version>$(PYTHONNET_PY3_VERSION)</Python3Version> | |
| 35 | 35 | <Python3Version Condition="'$(Python3Version)'==''">PYTHON36</Python3Version> | |
| 36 | + <PythonWinDefineConstants>$(PYTHONNET_WIN_DEFINE_CONSTANTS)</PythonWinDefineConstants> | ||
| 37 | + <PythonWinDefineConstants Condition="'$(PythonWinDefineConstants)'==''">UCS2</PythonWinDefineConstants> | ||
| 38 | + <PythonMonoDefineConstants>$(PYTHONNET_MONO_DEFINE_CONSTANTS)</PythonMonoDefineConstants> | ||
| 39 | + <PythonMonoDefineConstants Condition="'$(PythonMonoDefineConstants)'==''">UCS4;MONO_LINUX;PYTHON_WITH_PYMALLOC</PythonMonoDefineConstants> | ||
| 36 | 40 | </PropertyGroup> | |
| 37 | 41 | ||
| 38 | 42 | <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'"> | |
| 39 | - <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);UCS4</DefineConstants> | ||
| 43 | + <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);$(PythonMonoDefineConstants)</DefineConstants> | ||
| 40 | 44 | <Optimize>true</Optimize> | |
| 41 | 45 | <DebugType>pdbonly</DebugType> | |
| 42 | 46 | </PropertyGroup> | |
| 43 | 47 | <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'"> | |
| 44 | - <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);UCS4</DefineConstants> | ||
| 48 | + <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);$(PythonMonoDefineConstants)</DefineConstants> | ||
| 45 | 49 | <Optimize>true</Optimize> | |
| 46 | 50 | <DebugType>pdbonly</DebugType> | |
| 47 | 51 | </PropertyGroup> | |
| 48 | 52 | <PropertyGroup Condition=" '$(Configuration)' == 'DebugMono'"> | |
| 49 | 53 | <DebugSymbols>true</DebugSymbols> | |
| 50 | - <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);UCS4;TRACE;DEBUG</DefineConstants> | ||
| 54 | + <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);$(PythonMonoDefineConstants);TRACE;DEBUG</DefineConstants> | ||
| 51 | 55 | <Optimize>false</Optimize> | |
| 52 | 56 | <DebugType>full</DebugType> | |
| 53 | 57 | </PropertyGroup> | |
| 54 | 58 | <PropertyGroup Condition=" '$(Configuration)' == 'DebugMonoPY3'"> | |
| 55 | 59 | <DebugSymbols>true</DebugSymbols> | |
| 56 | - <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);UCS4;TRACE;DEBUG</DefineConstants> | ||
| 60 | + <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);$(PythonMonoDefineConstants);TRACE;DEBUG</DefineConstants> | ||
| 57 | 61 | <Optimize>false</Optimize> | |
| 58 | 62 | <DebugType>full</DebugType> | |
| 59 | 63 | </PropertyGroup> | |
| 60 | 64 | <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'"> | |
| 61 | - <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);UCS2</DefineConstants> | ||
| 65 | + <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);$(PythonWinDefineConstants)</DefineConstants> | ||
| 62 | 66 | <Optimize>true</Optimize> | |
| 63 | 67 | <DebugType>pdbonly</DebugType> | |
| 64 | 68 | </PropertyGroup> | |
| 65 | 69 | <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'"> | |
| 66 | - <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);UCS2</DefineConstants> | ||
| 70 | + <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);$(PythonWinDefineConstants)</DefineConstants> | ||
| 67 | 71 | <Optimize>true</Optimize> | |
| 68 | 72 | <DebugType>pdbonly</DebugType> | |
| 69 | 73 | </PropertyGroup> | |
| 70 | 74 | <PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'"> | |
| 71 | 75 | <DebugSymbols>true</DebugSymbols> | |
| 72 | - <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);UCS2;TRACE;DEBUG</DefineConstants> | ||
| 76 | + <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);$(PythonWinDefineConstants);TRACE;DEBUG</DefineConstants> | ||
| 73 | 77 | <Optimize>false</Optimize> | |
| 74 | 78 | <DebugType>full</DebugType> | |
| 75 | 79 | </PropertyGroup> | |
| 76 | 80 | <PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'"> | |
| 77 | 81 | <DebugSymbols>true</DebugSymbols> | |
| 78 | - <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);UCS2;TRACE;DEBUG</DefineConstants> | ||
| 82 | + <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);$(PythonWinDefineConstants);TRACE;DEBUG</DefineConstants> | ||
| 79 | 83 | <Optimize>false</Optimize> | |
| 80 | 84 | <DebugType>full</DebugType> | |
| 81 | 85 | </PropertyGroup> | |
@@ -107,7 +111,7 @@ | |||
| 107 | 111 | <Reference Include="Microsoft.CSharp" /> | |
| 108 | 112 | </ItemGroup> | |
| 109 | 113 | ||
| 110 | - <ItemGroup Condition="'$(TargetFramework)'=='net40' AND $(Configuration.Contains('Mono'))"> | ||
| 114 | + <ItemGroup Condition="'$(TargetFramework)'=='net40'"> | ||
| 111 | 115 | <PackageReference Include="Microsoft.TargetingPack.NETFramework.v4.5" Version="1.0.1" ExcludeAssets="All" PrivateAssets="All" /> | |
| 112 | 116 | </ItemGroup> | |
| 113 | 117 | ||
0 commit comments