X Tutup
Skip to content

Commit a89685e

Browse files
author
dse
committed
PYTHONNET_WIN_DEFINE_CONSTANTS and PYTHONNET_MONO_DEFINE_CONSTANTS introduced. + Fix for building mono versions under windows.
1 parent f4a6608 commit a89685e

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

‎src/runtime/Python.Runtime.15.csproj‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,49 +33,53 @@
3333
<Python2Version Condition="'$(Python2Version)'==''">PYTHON27</Python2Version>
3434
<Python3Version>$(PYTHONNET_PY3_VERSION)</Python3Version>
3535
<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>
3640
</PropertyGroup>
3741

3842
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
39-
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);UCS4</DefineConstants>
43+
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);$(PythonMonoDefineConstants)</DefineConstants>
4044
<Optimize>true</Optimize>
4145
<DebugType>pdbonly</DebugType>
4246
</PropertyGroup>
4347
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'">
44-
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);UCS4</DefineConstants>
48+
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);$(PythonMonoDefineConstants)</DefineConstants>
4549
<Optimize>true</Optimize>
4650
<DebugType>pdbonly</DebugType>
4751
</PropertyGroup>
4852
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMono'">
4953
<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>
5155
<Optimize>false</Optimize>
5256
<DebugType>full</DebugType>
5357
</PropertyGroup>
5458
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMonoPY3'">
5559
<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>
5761
<Optimize>false</Optimize>
5862
<DebugType>full</DebugType>
5963
</PropertyGroup>
6064
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'">
61-
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);UCS2</DefineConstants>
65+
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);$(PythonWinDefineConstants)</DefineConstants>
6266
<Optimize>true</Optimize>
6367
<DebugType>pdbonly</DebugType>
6468
</PropertyGroup>
6569
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
66-
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);UCS2</DefineConstants>
70+
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);$(PythonWinDefineConstants)</DefineConstants>
6771
<Optimize>true</Optimize>
6872
<DebugType>pdbonly</DebugType>
6973
</PropertyGroup>
7074
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
7175
<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>
7377
<Optimize>false</Optimize>
7478
<DebugType>full</DebugType>
7579
</PropertyGroup>
7680
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'">
7781
<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>
7983
<Optimize>false</Optimize>
8084
<DebugType>full</DebugType>
8185
</PropertyGroup>
@@ -107,7 +111,7 @@
107111
<Reference Include="Microsoft.CSharp" />
108112
</ItemGroup>
109113

110-
<ItemGroup Condition="'$(TargetFramework)'=='net40' AND $(Configuration.Contains('Mono'))">
114+
<ItemGroup Condition="'$(TargetFramework)'=='net40'">
111115
<PackageReference Include="Microsoft.TargetingPack.NETFramework.v4.5" Version="1.0.1" ExcludeAssets="All" PrivateAssets="All" />
112116
</ItemGroup>
113117

0 commit comments

Comments
 (0)
X Tutup