From 20f5f01b84c01d2a3f4a22b4fb751e1a2da29ff5 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Mon, 6 Jan 2020 08:07:52 +0100 Subject: [PATCH] Unix build fixes --- Makefile | 2 +- Source/Core/BuilderMono.csproj | 3010 ++++++++--------- Source/Core/NoScintilla.cs | 2 +- Source/Native/Backend.cpp | 4 + Source/Native/Backend.h | 2 + Source/Native/OpenGL/OpenGLContext.cpp | 28 + Source/Native/fasttrig.h | 8 +- .../BuilderModes/BuilderModesMono.csproj | 1415 ++++---- .../VisplaneExplorerMono.csproj | 1 - 9 files changed, 2254 insertions(+), 2218 deletions(-) diff --git a/Makefile b/Makefile index 8ed20773..5c53cb64 100644 --- a/Makefile +++ b/Makefile @@ -5,4 +5,4 @@ builder: msbuild -p:Configuration=Debug BuilderMono.sln native: - g++ -O2 --shared -g3 -o Build/libBuilderNative.so -fPIC -I Source/Native Source/Native/*.cpp Source/Native/gl_load/*.c -lX11 -ldl + g++ -std=c++14 -O2 --shared -g3 -o Build/libBuilderNative.so -fPIC -I Source/Native Source/Native/*.cpp Source/Native/OpenGL/*.cpp Source/Native/OpenGL/gl_load/*.c -lX11 -ldl diff --git a/Source/Core/BuilderMono.csproj b/Source/Core/BuilderMono.csproj index 64c14c64..c4891bfb 100644 --- a/Source/Core/BuilderMono.csproj +++ b/Source/Core/BuilderMono.csproj @@ -1,1508 +1,1504 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {818B3D10-F791-4C3F-9AF5-BB2D0079B63C} - WinExe - Properties - CodeImp.DoomBuilder - Builder - CodeImp.DoomBuilder.General - Resources\UDB.ico - - - OnBuildSuccess - - - 3.5 - - - v4.7.2 - app.manifest - - - - true - ..\..\Build\ - TRACE;DEBUG;NO_SCINTILLA NO_FORMS_DESIGN NO_WIN32 NO_UPDATER - true - full - x86 - false - prompt - - - 4 - false - - - ..\..\Build\ - true - true - pdbonly - x86 - false - prompt - - - NO_SCINTILLA NO_FORMS_DESIGN NO_WIN32 NO_UPDATER - 4 - true - 1591 - false - - - true - ..\..\Build\ - TRACE;DEBUG;PROFILE NO_SCINTILLA NO_FORMS_DESIGN NO_WIN32 NO_UPDATER - true - - - 3 - full - x86 - false - prompt - false - - - true - ..\..\Build\ - true - ..\..\Build\Builder.xml - true - 3 - pdbonly - x86 - false - prompt - TRACE;PROFILE NO_SCINTILLA NO_FORMS_DESIGN NO_WIN32 NO_UPDATER - false - - - x64 - ..\..\Build\ - - - false - true - TRACE;DEBUG;NO_SCINTILLA NO_FORMS_DESIGN NO_WIN32 NO_UPDATER - - - x64 - ..\..\Build\ - false - true - true - TRACE;NO_SCINTILLA NO_FORMS_DESIGN NO_WIN32 NO_UPDATER - - - x64 - ..\..\Build\ - false - true - TRACE;DEBUG;PROFILE NO_SCINTILLA NO_FORMS_DESIGN NO_WIN32 NO_UPDATER - - - x64 - ..\..\Build\ - false - true - true - PROFILE NO_SCINTILLA NO_FORMS_DESIGN NO_WIN32 NO_UPDATER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - UserControl - - - ArgumentBox.cs - - - - Component - - - Component - - - Component - - - Component - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - UserControl - - - PairedFloatControl.cs - - - UserControl - - - True - True - Settings.settings - - - - - - - - - - - - - - - Form - - - ThingStatisticsForm.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Form - - - AboutForm.cs - - - Form - - - ActionBrowserForm.cs - - - UserControl - - - ActionSelectorControl.cs - - - UserControl - - - AngleControl.cs - - - Component - - - UserControl - - - CheckboxArrayControl.cs - - - UserControl - - - ButtonsNumericTextbox.cs - - - UserControl - - - ColorControl.cs - - - Form - - - BitFlagsForm.cs - - - Form - - - ConfigForm.cs - - - Form - - - CustomFieldsForm.cs - - - Form - - - EffectBrowserForm.cs - - - - UserControl - - - FieldsEditorControl.cs - - - Form - - - UserControl - - - Form - - - GridSetupForm.cs - - - UserControl - - - ImageBrowserControl.cs - - - - UserControl - - - ImageSelectorControl.cs - - - - Form - - - LinedefEditForm.cs - - - UserControl - - - LinedefInfoPanel.cs - - - Form - - - MapOptionsForm.cs - - - Component - - - - Form - - - OpenMapOptionsForm.cs - - - Component - - - Form - - - PreferencesForm.cs - - - Component - - - Component - - - UserControl - - - ResourceListEditor.cs - - - Form - - - ResourceOptionsForm.cs - - - Form - - - ScriptEditorForm.cs - - - Form - - - SectorEditForm.cs - - - UserControl - - - SectorInfoPanel.cs - - - Form - - - TextEditForm.cs - - - Form - - - TextureBrowserForm.cs - - - UserControl - - - Form - - - TextureSetForm.cs - - - Form - - - ThingEditForm.cs - - - UserControl - - - ThingInfoPanel.cs - - - Form - - - ThingsFiltersForm.cs - - - UserControl - - - VertexInfoPanel.cs - - - - - - - - - - - - - - - - - - - Form - - - MainForm.cs - - - - - - - - - - - - - - - - - True - True - Resources.resx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - ..\..\Build\SharpCompress.dll - - - - 3.5 - - - - - - - - - False - - - - - PairedFloatControl.cs - - - ThingStatisticsForm.cs - - - Designer - AboutForm.cs - - - Designer - MainForm.cs - - - Designer - MapOptionsForm.cs - - - Designer - OpenMapOptionsForm.cs - - - Designer - ResourceOptionsForm.cs - - - Designer - ResXFileCodeGenerator - Resources.Designer.cs - - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - ActionBrowserForm.cs - - - Designer - ActionSelectorControl.cs - - - Designer - CheckboxArrayControl.cs - - - Designer - ColorControl.cs - - - Designer - ConfigForm.cs - - - EffectBrowserForm.cs - Designer - - - Designer - FieldsEditorControl.cs - - - Designer - DelayedForm.cs - - - Designer - GridSetupForm.cs - - - Designer - ImageBrowserControl.cs - - - Designer - ImageSelectorControl.cs - - - Designer - LinedefEditForm.cs - - - Designer - LinedefInfoPanel.cs - - - Designer - PreferencesForm.cs - - - Designer - ResourceListEditor.cs - - - Designer - SectorEditForm.cs - - - Designer - SectorInfoPanel.cs - - - Designer - TextureBrowserForm.cs - - - Designer - ThingInfoPanel.cs - - - Designer - VertexInfoPanel.cs - - - - - - - - - - - FindUsagesControl.cs - - - ScriptResourcesControl.cs - - - - - - - - - - - - Component - - - UserControl - - - FindUsagesControl.cs - - - Component - - - - - Component - - - UserControl - - - ScriptResourcesControl.cs - - - Component - - - - - - - - - - UserControl - - - ActionSpecialHelpButton.cs - - - UserControl - - - ArgumentsControl.cs - - - Component - - - - Component - - - Component - - - UserControl - - - CommentEditor.cs - - - UserControl - - - DebugConsole.cs - - - - UserControl - - - DockersControl.cs - - - Component - - - Component - - - UserControl - - - HintsPanel.cs - - - UserControl - - - PasteOptionsControl.cs - - - UserControl - - - SectorSlopeControl.cs - - - UserControl - - - StatisticsControl.cs - - - UserControl - - - ThingBrowserControl.cs - - - Component - - - Component - - - Component - - - Component - - - - - - - - - - - - - - - - - - - - - - - - - - - - - UserControl - - - AngleControlEx.cs - - - UserControl - - - ColorFieldsControl.cs - - - UserControl - - - TagsSelector.cs - - - Component - - - Component - - - UserControl - - - PairedFieldsControl.cs - - - UserControl - - - PairedIntControl.cs - - - UserControl - - - TagSelector.cs - - - - - - - - - - - - - - - - - - - - - - Form - - - ScriptGoToLineForm.cs - - - - - - - - - - - - - - - - - Form - - - ExceptionDialog.cs - - - Form - - - TagStatisticsForm.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - Form - - - BitFlagsAndOptionsForm.cs - - - Form - - - CenterOnCoordinatesForm.cs - - - Form - - - ChangeMapForm.cs - - - Form - - - ErrorsForm.cs - - - - Form - - - FlagsForm.cs - - - Form - - - LinedefColorPresetsForm.cs - - - Form - - - LinedefEditFormUDMF.cs - - - - Form - - - PasteOptionsForm.cs - - - - Form - - - ScriptFindReplaceForm.cs - - - Form - - - SectorEditFormUDMF.cs - - - - - Form - - - ThingBrowserForm.cs - - - Form - - - ThingEditFormUDMF.cs - - - - Form - - - UpdateForm.cs - - - Form - - - VertexEditForm.cs - - - - - - - - - - - - - - - - - - - - - ActionSpecialHelpButton.cs - - - ArgumentsControl.cs - - - CommentEditor.cs - - - DebugConsole.cs - - - DockersControl.cs - - - HintsPanel.cs - - - Designer - PasteOptionsControl.cs - - - SectorSlopeControl.cs - - - StatisticsControl.cs - - - Designer - ThingBrowserControl.cs - - - AngleControlEx.cs - - - ColorFieldsControl.cs - - - TagsSelector.cs - - - PairedFieldsControl.cs - - - PairedIntControl.cs - - - TagSelector.cs - - - ExceptionDialog.cs - - - ScriptGoToLineForm.cs - - - TagStatisticsForm.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Form - - - AngleForm.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - AngleControl.cs - - - Designer - ArgumentBox.cs - - - Designer - ButtonsNumericTextbox.cs - - - Designer - AngleForm.cs - - - BitFlagsAndOptionsForm.cs - - - Designer - BitFlagsForm.cs - - - CenterOnCoordinatesForm.cs - - - ChangeMapForm.cs - - - Designer - CustomFieldsForm.cs - - - Designer - ErrorsForm.cs - - - FlagsForm.cs - - - LinedefColorPresetsForm.cs - - - LinedefEditFormUDMF.cs - - - PasteOptionsForm.cs - - - Designer - ScriptEditorForm.cs - - - Designer - ScriptFindReplaceForm.cs - - - SectorEditFormUDMF.cs - - - Designer - TextEditForm.cs - - - Designer - TextureSetForm.cs - - - Designer - ThingBrowserForm.cs - - - Designer - ThingEditForm.cs - - - ThingEditFormUDMF.cs - - - Designer - ThingsFiltersForm.cs - - - - UpdateForm.cs - - - Designer - VertexEditForm.cs - - - - - - - - - + + + + Debug + AnyCPU + 9.0.30729 + 2.0 + {818B3D10-F791-4C3F-9AF5-BB2D0079B63C} + WinExe + Properties + CodeImp.DoomBuilder + Builder + CodeImp.DoomBuilder.General + Resources\UDB2.ico + + + OnBuildSuccess + + + 3.5 + + + v4.7.2 + app.manifest + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + true + ..\..\Build\ + DEBUG;TRACE;NO_SCINTILLA;NO_FORMS_DESIGN;NO_WIN32;NO_UPDATER + true + full + x86 + false + prompt + + + 4 + false + + + ..\..\Build\ + true + true + pdbonly + x86 + false + prompt + + + NO_SCINTILLA;NO_FORMS_DESIGN;NO_WIN32;NO_UPDATER + 4 + true + 1591 + false + + + true + ..\..\Build\ + DEBUG;TRACE;PROFILE;NO_SCINTILLA;NO_FORMS_DESIGN;NO_WIN32;NO_UPDATER + true + + + 3 + full + x86 + false + prompt + false + + + true + ..\..\Build\ + true + ..\..\Build\Builder.xml + true + 3 + pdbonly + x86 + false + prompt + TRACE;PROFILE;NO_SCINTILLA;NO_FORMS_DESIGN;NO_WIN32;NO_UPDATER + false + + + x64 + ..\..\Build\ + + + false + true + TRACE;DEBUG;NO_SCINTILLA;NO_FORMS_DESIGN;NO_WIN32;NO_UPDATER + + + x64 + ..\..\Build\ + false + true + true + TRACE;NO_SCINTILLA;NO_FORMS_DESIGN;NO_WIN32;NO_UPDATER + + + x64 + ..\..\Build\ + false + true + TRACE;DEBUG;PROFILE;NO_SCINTILLA;NO_FORMS_DESIGN;NO_WIN32;NO_UPDATER + + + x64 + ..\..\Build\ + false + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + UserControl + + + ArgumentBox.cs + + + + Component + + + Component + + + Component + + + Component + + + + + + + True + True + Resources.resx + + + + + + + + + + + + + + + + + + + + + + + + + + + UserControl + + + PairedFloatControl.cs + + + True + True + Settings.settings + + + + + + + + + + + + + + + Form + + + ThingStatisticsForm.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Form + + + AboutForm.cs + + + Form + + + ActionBrowserForm.cs + + + UserControl + + + ActionSelectorControl.cs + + + UserControl + + + AngleControl.cs + + + Component + + + UserControl + + + CheckboxArrayControl.cs + + + UserControl + + + ButtonsNumericTextbox.cs + + + UserControl + + + ColorControl.cs + + + Form + + + BitFlagsForm.cs + + + Form + + + ConfigForm.cs + + + Form + + + CustomFieldsForm.cs + + + Form + + + EffectBrowserForm.cs + + + + UserControl + + + FieldsEditorControl.cs + + + Form + + + UserControl + + + Form + + + GridSetupForm.cs + + + UserControl + + + ImageBrowserControl.cs + + + + UserControl + + + ImageSelectorControl.cs + + + + Form + + + LinedefEditForm.cs + + + UserControl + + + LinedefInfoPanel.cs + + + Form + + + MapOptionsForm.cs + + + Component + + + + Form + + + OpenMapOptionsForm.cs + + + Component + + + Form + + + PreferencesForm.cs + + + Component + + + Component + + + UserControl + + + ResourceListEditor.cs + + + Form + + + ResourceOptionsForm.cs + + + Form + + + ScriptEditorForm.cs + + + Form + + + SectorEditForm.cs + + + UserControl + + + SectorInfoPanel.cs + + + Form + + + TextEditForm.cs + + + Form + + + TextureBrowserForm.cs + + + UserControl + + + Form + + + TextureSetForm.cs + + + Form + + + ThingEditForm.cs + + + UserControl + + + ThingInfoPanel.cs + + + Form + + + ThingsFiltersForm.cs + + + UserControl + + + VertexInfoPanel.cs + + + + + + + + + + + + + + + + + + + Form + + + MainForm.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + + + False + ..\..\Build\ScintillaNET.dll + + + False + ..\..\Build\SharpCompress.dll + + + + 3.5 + + + + + + + + + False + + + + + PairedFloatControl.cs + + + ThingStatisticsForm.cs + + + Designer + AboutForm.cs + + + Designer + MainForm.cs + + + Designer + MapOptionsForm.cs + + + Designer + OpenMapOptionsForm.cs + + + Designer + ResourceOptionsForm.cs + + + Designer + ResXFileCodeGenerator + Resources.Designer.cs + + + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Designer + ActionBrowserForm.cs + + + Designer + ActionSelectorControl.cs + + + Designer + CheckboxArrayControl.cs + + + Designer + ColorControl.cs + + + Designer + ConfigForm.cs + + + EffectBrowserForm.cs + Designer + + + Designer + FieldsEditorControl.cs + + + Designer + DelayedForm.cs + + + Designer + GridSetupForm.cs + + + Designer + ImageBrowserControl.cs + + + Designer + ImageSelectorControl.cs + + + Designer + LinedefEditForm.cs + + + Designer + LinedefInfoPanel.cs + + + Designer + PreferencesForm.cs + + + Designer + ResourceListEditor.cs + + + Designer + SectorEditForm.cs + + + Designer + SectorInfoPanel.cs + + + Designer + TextureBrowserForm.cs + + + Designer + ThingInfoPanel.cs + + + Designer + VertexInfoPanel.cs + + + + + + + + + + + + + ScriptEditorControl.cs + + + ScriptEditorPreviewControl.cs + + + + + + + + + + + + Component + + + Component + + + + + Component + + + Component + + + + + + + + + + UserControl + + + ActionSpecialHelpButton.cs + + + UserControl + + + ArgumentsControl.cs + + + Component + + + + Component + + + Component + + + UserControl + + + CommentEditor.cs + + + UserControl + + + DebugConsole.cs + + + + UserControl + + + DockersControl.cs + + + Component + + + Component + + + UserControl + + + HintsPanel.cs + + + UserControl + + + PasteOptionsControl.cs + + + UserControl + + + SectorSlopeControl.cs + + + UserControl + + + StatisticsControl.cs + + + UserControl + + + ThingBrowserControl.cs + + + Component + + + Component + + + Component + + + Component + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + UserControl + + + AngleControlEx.cs + + + UserControl + + + ColorFieldsControl.cs + + + UserControl + + + TagsSelector.cs + + + Component + + + Component + + + UserControl + + + PairedFieldsControl.cs + + + UserControl + + + PairedIntControl.cs + + + UserControl + + + TagSelector.cs + + + + + + + + + + + + + + + + + + + + + + Form + + + ScriptGoToLineForm.cs + + + + + + + + + + + + + + + + + Form + + + ExceptionDialog.cs + + + Form + + + TagStatisticsForm.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + Form + + + BitFlagsAndOptionsForm.cs + + + Form + + + CenterOnCoordinatesForm.cs + + + Form + + + ChangeMapForm.cs + + + Form + + + ErrorsForm.cs + + + + Form + + + FlagsForm.cs + + + Form + + + LinedefColorPresetsForm.cs + + + Form + + + LinedefEditFormUDMF.cs + + + + Form + + + PasteOptionsForm.cs + + + + Form + + + ScriptFindReplaceForm.cs + + + Form + + + SectorEditFormUDMF.cs + + + + + Form + + + ThingBrowserForm.cs + + + Form + + + ThingEditFormUDMF.cs + + + + Form + + + UpdateForm.cs + + + Form + + + VertexEditForm.cs + + + + + + + + + + + + + + + + + + + + + ActionSpecialHelpButton.cs + + + ArgumentsControl.cs + + + CommentEditor.cs + + + DebugConsole.cs + + + DockersControl.cs + + + HintsPanel.cs + + + Designer + PasteOptionsControl.cs + + + SectorSlopeControl.cs + + + StatisticsControl.cs + + + Designer + ThingBrowserControl.cs + + + AngleControlEx.cs + + + ColorFieldsControl.cs + + + TagsSelector.cs + + + PairedFieldsControl.cs + + + PairedIntControl.cs + + + TagSelector.cs + + + ExceptionDialog.cs + + + ScriptGoToLineForm.cs + + + TagStatisticsForm.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Form + + + AngleForm.cs + + + + + + + + + + Designer + ScriptEditorPanel.cs + + + + + + + + + + + + + + + + + + + + Designer + AngleControl.cs + + + Designer + ArgumentBox.cs + + + Designer + ButtonsNumericTextbox.cs + + + Designer + AngleForm.cs + + + BitFlagsAndOptionsForm.cs + + + Designer + BitFlagsForm.cs + + + CenterOnCoordinatesForm.cs + + + ChangeMapForm.cs + + + Designer + CustomFieldsForm.cs + + + Designer + ErrorsForm.cs + + + FlagsForm.cs + + + LinedefColorPresetsForm.cs + + + LinedefEditFormUDMF.cs + + + PasteOptionsForm.cs + + + Designer + ScriptEditorForm.cs + + + Designer + ScriptFindReplaceForm.cs + + + SectorEditFormUDMF.cs + + + Designer + TextEditForm.cs + + + Designer + TextureSetForm.cs + + + Designer + ThingBrowserForm.cs + + + Designer + ThingEditForm.cs + + + ThingEditFormUDMF.cs + + + Designer + ThingsFiltersForm.cs + + + + UpdateForm.cs + + + Designer + VertexEditForm.cs + + + + + False + .NET Framework 3.5 SP1 + false + + + + + \ No newline at end of file diff --git a/Source/Core/NoScintilla.cs b/Source/Core/NoScintilla.cs index 9defab44..b61649a6 100644 --- a/Source/Core/NoScintilla.cs +++ b/Source/Core/NoScintilla.cs @@ -49,7 +49,7 @@ namespace CodeImp.DoomBuilder.Controls internal ScriptIconsManager Icons { get; private set; } internal ScriptResourceDocumentTab OpenResource(ScriptResource resource) { return null; } - internal ScriptResourcesControl ScriptResourcesControl { get; private set; } + //internal ScriptResourcesControl ScriptResourcesControl { get; private set; } public void DisplayStatus(ScriptStatusType type, string message) { } public void ShowError(TextResourceErrorItem error) { } diff --git a/Source/Native/Backend.cpp b/Source/Native/Backend.cpp index b7581ca5..637f510e 100644 --- a/Source/Native/Backend.cpp +++ b/Source/Native/Backend.cpp @@ -35,7 +35,11 @@ void SetError(const char* fmt, ...) va_list va; va_start(va, fmt); mSetErrorBuffer[0] = 0; +#ifdef WIN32 _vsnprintf(mSetErrorBuffer, sizeof(mSetErrorBuffer) - 1, fmt, va); +#else + vsnprintf(mSetErrorBuffer, sizeof(mSetErrorBuffer) - 1, fmt, va); +#endif va_end(va); mSetErrorBuffer[sizeof(mSetErrorBuffer) - 1] = 0; mLastError = mSetErrorBuffer; diff --git a/Source/Native/Backend.h b/Source/Native/Backend.h index 028de035..e5250657 100644 --- a/Source/Native/Backend.h +++ b/Source/Native/Backend.h @@ -113,6 +113,8 @@ public: class Backend { public: + virtual ~Backend() = default; + static Backend* Get(); virtual RenderDevice* NewRenderDevice(void* disp, void* window) = 0; diff --git a/Source/Native/OpenGL/OpenGLContext.cpp b/Source/Native/OpenGL/OpenGLContext.cpp index 2e70e3b9..6bc406ec 100644 --- a/Source/Native/OpenGL/OpenGLContext.cpp +++ b/Source/Native/OpenGL/OpenGLContext.cpp @@ -329,6 +329,34 @@ std::unique_ptr IOpenGLContext::Create(void* disp, void* window) return ctx; } +#elif defined(__APPLE__) + +class OpenGLContext : public IOpenGLContext +{ +public: + OpenGLContext(void* window); + ~OpenGLContext(); + + void MakeCurrent() override { } + void ClearCurrent() override { } + void SwapBuffers() override { } + bool IsCurrent() override { return false; } + + int GetWidth() const override { return 320; } + int GetHeight() const override { return 200; } + + bool IsValid() const { return false; } + +private: +}; + +std::unique_ptr IOpenGLContext::Create(void* disp, void* window) +{ + auto ctx = std::make_unique(window); + if (!ctx->IsValid()) return nullptr; + return ctx; +} + #else #include diff --git a/Source/Native/fasttrig.h b/Source/Native/fasttrig.h index 70d40fb3..285c313c 100644 --- a/Source/Native/fasttrig.h +++ b/Source/Native/fasttrig.h @@ -39,6 +39,12 @@ #define M_PI 3.14159265358979323846 #endif +#ifdef WIN32 +#define FORCEINLINE __forceinline +#else +#define FORCEINLINE +#endif + // This uses a sine table with linear interpolation // For in-game calculations this is precise enough // and this code is more than 10x faster than the @@ -51,7 +57,7 @@ struct FFastTrig static const int REMAINDER = (1 << BITSHIFT) - 1; float sinetable[2049]; - __forceinline double sinq1(uint32_t bangle) + FORCEINLINE double sinq1(uint32_t bangle) { unsigned int index = bangle >> BITSHIFT; diff --git a/Source/Plugins/BuilderModes/BuilderModesMono.csproj b/Source/Plugins/BuilderModes/BuilderModesMono.csproj index 047b509f..0c375bf1 100644 --- a/Source/Plugins/BuilderModes/BuilderModesMono.csproj +++ b/Source/Plugins/BuilderModes/BuilderModesMono.csproj @@ -1,708 +1,709 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {B42D5AA0-F9A6-4234-9C4B-A05B11A64851} - Library - Properties - CodeImp.DoomBuilder.BuilderModes - BuilderModes - Always - - - 3.5 - - - v4.7.2 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - - true - ..\..\..\Build\Plugins\ - DEBUG;TRACE - true - full - x86 - prompt - false - - - ..\..\..\Build\Plugins\ - true - false - pdbonly - x86 - prompt - true - false - TRACE - - - true - ..\..\..\Build\Plugins\ - DEBUG;TRACE;PROFILE - true - full - x86 - prompt - false - - - true - ..\..\..\Build\Plugins\ - true - true - pdbonly - x86 - prompt - false - - - x64 - ..\..\..\Build\Plugins\ - false - TRACE;DEBUG - - - x64 - ..\..\..\Build\Plugins\ - false - true - false - TRACE - - - x64 - ..\..\..\Build\Plugins\ - false - TRACE;DEBUG;PROFILE - - - x64 - ..\..\..\Build\Plugins\ - false - true - true - - - - - 3.5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Form - - - ErrorCheckForm.cs - - - Form - - - FindReplaceForm.cs - - - Form - - - MakeDoorForm.cs - - - Form - - - MenusForm.cs - - - Form - - - PreferencesForm.cs - - - True - True - Resources.resx - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - MenusForm.cs - - - - - {818B3D10-F791-4C3F-9AF5-BB2D0079B63C} - Builder - False - - - - - Designer - ErrorCheckForm.cs - - - FindReplaceForm.cs - Designer - - - Designer - MakeDoorForm.cs - - - Designer - ResXFileCodeGenerator - Resources.Designer.cs - - - - - - - - - - - - - - - - - - Designer - PreferencesForm.cs - - - - - - - - - - - - Designer - EditSelectionPanel.cs - - - Designer - UndoRedoPanel.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Form - - - BridgeModeForm.cs - - - UserControl - - - CurveLinedefsOptionsPanel.cs - - - UserControl - - - DrawCurveOptionsPanel.cs - - - UserControl - - - DrawEllipseOptionsPanel.cs - - - UserControl - - - DrawGridOptionsPanel.cs - - - UserControl - - - DrawLineOptionsPanel.cs - - - UserControl - - - DrawRectangleOptionsPanel.cs - - - UserControl - - - EditSelectionPanel.cs - - - Form - - - FilterSelectedThingsForm.cs - - - Form - - - FitTexturesForm.cs - - - Form - - - PastePropertiesOptionsForm.cs - - - UserControl - - - SectorDrawingOptionsPanel.cs - - - Form - - - SelectSimilarElementOptionsPanel.cs - - - Form - - - WavefrontSettingsForm.cs - - - UserControl - - - UndoRedoPanel.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - BridgeModeForm.cs - - - - - - - - - - - - - - - - - - DrawEllipseOptionsPanel.cs - - - DrawGridOptionsPanel.cs - - - DrawRectangleOptionsPanel.cs - - - SectorDrawingOptionsPanel.cs - - - WavefrontSettingsForm.cs - - - - - - - - - - - - - - - - - - - - - - - - DrawCurveOptionsPanel.cs - - - - - - - - - - - - - CurveLinedefsOptionsPanel.cs - - - DrawLineOptionsPanel.cs - - - FilterSelectedThingsForm.cs - - - FitTexturesForm.cs - - - PastePropertiesOptionsForm.cs - - - SelectSimilarElementOptionsPanel.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - .NET Framework 3.5 SP1 - true - - - - - - - - - - + + + + Debug + AnyCPU + 9.0.30729 + 2.0 + {B42D5AA0-F9A6-4234-9C4B-A05B11A64851} + Library + Properties + CodeImp.DoomBuilder.BuilderModes + BuilderModes + Always + + + 3.5 + + + v4.7.2 + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + + true + ..\..\..\Build\Plugins\ + DEBUG;TRACE + true + full + x86 + prompt + false + + + ..\..\..\Build\Plugins\ + true + false + pdbonly + x86 + prompt + true + false + TRACE + + + true + ..\..\..\Build\Plugins\ + DEBUG;TRACE;PROFILE + true + full + x86 + prompt + false + + + true + ..\..\..\Build\Plugins\ + true + true + pdbonly + x86 + prompt + false + + + x64 + ..\..\..\Build\Plugins\ + false + TRACE;DEBUG + + + x64 + ..\..\..\Build\Plugins\ + false + true + false + TRACE + + + x64 + ..\..\..\Build\Plugins\ + false + TRACE;DEBUG;PROFILE + + + x64 + ..\..\..\Build\Plugins\ + false + true + true + + + + + 3.5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Form + + + ErrorCheckForm.cs + + + Form + + + FindReplaceForm.cs + + + Form + + + MakeDoorForm.cs + + + Form + + + MenusForm.cs + + + Form + + + PreferencesForm.cs + + + True + True + Resources.resx + + + + + + + + + + + + + + + + + + + + + + + + + + + + Designer + MenusForm.cs + + + + + {818B3D10-F791-4C3F-9AF5-BB2D0079B63C} + Builder + False + + + + + Designer + ErrorCheckForm.cs + + + FindReplaceForm.cs + Designer + + + Designer + MakeDoorForm.cs + + + Designer + ResXFileCodeGenerator + Resources.Designer.cs + + + + + + + + + + + + + + + + + + Designer + PreferencesForm.cs + + + + + + + + + + + + Designer + EditSelectionPanel.cs + + + Designer + UndoRedoPanel.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Form + + + BridgeModeForm.cs + + + UserControl + + + CurveLinedefsOptionsPanel.cs + + + UserControl + + + DrawCurveOptionsPanel.cs + + + UserControl + + + DrawEllipseOptionsPanel.cs + + + UserControl + + + DrawGridOptionsPanel.cs + + + UserControl + + + DrawLineOptionsPanel.cs + + + UserControl + + + DrawRectangleOptionsPanel.cs + + + UserControl + + + EditSelectionPanel.cs + + + Form + + + FilterSelectedThingsForm.cs + + + Form + + + FitTexturesForm.cs + + + Form + + + PastePropertiesOptionsForm.cs + + + UserControl + + + SectorDrawingOptionsPanel.cs + + + Form + + + SelectSimilarElementOptionsPanel.cs + + + Form + + + WavefrontSettingsForm.cs + + + UserControl + + + UndoRedoPanel.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + BridgeModeForm.cs + + + + + + + + + + + + + + + + + + DrawEllipseOptionsPanel.cs + + + DrawGridOptionsPanel.cs + + + DrawRectangleOptionsPanel.cs + + + SectorDrawingOptionsPanel.cs + + + WavefrontSettingsForm.cs + + + + + + + + + + + + + + + + + + + + + + + + DrawCurveOptionsPanel.cs + + + + + + + + + + + + + CurveLinedefsOptionsPanel.cs + + + DrawLineOptionsPanel.cs + + + FilterSelectedThingsForm.cs + + + FitTexturesForm.cs + + + PastePropertiesOptionsForm.cs + + + SelectSimilarElementOptionsPanel.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + .NET Framework 3.5 SP1 + true + + + + + + + + + + \ No newline at end of file diff --git a/Source/Plugins/VisplaneExplorer/VisplaneExplorerMono.csproj b/Source/Plugins/VisplaneExplorer/VisplaneExplorerMono.csproj index 2873e835..0d678e81 100644 --- a/Source/Plugins/VisplaneExplorer/VisplaneExplorerMono.csproj +++ b/Source/Plugins/VisplaneExplorer/VisplaneExplorerMono.csproj @@ -159,7 +159,6 @@ -