Skip to content

Commit 4d72b7a

Browse files
[General] Solution changes and some settings. Created Master.slnx to create code that is distributed from a single solution. Does NOT include VSIntegration.
1 parent 715dd3c commit 4d72b7a

6 files changed

Lines changed: 359 additions & 40 deletions

File tree

src/Compiler.slnx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
<File Path="Common/set.xh" />
6161
<File Path="Common/version.Targets" />
6262
<File Path="Common/version.xh" />
63-
<File Path="Common/VFPProperties.xh" />
6463
<File Path="Common/XbasePPCmd.xh" />
6564
<File Path="Common/XSharp.snk" />
6665
<File Path="Common/XSharpConstants.cs" />

src/Compiler/src/Compiler/XSharpBuildTask/XSharp.BeforeCommon.Props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ Copyright (C) XSharp BV. All rights reserved.
2525
<XSharpMsBuildDir Condition="'$(XSharpMsBuildDir)' == '' and '$(MSBuildExtensionsPath64)'!='' " >$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\XSharpBV\XSharp@XSharpPath)\MsBuild</XSharpMsBuildDir>
2626
<XSharpMsBuildDir Condition="'$(XSharpMsBuildDir)' == ''" >$(MSBuildProgramFiles32)\XSharp\MsBuild</XSharpMsBuildDir>
2727
<LanguageTargets Condition="'$(LanguageTargets )' == ''" >$(XSharpMsBuildDir)\XSharp.Common.targets</LanguageTargets>
28-
<TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
29-
<GenerateSupportedOSPlatformAttribute>false</GenerateSupportedOSPlatformAttribute>
28+
<TargetPlatformIdentifier Condition="'$(TargetPlatformIdentifier)' == ''">Windows</TargetPlatformIdentifier>
29+
<GenerateSupportedOSPlatformAttribute Condition="'$(GenerateSupportedOSPlatformAttribute)' == ''">false</GenerateSupportedOSPlatformAttribute>
3030
<XsMSBuildManagedFolder>$(MSBuildExtensionsPath)\Microsoft\VisualStudio\Managed</XsMSBuildManagedFolder>
3131
</PropertyGroup>
3232
<Import Condition="'$(MSBuildProjectExtension)' == '.xsproj' and '$(XSharpDefaultProps)' == '' " Project="$(XSharpMsBuildDir)\XSharp.Props" />

0 commit comments

Comments
 (0)