#5436: Move OpenGLModule to radiantcore binary

codereader · Dec 5, 2020 · 9476033 · 9476033
1 parent ea704ef
commit 9476033
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 19 deletions.
diff --git a/radiant/Makefile.am b/radiant/Makefile.am
@@ -45,8 +45,6 @@ darkradiant_SOURCES = main.cpp \
                       eventmanager/Statement.cpp \
                       eventmanager/Toggle.cpp \
                       eventmanager/WidgetToggle.cpp \
-                      render/GLFont.cpp \
-                      render/OpenGLModule.cpp \
                       ui/UserInterfaceModule.cpp \
                       ui/Documentation.cpp \
                       ui/eclasstree/EClassTree.cpp \

diff --git a/radiantcore/Makefile.am b/radiantcore/Makefile.am
@@ -233,6 +233,8 @@ libradiantcore_la_SOURCES = Radiant.cpp \
                 rendersystem/backend/OpenGLShader.cpp \
                 rendersystem/backend/GLProgramFactory.cpp \
                 rendersystem/backend/OpenGLShaderPass.cpp \
+                rendersystem/GLFont.cpp \
+                rendersystem/OpenGLModule.cpp \
                 rendersystem/OpenGLRenderSystem.cpp \
                 rendersystem/RenderSystemFactory.cpp \
                 rendersystem/SharedOpenGLContextModule.cpp \

diff --git a/radiant/render/GLFont.cpp → radiantcore/rendersystem/GLFont.cpp b/radiant/render/GLFont.cpp → radiantcore/rendersystem/GLFont.cpp
diff --git a/radiant/render/GLFont.h → radiantcore/rendersystem/GLFont.h b/radiant/render/GLFont.h → radiantcore/rendersystem/GLFont.h
diff --git a/radiant/render/OpenGLModule.cpp → radiantcore/rendersystem/OpenGLModule.cpp b/radiant/render/OpenGLModule.cpp → radiantcore/rendersystem/OpenGLModule.cpp
diff --git a/radiant/render/OpenGLModule.h → radiantcore/rendersystem/OpenGLModule.h b/radiant/render/OpenGLModule.h → radiantcore/rendersystem/OpenGLModule.h
@@ -6,7 +6,6 @@
 #include <sigc++/connection.h>
 
 #include "GLFont.h"
-#include "wxutil/GLWidget.h"
 
 #ifndef NDEBUG
 //#define ENABLE_KHR_DEBUG_EXTENSION

diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
@@ -218,7 +218,6 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">precompiled.h</PrecompiledHeaderFile>
     </ClCompile>
     <ClCompile Include="..\..\radiant\RadiantApp.cpp" />
-    <ClCompile Include="..\..\radiant\render\GLFont.cpp" />
     <ClCompile Include="..\..\radiant\selection\ManipulateMouseTool.cpp" />
     <ClCompile Include="..\..\radiant\selection\SelectionMouseTools.cpp" />
     <ClCompile Include="..\..\radiant\settings\LocalisationModule.cpp" />
@@ -276,7 +275,6 @@
     <ClCompile Include="..\..\radiant\camera\CameraSettings.cpp" />
     <ClCompile Include="..\..\radiant\camera\CamWnd.cpp" />
     <ClCompile Include="..\..\radiant\camera\FloatingCamWnd.cpp" />
-    <ClCompile Include="..\..\radiant\render\OpenGLModule.cpp" />
     <ClCompile Include="..\..\radiant\textool\TexTool.cpp" />
     <ClCompile Include="..\..\radiant\textool\TexToolItem.cpp" />
     <ClCompile Include="..\..\radiant\textool\item\BrushItem.cpp" />
@@ -397,7 +395,6 @@
     <ClInclude Include="..\..\radiant\map\StartupMapLoader.h" />
     <ClInclude Include="..\..\radiant\precompiled.h" />
     <ClInclude Include="..\..\radiant\RadiantApp.h" />
-    <ClInclude Include="..\..\radiant\render\GLFont.h" />
     <ClInclude Include="..\..\radiant\render\RenderStatistics.h" />
     <ClInclude Include="..\..\radiant\selection\ManipulateMouseTool.h" />
     <ClInclude Include="..\..\radiant\selection\SelectionMouseTools.h" />
@@ -464,7 +461,6 @@
     <ClInclude Include="..\..\radiant\camera\CameraSettings.h" />
     <ClInclude Include="..\..\radiant\camera\CamWnd.h" />
     <ClInclude Include="..\..\radiant\camera\FloatingCamWnd.h" />
