* Removed TFE thread/mutex references from the Windows build.

* Added a return value in drawCaptions() when the if() statement isn't taken.
luciusDXL · Sep 27, 2023 · 9680f11 · 9680f11
1 parent c0651a9
commit 9680f11
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 42 deletions.
diff --git a/TheForceEngine/TFE_A11y/accessibility.cpp b/TheForceEngine/TFE_A11y/accessibility.cpp
@@ -506,6 +506,8 @@ namespace TFE_A11Y  // a11y is industry slang for accessibility
 		{
 			return drawCaptions(&s_activeCaptions);
 		}
+		// We need to always return a value.
+		return { 0 };
 	}
 
 	Vec2f drawCaptions(std::vector<Caption>* captions)

diff --git a/TheForceEngine/TheForceEngine.vcxproj b/TheForceEngine/TheForceEngine.vcxproj
@@ -673,12 +673,6 @@ echo ^)";
     <ClInclude Include="TFE_System\profiler.h" />
     <ClInclude Include="TFE_System\system.h" />
     <ClInclude Include="TFE_System\tfeMessage.h" />
-    <ClInclude Include="TFE_System\Threads\mutex.h" />
-    <ClInclude Include="TFE_System\Threads\signal.h" />
-    <ClInclude Include="TFE_System\Threads\thread.h" />
-    <ClInclude Include="TFE_System\Threads\Win32\mutexWin32.h" />
-    <ClInclude Include="TFE_System\Threads\Win32\signalWin32.h" />
-    <ClInclude Include="TFE_System\Threads\Win32\threadWin32.h" />
     <ClInclude Include="TFE_System\types.h" />
     <ClInclude Include="TFE_Ui\imGUI\Dirent\dirent.h" />
     <ClInclude Include="TFE_Ui\imGUI\imconfig.h" />
@@ -989,9 +983,6 @@ echo ^)";
     <ClCompile Include="TFE_System\profiler.cpp" />
     <ClCompile Include="TFE_System\system.cpp" />
     <ClCompile Include="TFE_System\tfeMessage.cpp" />
-    <ClCompile Include="TFE_System\Threads\Win32\mutexWin32.cpp" />
-    <ClCompile Include="TFE_System\Threads\Win32\signalWin32.cpp" />
-    <ClCompile Include="TFE_System\Threads\Win32\threadWin32.cpp" />
     <ClCompile Include="TFE_Ui\imGUI\imgui.cpp" />
     <ClCompile Include="TFE_Ui\imGUI\imgui_demo.cpp" />
     <ClCompile Include="TFE_Ui\imGUI\imgui_draw.cpp" />

diff --git a/TheForceEngine/TheForceEngine.vcxproj.filters b/TheForceEngine/TheForceEngine.vcxproj.filters
@@ -71,12 +71,6 @@
     <Filter Include="Source\TFE_FrontEndUI">
       <UniqueIdentifier>{a8504c90-e13a-4a84-b3dc-faa166cfaabf}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source\TFE_System\Threads">
-      <UniqueIdentifier>{f874d79b-66c7-41e5-a393-96ab92bea739}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source\TFE_System\Threads\Win32">
-      <UniqueIdentifier>{1389f658-d350-4b30-91ca-293ec673341e}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Source\TFE_PostProcess">
       <UniqueIdentifier>{17a1b5a3-c20e-4777-bd0e-2774b8180e3e}</UniqueIdentifier>
     </Filter>
@@ -367,24 +361,6 @@
     <ClInclude Include="TFE_Audio\midiPlayer.h">
       <Filter>Source\TFE_Audio</Filter>
     </ClInclude>
-    <ClInclude Include="TFE_System\Threads\mutex.h">
-      <Filter>Source\TFE_System\Threads</Filter>
-    </ClInclude>
-    <ClInclude Include="TFE_System\Threads\signal.h">
-      <Filter>Source\TFE_System\Threads</Filter>
-    </ClInclude>
-    <ClInclude Include="TFE_System\Threads\thread.h">
-      <Filter>Source\TFE_System\Threads</Filter>
-    </ClInclude>
-    <ClInclude Include="TFE_System\Threads\Win32\mutexWin32.h">
-      <Filter>Source\TFE_System\Threads\Win32</Filter>
-    </ClInclude>
-    <ClInclude Include="TFE_System\Threads\Win32\signalWin32.h">
-      <Filter>Source\TFE_System\Threads\Win32</Filter>
-    </ClInclude>
-    <ClInclude Include="TFE_System\Threads\Win32\threadWin32.h">
-      <Filter>Source\TFE_System\Threads\Win32</Filter>
-    </ClInclude>
     <ClInclude Include="TFE_FrontEndUI\console.h">
       <Filter>Source\TFE_FrontEndUI</Filter>
     </ClInclude>
@@ -1458,15 +1434,6 @@
     <ClCompile Include="TFE_Audio\midiPlayer.cpp">
       <Filter>Source\TFE_Audio</Filter>
     </ClCompile>
-    <ClCompile Include="TFE_System\Threads\Win32\mutexWin32.cpp">
-      <Filter>Source\TFE_System\Threads\Win32</Filter>
-    </ClCompile>
-    <ClCompile Include="TFE_System\Threads\Win32\signalWin32.cpp">
-      <Filter>Source\TFE_System\Threads\Win32</Filter>
-    </ClCompile>
-    <ClCompile Include="TFE_System\Threads\Win32\threadWin32.cpp">
-      <Filter>Source\TFE_System\Threads\Win32</Filter>
-    </ClCompile>
     <ClCompile Include="TFE_FrontEndUI\console.cpp">
       <Filter>Source\TFE_FrontEndUI</Filter>
     </ClCompile>