stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-11-24 21:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixes for non-Windows platforms (#371 by alexey-lysiuk)

Browse source
This commit is contained in:
alexey.lysiuk 2020-03-17 21:37:58 +02:00 committed by GitHub
parent 29b30a3dcc
commit 127aff5cc4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 352 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
.github/workflows/continuous_integration_other.yml vendored Normal file
View file

@ -0,0 +1,68 @@
name: Continuous Integration - Other
on: [push, pull_request]
jobs:
build:
name: ${{ matrix.config.name }}
runs-on: ${{ matrix.config.os }}
strategy:
fail-fast: false
matrix:
config:
- {
name: "macOS",
os: macos-latest
}
- {
name: "Linux",
os: ubuntu-latest
}
steps:
- uses: actions/checkout@v1
- name: Build
run: |
if [[ "${{ runner.os }}" == 'macOS' ]]; then
make mac
elif [[ "${{ runner.os }}" == 'Linux' ]]; then
sudo apt install mesa-common-dev
make linux
fi
- name: Test Files Presence
run: |
FILES=( \
Build/Builder.exe \
Build/libBuilderNative.so \
Build/Plugins/AutomapMode.dll \
Build/Plugins/BuilderEffects.dll \
Build/Plugins/BuilderModes.dll \
Build/Plugins/ColorPicker.dll \
Build/Plugins/CommentsPanel.dll \
Build/Plugins/NodesViewer.dll \
Build/Plugins/SoundPropagationMode.dll \
Build/Plugins/StairSectorBuilder.dll \
Build/Plugins/TagExplorer.dll \
Build/Plugins/TagRange.dll \
Build/Plugins/ThreeDFloorMode.dll \
Build/Plugins/VisplaneExplorer.dll \
)
for filename in "${FILES[@]}"; do
if [ ! -f $filename ]; then
echo "ERROR: File $filename is missing"
exit 1
fi
done
- name: Prepare Package
run: |
# Delete unwanted files
rm -r Build/Setup
- name: Upload Package
uses: actions/upload-artifact@v1
with:
path: Build
name: "UDB_${{ matrix.config.name }}"

2
.github/workflows/continuous_integration.yml → .github/workflows/continuous_integration_windows.yml vendored
View file

@ -1,4 +1,4 @@
name: Continuous Integration
name: Continuous Integration - Windows
on: [push, pull_request]

18
BuilderMono.sln
View file

@ -30,6 +30,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StairSectorBuilder", "Sourc
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutomapMode", "Source\Plugins\AutomapMode\AutomapModeMono.csproj", "{B33F68D5-1335-400C-A1D7-7F5602A030EF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThreeDFloorMode", "Source\Plugins\3DFloorMode\ThreeDFloorModeMono.csproj", "{88CFD996-027B-4CBE-9828-26B2728B6127}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug + Profiler|x64 = Debug + Profiler|x64
@ -234,6 +236,22 @@ Global
{B33F68D5-1335-400C-A1D7-7F5602A030EF}.Release|x64.Build.0 = Release|x64
{B33F68D5-1335-400C-A1D7-7F5602A030EF}.Release|x86.ActiveCfg = Release|x86
{B33F68D5-1335-400C-A1D7-7F5602A030EF}.Release|x86.Build.0 = Release|x86
{88CFD996-027B-4CBE-9828-26B2728B6127}.Debug + Profiler|x64.ActiveCfg = Debug|x64
{88CFD996-027B-4CBE-9828-26B2728B6127}.Debug + Profiler|x64.Build.0 = Debug|x64
{88CFD996-027B-4CBE-9828-26B2728B6127}.Debug + Profiler|x86.ActiveCfg = Debug|x86
{88CFD996-027B-4CBE-9828-26B2728B6127}.Debug + Profiler|x86.Build.0 = Debug|x86
{88CFD996-027B-4CBE-9828-26B2728B6127}.Debug|x64.ActiveCfg = Debug|x64
{88CFD996-027B-4CBE-9828-26B2728B6127}.Debug|x64.Build.0 = Debug|x64
{88CFD996-027B-4CBE-9828-26B2728B6127}.Debug|x86.ActiveCfg = Debug|x86
{88CFD996-027B-4CBE-9828-26B2728B6127}.Debug|x86.Build.0 = Debug|x86
{88CFD996-027B-4CBE-9828-26B2728B6127}.Release + Profiler|x64.ActiveCfg = Release|x64
{88CFD996-027B-4CBE-9828-26B2728B6127}.Release + Profiler|x64.Build.0 = Release|x64
{88CFD996-027B-4CBE-9828-26B2728B6127}.Release + Profiler|x86.ActiveCfg = Release|x86
{88CFD996-027B-4CBE-9828-26B2728B6127}.Release + Profiler|x86.Build.0 = Release|x86
{88CFD996-027B-4CBE-9828-26B2728B6127}.Release|x64.ActiveCfg = Release|x64
{88CFD996-027B-4CBE-9828-26B2728B6127}.Release|x64.Build.0 = Release|x64
{88CFD996-027B-4CBE-9828-26B2728B6127}.Release|x86.ActiveCfg = Release|x86
{88CFD996-027B-4CBE-9828-26B2728B6127}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

6
Source/Native/OpenGL/OpenGLContext.cpp
View file

@ -464,6 +464,7 @@ public:
void MakeCurrent() override;
void ClearCurrent() override;
void SwapBuffers() override;
bool IsCurrent() override;
int GetWidth() const override;
int GetHeight() const override;
@ -558,6 +559,11 @@ void OpenGLContext::MakeCurrent()
glx.glXMakeCurrent(disp, window, opengl_context);
}
bool OpenGLContext::IsCurrent()
{
return (glx.glXGetCurrentContext() == opengl_context);
}
void OpenGLContext::ClearCurrent()
{
glx.glXMakeCurrent(0, 0, opengl_context);

259
Source/Plugins/3DFloorMode/ThreeDFloorModeMono.csproj Normal file
View file

@ -0,0 +1,259 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{88CFD996-027B-4CBE-9828-26B2728B6127}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ThreeDFloorMode</RootNamespace>
<AssemblyName>ThreeDFloorMode</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\..\Build\Plugins\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\..\Build\Plugins\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\..\..\Build\Plugins\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>..\..\..\Build\Plugins\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\..\..\Build\Plugins\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>..\..\..\Build\Plugins\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data.DataSetExtensions">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="BuilderPlug.cs" />
<Compile Include="ControlSectorArea.cs" />
<Compile Include="Controls\ThreeDFloorTooltipControl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Controls\ThreeDFloorTooltipControl.Designer.cs">
<DependentUpon>ThreeDFloorTooltipControl.cs</DependentUpon>
</Compile>
<Compile Include="DrawSlopesMode.cs" />
<Compile Include="Interface\PreferencesForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Interface\PreferencesForm.Designer.cs">
<DependentUpon>PreferencesForm.cs</DependentUpon>
</Compile>
<Compile Include="Interface\ThreeDFloorPanel.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Interface\ThreeDFloorPanel.Designer.cs">
<DependentUpon>ThreeDFloorPanel.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Controls\ThreeDFloorControl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Controls\ThreeDFloorControl.Designer.cs">
<DependentUpon>ThreeDFloorControl.cs</DependentUpon>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="SectorLabelInfo.cs" />
<Compile Include="SlopeMode.cs" />
<Compile Include="SlopeVertex.cs" />
<Compile Include="SlopeVertexGroup.cs" />
<Compile Include="ThreeDFloor.cs" />
<Compile Include="ThreeDFloorMode.cs" />
<Compile Include="Windows\ControlSectorAreaConfig.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Windows\ControlSectorAreaConfig.Designer.cs">
<DependentUpon>ControlSectorAreaConfig.cs</DependentUpon>
</Compile>
<Compile Include="Windows\MenusForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Windows\MenusForm.Designer.cs">
<DependentUpon>MenusForm.cs</DependentUpon>
</Compile>
<Compile Include="Windows\SlopeDataSectorDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Windows\SlopeDataSectorDialog.Designer.cs">
<DependentUpon>SlopeDataSectorDialog.cs</DependentUpon>
</Compile>
<Compile Include="Windows\SlopeVertexEditForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Windows\SlopeVertexEditForm.Designer.cs">
<DependentUpon>SlopeVertexEditForm.cs</DependentUpon>
</Compile>
<Compile Include="Windows\ThreeDFloorEditorWindow.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Windows\ThreeDFloorEditorWindow.Designer.cs">
<DependentUpon>ThreeDFloorEditorWindow.cs</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Controls\ThreeDFloorControl.resx">
<DependentUpon>ThreeDFloorControl.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Interface\PreferencesForm.resx">
<DependentUpon>PreferencesForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Resources\Actions.cfg" />
<EmbeddedResource Include="Windows\ThreeDFloorEditorWindow.resx">
<DependentUpon>ThreeDFloorEditorWindow.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Controls\ThreeDFloorTooltipControl.resx">
<DependentUpon>ThreeDFloorTooltipControl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Interface\ThreeDFloorPanel.resx">
<DependentUpon>ThreeDFloorPanel.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Resources\ThreeDFloorIcon.png" />
<EmbeddedResource Include="Windows\ControlSectorAreaConfig.resx">
<DependentUpon>ControlSectorAreaConfig.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Windows\SlopeVertexEditForm.resx">
<DependentUpon>SlopeVertexEditForm.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\SlopeModeIcon.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\DrawSlopeModeIcon.png" />
<EmbeddedResource Include="Windows\MenusForm.resx">
<DependentUpon>MenusForm.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Resources\Ceiling.png" />
<EmbeddedResource Include="Resources\Floor.png" />
<EmbeddedResource Include="Resources\FloorAndCeiling.png" />
<EmbeddedResource Include="Windows\SlopeDataSectorDialog.resx">
<DependentUpon>SlopeDataSectorDialog.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Core\BuilderMono.csproj">
<Project>{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}</Project>
<Name>Builder</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\BuilderEffects\BuilderEffectsMono.csproj">
<Project>{B859BE0F-A992-476D-A642-FA8EFE94AAA5}</Project>
<Name>BuilderEffects</Name>
</ProjectReference>
<ProjectReference Include="..\BuilderModes\BuilderModesMono.csproj">
<Project>{B42D5AA0-F9A6-4234-9C4B-A05B11A64851}</Project>
<Name>BuilderModes</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>