-    <ClInclude Include="..\..\radiant\render\OpenGLModule.h" />
     <ClInclude Include="..\..\radiant\textool\Rectangle.h" />
     <ClInclude Include="..\..\radiant\textool\RenderableItem.h" />
     <ClInclude Include="..\..\radiant\textool\Selectable.h" />

diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -190,9 +190,6 @@
     <ClCompile Include="..\..\radiant\camera\FloatingCamWnd.cpp">
       <Filter>src\camera</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\render\OpenGLModule.cpp">
-      <Filter>src\render</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\textool\TexTool.cpp">
       <Filter>src\textool</Filter>
     </ClCompile>
@@ -673,9 +670,6 @@
     <ClCompile Include="..\..\radiant\ui\mapselector\MapSelector.cpp">
       <Filter>src\ui\mapselector</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\render\GLFont.cpp">
-      <Filter>src\render</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiant\camera\CameraSettings.h">
@@ -687,9 +681,6 @@
     <ClInclude Include="..\..\radiant\camera\FloatingCamWnd.h">
       <Filter>src\camera</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\render\OpenGLModule.h">
-      <Filter>src\render</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\textool\Rectangle.h">
       <Filter>src\textool</Filter>
     </ClInclude>
@@ -1296,9 +1287,6 @@
     <ClInclude Include="..\..\radiant\ui\mapselector\MapSelector.h">
       <Filter>src\ui\mapselector</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\render\GLFont.h">
-      <Filter>src\render</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\radiant\darkradiant.rc" />

diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
@@ -619,6 +619,8 @@
     <ClCompile Include="..\..\radiantcore\rendersystem\backend\OpenGLShader.cpp" />
     <ClCompile Include="..\..\radiantcore\rendersystem\backend\OpenGLShaderPass.cpp" />
     <ClCompile Include="..\..\radiantcore\rendersystem\debug\SpacePartitionRenderer.cpp" />
+    <ClCompile Include="..\..\radiantcore\rendersystem\GLFont.cpp" />
+    <ClCompile Include="..\..\radiantcore\rendersystem\OpenGLModule.cpp" />
     <ClCompile Include="..\..\radiantcore\rendersystem\OpenGLRenderSystem.cpp" />
     <ClCompile Include="..\..\radiantcore\rendersystem\RenderSystemFactory.cpp" />
     <ClCompile Include="..\..\radiantcore\rendersystem\SharedOpenGLContextModule.cpp" />
@@ -939,6 +941,8 @@
     <ClInclude Include="..\..\radiantcore\rendersystem\backend\OpenGLStateLess.h" />
     <ClInclude Include="..\..\radiantcore\rendersystem\backend\OpenGLStateManager.h" />
     <ClInclude Include="..\..\radiantcore\rendersystem\debug\SpacePartitionRenderer.h" />
+    <ClInclude Include="..\..\radiantcore\rendersystem\GLFont.h" />
+    <ClInclude Include="..\..\radiantcore\rendersystem\OpenGLModule.h" />
     <ClInclude Include="..\..\radiantcore\rendersystem\OpenGLRenderSystem.h" />
     <ClInclude Include="..\..\radiantcore\rendersystem\RenderSystemFactory.h" />
     <ClInclude Include="..\..\radiantcore\rendersystem\SharedOpenGLContextModule.h" />

diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -1003,6 +1003,12 @@
     <ClCompile Include="..\..\radiantcore\model\picomodel\StaticModelSurface.cpp">
       <Filter>src\model\picomodel</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiantcore\rendersystem\GLFont.cpp">
+      <Filter>src\rendersystem</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiantcore\rendersystem\OpenGLModule.cpp">
+      <Filter>src\rendersystem</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiantcore\modulesystem\ModuleLoader.h">
@@ -2049,5 +2055,11 @@
     <ClInclude Include="..\..\radiantcore\model\picomodel\StaticModelSurface.h">
       <Filter>src\model\picomodel</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiantcore\rendersystem\GLFont.h">
+      <Filter>src\rendersystem</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\rendersystem\OpenGLModule.h">
+      <Filter>src\rendersystem</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/tools/msvc/properties/ftgl.props b/tools/msvc/properties/ftgl.props
@@ -13,6 +13,10 @@
     <Lib>
       <AdditionalLibraryDirectories>$(PlatformDepsDir)ftgl\lib;$(PlatformDepsDir)fontconfig\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Lib>
+    <Link>
+      <AdditionalDependencies>ftgl$(LibSuffix)-vc$(PlatformToolsetVersion).lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(PlatformDepsDir)ftgl\lib;$(PlatformDepsDir)fontconfig\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
   </ItemDefinitionGroup>
   <ItemGroup />
 </Project>