#5491: Adjust VC++ projects, minor fix.

codereader · Jan 16, 2021 · 25271ea · 25271ea
1 parent a9d7a47
commit 25271ea
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/libs/wxutil/bitmap.h b/libs/wxutil/bitmap.h
@@ -14,7 +14,7 @@ namespace wxutil
  * \param name
  * Image file name with no prefix, e.g. "something.png"
  */
-wxBitmap getBitmap(const std::string& name)
+inline wxBitmap getBitmap(const std::string& name)
 {
     return wxArtProvider::GetBitmap(GlobalUIManager().ArtIdPrefix() + name);
 }

diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
@@ -194,7 +194,7 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\radiant\camera\GlobalCameraWndManager.cpp" />
+    <ClCompile Include="..\..\radiant\camera\CameraWndManager.cpp" />
     <ClCompile Include="..\..\radiant\clipboard\ClipboardModule.cpp" />
     <ClCompile Include="..\..\radiant\eventmanager\Accelerator.cpp" />
     <ClCompile Include="..\..\radiant\eventmanager\EventManager.cpp" />
@@ -373,8 +373,8 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiant\ApplicationContext.h" />
+    <ClInclude Include="..\..\radiant\camera\CameraWndManager.h" />
     <ClInclude Include="..\..\radiant\camera\FloorHeightWalker.h" />
-    <ClInclude Include="..\..\radiant\camera\GlobalCameraWndManager.h" />
     <ClInclude Include="..\..\radiant\camera\tools\CameraMouseToolEvent.h" />
     <ClInclude Include="..\..\radiant\camera\tools\FreeMoveTool.h" />
     <ClInclude Include="..\..\radiant\camera\tools\JumpToObjectTool.h" />

diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -655,9 +655,6 @@
     <ClCompile Include="..\..\radiant\ui\DispatchEvent.cpp">
       <Filter>src\ui</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\camera\GlobalCameraWndManager.cpp">
-      <Filter>src\camera</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\ui\common\DefinitionView.cpp">
       <Filter>src\ui\common</Filter>
     </ClCompile>
@@ -682,6 +679,9 @@
     <ClCompile Include="..\..\radiant\ui\favourites\FavouritesBrowser.cpp">
       <Filter>src\ui\favourites</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiant\camera\CameraWndManager.cpp">
+      <Filter>src\camera</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiant\camera\CameraSettings.h">
@@ -1275,9 +1275,6 @@
     <ClInclude Include="..\..\radiant\ui\script\ScriptWindow.h">
       <Filter>src\ui\script</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\camera\GlobalCameraWndManager.h">
-      <Filter>src\camera</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\camera\FloorHeightWalker.h">
       <Filter>src\camera</Filter>
     </ClInclude>
@@ -1311,6 +1308,9 @@
     <ClInclude Include="..\..\radiant\ui\favourites\FavouritesBrowser.h">
       <Filter>src\ui\favourites</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiant\camera\CameraWndManager.h">
+      <Filter>src\camera</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\radiant\darkradiant.rc" />

diff --git a/tools/msvc/wxutillib.vcxproj b/tools/msvc/wxutillib.vcxproj
@@ -135,6 +135,7 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\libs\wxutil\bitmap.h" />
     <ClInclude Include="..\..\libs\wxutil\Button.h" />
     <ClInclude Include="..\..\libs\wxutil\ChoiceHelper.h" />
     <ClInclude Include="..\..\libs\wxutil\ConsoleView.h" />

diff --git a/tools/msvc/wxutillib.vcxproj.filters b/tools/msvc/wxutillib.vcxproj.filters
@@ -145,6 +145,7 @@
     <ClInclude Include="..\..\libs\wxutil\dataview\ResourceTreeViewToolbar.h">
       <Filter>dataview</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\libs\wxutil\bitmap.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\libs\wxutil\dialog\MessageBox.cpp">