From c0bb810ab84c4dd8100942394b76f6b75c678f34 Mon Sep 17 00:00:00 2001 From: Chris Blume Date: Tue, 6 Feb 2024 11:24:22 -0800 Subject: [PATCH] Rename the entry point (#78) Previously, the entry point file was named EntryPoint.hpp/.cpp. If other projects used that same name, there could be a conflict in intermediate files. In fact, this is pretty much the default. In order to prevent that conflict, the files are renamed to maxGUIEntryPoint.hpp/.cpp. This is far less likely to cause a conflict. --- Code/maxGUI/maxGUI.hpp | 2 +- Code/maxGUI/{EntryPoint.cpp => maxGUIEntryPoint.cpp} | 2 +- Code/maxGUI/{EntryPoint.hpp => maxGUIEntryPoint.hpp} | 6 +++--- Projects/Make/Makefile | 2 +- Projects/VisualStudio/maxGUI/maxGUI.vcxproj | 4 ++-- Projects/VisualStudio/maxGUI/maxGUI.vcxproj.filters | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) rename Code/maxGUI/{EntryPoint.cpp => maxGUIEntryPoint.cpp} (97%) rename Code/maxGUI/{EntryPoint.hpp => maxGUIEntryPoint.hpp} (91%) diff --git a/Code/maxGUI/maxGUI.hpp b/Code/maxGUI/maxGUI.hpp index 36490a3..40da99a 100644 --- a/Code/maxGUI/maxGUI.hpp +++ b/Code/maxGUI/maxGUI.hpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Code/maxGUI/EntryPoint.cpp b/Code/maxGUI/maxGUIEntryPoint.cpp similarity index 97% rename from Code/maxGUI/EntryPoint.cpp rename to Code/maxGUI/maxGUIEntryPoint.cpp index bbfd4ea..50320a9 100644 --- a/Code/maxGUI/EntryPoint.cpp +++ b/Code/maxGUI/maxGUIEntryPoint.cpp @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include +#include #if defined(MAX_PLATFORM_LINUX) #include diff --git a/Code/maxGUI/EntryPoint.hpp b/Code/maxGUI/maxGUIEntryPoint.hpp similarity index 91% rename from Code/maxGUI/EntryPoint.hpp rename to Code/maxGUI/maxGUIEntryPoint.hpp index 579636b..da1e8f4 100644 --- a/Code/maxGUI/EntryPoint.hpp +++ b/Code/maxGUI/maxGUIEntryPoint.hpp @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MAXGUI_ENTRYPOINT_HPP -#define MAXGUI_ENTRYPOINT_HPP +#ifndef MAXGUI_MAXGUIENTRYPOINT_HPP +#define MAXGUI_MAXGUIENTRYPOINT_HPP #include #include @@ -46,4 +46,4 @@ namespace maxGUI { } // namespace maxGUI -#endif // #ifndef MAXGUI_ENTRYPOINT_HPP +#endif // #ifndef MAXGUI_MAXGUIENTRYPOINT_HPP diff --git a/Projects/Make/Makefile b/Projects/Make/Makefile index e7d2db1..4db74b9 100644 --- a/Projects/Make/Makefile +++ b/Projects/Make/Makefile @@ -6,10 +6,10 @@ CXX_SRCS = \ ../../Code/maxGUI/ControlImplementation.cpp \ ../../Code/maxGUI/ControlWithText.cpp \ ../../Code/maxGUI/ControlWithTextImplementation.cpp \ - ../../Code/maxGUI/EntryPoint.cpp \ ../../Code/maxGUI/FormAllocatorConcept.cpp \ ../../Code/maxGUI/FormConcept.cpp \ ../../Code/maxGUI/FormContainer.cpp \ + ../../Code/maxGUI/maxGUIEntryPoint.cpp \ ../../Code/maxGUI/MultilineTextBoxImplementation.cpp #../../Code/maxGUI/CheckBoxImplementation.cpp \ #../../Code/maxGUI/ControlWithList.cpp \ diff --git a/Projects/VisualStudio/maxGUI/maxGUI.vcxproj b/Projects/VisualStudio/maxGUI/maxGUI.vcxproj index 8fe63e1..98f3972 100644 --- a/Projects/VisualStudio/maxGUI/maxGUI.vcxproj +++ b/Projects/VisualStudio/maxGUI/maxGUI.vcxproj @@ -57,7 +57,7 @@ - + @@ -82,7 +82,7 @@ - + diff --git a/Projects/VisualStudio/maxGUI/maxGUI.vcxproj.filters b/Projects/VisualStudio/maxGUI/maxGUI.vcxproj.filters index c0aa93c..4c1ffcd 100644 --- a/Projects/VisualStudio/maxGUI/maxGUI.vcxproj.filters +++ b/Projects/VisualStudio/maxGUI/maxGUI.vcxproj.filters @@ -126,7 +126,7 @@ - + Code @@ -194,7 +194,7 @@ - + Code