Remove XASH_SDL from menu

FWGS · Aug 13, 2016 · a64ef4f · a64ef4f
1 parent 166d13e
commit a64ef4f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/mainui/basemenu.cpp b/mainui/basemenu.cpp
@@ -1367,7 +1367,7 @@ void UI_SetActiveMenu( int fActive )
 }
 
 
-#if defined _WIN32 && !defined XASH_SDL
+#if defined _WIN32
 #include <windows.h>
 #include <winbase.h>
 /*
@@ -1393,8 +1393,6 @@ double Sys_DoubleTime( void )
 #else
 #if _MSC_VER == 1200
 typedef __int64 longtime_t; //msvc6
-#elif defined (XASH_SDL)
-typedef Uint64 longtime_t;
 #else
 typedef unsigned long long longtime_t;
 #endif
@@ -1409,15 +1407,6 @@ double Sys_DoubleTime( void )
 	static longtime_t g_PerformanceFrequency;
 	static longtime_t g_ClockStart;
 	longtime_t CurrentTime;
-#ifdef XASH_SDL
-	if( !g_PerformanceFrequency )
-	{
-		g_PerformanceFrequency = SDL_GetPerformanceFrequency();
-		g_ClockStart = SDL_GetPerformanceCounter();
-	}
-	CurrentTime = SDL_GetPerformanceCounter();
-	return (double)( CurrentTime - g_ClockStart ) / (double)( g_PerformanceFrequency );
-#else
 	struct timespec ts;
 	if( !g_PerformanceFrequency )
 	{
@@ -1427,7 +1416,6 @@ double Sys_DoubleTime( void )
 	}
 	clock_gettime(CLOCK_MONOTONIC, &ts);
 	return (double) ts.tv_sec + (double) ts.tv_nsec/1000000000.0;
-#endif
 }
 #endif
 

diff --git a/mainui/mainui.vcxproj b/mainui/mainui.vcxproj
@@ -194,7 +194,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>XASH_VGUI;XASH_SDL;WIN32;MAINUI_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>XASH_VGUI;WIN32;MAINUI_EXPORTS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
     </ClCompile>
     <Link>