added linux timing code to SDL client for more accurate r_speeds reports

[xonotic/darkplaces.git] / darkplaces-sdl.dev

diff --git a/darkplaces-sdl.dev b/darkplaces-sdl.dev
index 1485a4e98c323ddda945677695cae1a4c9d60991..bd3b77cfe6bc974686dcd9832eead7bdad3b7bd7 100755 (executable)
--- a/darkplaces-sdl.dev
+++ b/darkplaces-sdl.dev
@@ -1,7 +1,15 @@
 [Project]\r
 FileName=darkplaces-sdl.dev\r
 Name=DarkPlaces\r
+<<<<<<< .mine\r
+<<<<<<< .mine\r
+UnitCount=182\r
+=======\r
 UnitCount=175\r
+=======\r
+UnitCount=183\r
+>>>>>>> .r9892\r
+>>>>>>> .r9586\r
 Type=0\r
 Ver=1\r
 ObjFiles=\r
@@ -1757,18 +1765,8 @@ Priority=1000
 OverrideBuildCmd=0\r
 BuildCmd=\r
 \r
-[Unit176]\r
-FileName=SDLMain.h\r
-CompileCpp=0\r
-Folder=Header Files\r
-Compile=1\r
-Link=1\r
-Priority=1000\r
-OverrideBuildCmd=0\r
-BuildCmd=\r
-\r
 [Unit179]\r
-FileName=timing.h\r
+FileName=ft2_fontdefs.h\r
 CompileCpp=0\r
 Folder=Header Files\r
 Compile=1\r
@@ -1778,9 +1776,9 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit181]\r
-FileName=darkplaces_private.h\r
+FileName=utf8lib.c\r
 CompileCpp=0\r
-Folder=Header Files\r
+Folder=Source Files\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -1788,7 +1786,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit182]\r
-FileName=SDLMain.h\r
+FileName=bih.h\r
 CompileCpp=0\r
 Folder=Header Files\r
 Compile=1\r
@@ -1908,7 +1906,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit178]\r
-FileName=timing.h\r
+FileName=ft2.h\r
 CompileCpp=0\r
 Folder=Header Files\r
 Compile=1\r
@@ -1918,9 +1916,9 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit180]\r
-FileName=timing.h\r
+FileName=ft2.c\r
 CompileCpp=0\r
-Folder=Header Files\r
+Folder=Source Files\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -1928,7 +1926,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit177]\r
-FileName=timing.h\r
+FileName=ft2_defs.h\r
 CompileCpp=0\r
 Folder=Header Files\r
 Compile=1\r
@@ -1967,3 +1965,23 @@ Priority=1000
 OverrideBuildCmd=0\r
 BuildCmd=\r
 \r
+[Unit176]\r
+FileName=utf8lib.h\r
+CompileCpp=0\r
+Folder=Header Files\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[Unit183]\r
+FileName=bih.c\r
+CompileCpp=0\r
+Folder=Source Files\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r