X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sys_sdl.c;h=e63c85ba817117224c0d5a232d6347a50f7beb58;hb=371dd80226347111360c8222a17d1c3d6fc26c72;hp=d3564bac89fb0a76a699f9da6ddd092ef9b213ed;hpb=2af7bf1a4eb9a5c9a1cfe76f9f8690523bafbd3e;p=xonotic%2Fdarkplaces.git

diff --git a/sys_sdl.c b/sys_sdl.c
index d3564bac..e63c85ba 100644
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -22,15 +22,10 @@
 
 #ifdef WIN32
 #ifdef _MSC_VER
-#if SDL_MAJOR_VERSION == 1
-#pragma comment(lib, "sdl.lib")
-#pragma comment(lib, "sdlmain.lib")
-#else
 #pragma comment(lib, "sdl2.lib")
 #pragma comment(lib, "sdl2main.lib")
 #endif
 #endif
-#endif
 
 #include "quakedef.h"
 
@@ -173,7 +168,6 @@ char *Sys_ConsoleInput(void)
 
 char *Sys_GetClipboardData (void)
 {
-#if SDL_MAJOR_VERSION != 1
 	char *data = NULL;
 	char *cliptext;
 
@@ -187,31 +181,6 @@ char *Sys_GetClipboardData (void)
 	}
 
 	return data;
-#elif defined(WIN32)
-	char *data = NULL;
-	char *cliptext;
-
-	if (OpenClipboard (NULL) != 0)
-	{
-		HANDLE hClipboardData;
-
-		if ((hClipboardData = GetClipboardData (CF_TEXT)) != 0)
-		{
-			if ((cliptext = (char *)GlobalLock (hClipboardData)) != 0)
-			{
-				size_t allocsize;
-				allocsize = GlobalSize (hClipboardData) + 1;
-				data = (char *)Z_Malloc (allocsize);
-				strlcpy (data, cliptext, allocsize);
-				GlobalUnlock (hClipboardData);
-			}
-		}
-		CloseClipboard ();
-	}
-	return data;
-#else
-	return NULL;
-#endif
 }
 
 void Sys_InitConsole (void)