Merge platform abstraction headers

Resolves #53
twhl-community · Nov 18, 2021 · 4511708 · 4511708
1 parent 2c911f9
commit 4511708
Show file tree

Hide file tree

Showing 13 changed files with 0 additions and 144 deletions.
diff --git a/cl_dll/in_camera.cpp b/cl_dll/in_camera.cpp
@@ -17,7 +17,6 @@
 #include "Exports.h"
 
 #include "SDL2/SDL_mouse.h"
-#include "port.h"
 
 float CL_KeyState (kbutton_t *key);
 

diff --git a/cl_dll/inputw32.cpp b/cl_dll/inputw32.cpp
@@ -8,8 +8,6 @@
 // in_win.c -- windows 95 mouse and joystick code
 // 02/21/97 JCB Added extended DirectInput code to support external controllers.
 
-#include "port.h"
-
 #include "hud.h"
 #include "cl_util.h"
 #include "camera.h"

diff --git a/common/nowin.h b/common/nowin.h
diff --git a/common/parsemsg.cpp b/common/parsemsg.cpp
@@ -18,7 +18,6 @@
 //--------------------------------------------------------------------------------------------------------------
 #include "extdll.h"
 #include "parsemsg.h"
-#include <port.h>
 
 #define true 1
 

diff --git a/common/port.h b/common/port.h
diff --git a/projects/vs2017/hl_cdll.vcxproj b/projects/vs2017/hl_cdll.vcxproj
@@ -239,12 +239,10 @@
     <ClInclude Include="..\..\common\mathlib.h" />
     <ClInclude Include="..\..\common\netadr.h" />
     <ClInclude Include="..\..\common\net_api.h" />
-    <ClInclude Include="..\..\common\nowin.h" />
     <ClInclude Include="..\..\common\parsemsg.h" />
     <ClInclude Include="..\..\common\particledef.h" />
     <ClInclude Include="..\..\common\Platform.h" />
     <ClInclude Include="..\..\common\pmtrace.h" />
-    <ClInclude Include="..\..\common\port.h" />
     <ClInclude Include="..\..\common\qfont.h" />
     <ClInclude Include="..\..\common\ref_params.h" />
     <ClInclude Include="..\..\common\r_efx.h" />

diff --git a/projects/vs2017/hl_cdll.vcxproj.filters b/projects/vs2017/hl_cdll.vcxproj.filters
@@ -479,18 +479,12 @@
     <ClInclude Include="..\..\common\netadr.h">
       <Filter>Header Files\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\nowin.h">
-      <Filter>Header Files\common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\particledef.h">
       <Filter>Header Files\common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\common\pmtrace.h">
       <Filter>Header Files\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\port.h">
-      <Filter>Header Files\common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\qfont.h">
       <Filter>Header Files\common</Filter>
     </ClInclude>

diff --git a/projects/vs2017/hldll.vcxproj b/projects/vs2017/hldll.vcxproj
@@ -232,10 +232,8 @@
     <ClInclude Include="..\..\common\in_buttons.h" />
     <ClInclude Include="..\..\common\mathlib.h" />
     <ClInclude Include="..\..\common\netadr.h" />
-    <ClInclude Include="..\..\common\nowin.h" />
     <ClInclude Include="..\..\common\particledef.h" />
     <ClInclude Include="..\..\common\Platform.h" />
-    <ClInclude Include="..\..\common\port.h" />
     <ClInclude Include="..\..\common\r_efx.h" />
     <ClInclude Include="..\..\common\r_studioint.h" />
     <ClInclude Include="..\..\common\screenfade.h" />

diff --git a/projects/vs2017/hldll.vcxproj.filters b/projects/vs2017/hldll.vcxproj.filters
@@ -581,15 +581,9 @@
     <ClInclude Include="..\..\common\netadr.h">
       <Filter>Header Files\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\nowin.h">
-      <Filter>Header Files\common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\particledef.h">
       <Filter>Header Files\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\port.h">
-      <Filter>Header Files\common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\r_efx.h">
       <Filter>Header Files\common</Filter>
     </ClInclude>

diff --git a/projects/vs2019/hl_cdll.vcxproj b/projects/vs2019/hl_cdll.vcxproj
@@ -239,12 +239,10 @@
     <ClInclude Include="..\..\common\mathlib.h" />
     <ClInclude Include="..\..\common\netadr.h" />
     <ClInclude Include="..\..\common\net_api.h" />
-    <ClInclude Include="..\..\common\nowin.h" />
     <ClInclude Include="..\..\common\parsemsg.h" />
     <ClInclude Include="..\..\common\particledef.h" />
     <ClInclude Include="..\..\common\Platform.h" />
     <ClInclude Include="..\..\common\pmtrace.h" />
-    <ClInclude Include="..\..\common\port.h" />
     <ClInclude Include="..\..\common\qfont.h" />
     <ClInclude Include="..\..\common\ref_params.h" />
     <ClInclude Include="..\..\common\r_efx.h" />

diff --git a/projects/vs2019/hl_cdll.vcxproj.filters b/projects/vs2019/hl_cdll.vcxproj.filters
@@ -500,18 +500,12 @@
     <ClInclude Include="..\..\common\netadr.h">
       <Filter>Header Files\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\nowin.h">
-      <Filter>Header Files\common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\particledef.h">
       <Filter>Header Files\common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\common\pmtrace.h">
       <Filter>Header Files\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\port.h">
-      <Filter>Header Files\common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\qfont.h">
       <Filter>Header Files\common</Filter>
     </ClInclude>

diff --git a/projects/vs2019/hldll.vcxproj b/projects/vs2019/hldll.vcxproj
@@ -232,10 +232,8 @@
     <ClInclude Include="..\..\common\in_buttons.h" />
     <ClInclude Include="..\..\common\mathlib.h" />
     <ClInclude Include="..\..\common\netadr.h" />
-    <ClInclude Include="..\..\common\nowin.h" />
     <ClInclude Include="..\..\common\particledef.h" />
     <ClInclude Include="..\..\common\Platform.h" />
-    <ClInclude Include="..\..\common\port.h" />
     <ClInclude Include="..\..\common\r_efx.h" />
     <ClInclude Include="..\..\common\r_studioint.h" />
     <ClInclude Include="..\..\common\screenfade.h" />

diff --git a/projects/vs2019/hldll.vcxproj.filters b/projects/vs2019/hldll.vcxproj.filters
@@ -581,15 +581,9 @@
     <ClInclude Include="..\..\common\netadr.h">
       <Filter>Header Files\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\nowin.h">
-      <Filter>Header Files\common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\particledef.h">
       <Filter>Header Files\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\port.h">
-      <Filter>Header Files\common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\r_efx.h">
       <Filter>Header Files\common</Filter>
     </ClInclude>