Tweaked svn stuff a little more. Should be more robust now. 3rd party SVN headers+libs are no longer on svn.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4605 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2014-02-09 09:25:28 +00:00
parent 663c405165
commit 13b586ea06
88 changed files with 52 additions and 18490 deletions

View file

@ -584,7 +584,7 @@ void GLR_TimeRefresh_f (void)
if (frames < 1)
frames = 128;
#if defined(_WIN32) && !defined(_SDL)
#if defined(_WIN32) && !defined(FTE_SDL)
if (finish == 2)
{
extern HDC maindc;

View file

@ -572,7 +572,7 @@ qboolean VID_SetWindowedMode (rendererstate_t *info)
WindowRect.bottom = info->height;
#ifndef _SDL
#ifndef FTE_SDL
if (sys_parentwindow)
{
SetWindowLong(sys_parentwindow, GWL_STYLE, GetWindowLong(sys_parentwindow, GWL_STYLE)|WS_OVERLAPPED);

View file

@ -184,10 +184,11 @@ qboolean GLVID_Init (rendererstate_t *info, unsigned char *palette)
#if SDL_MAJOR_VERSION < 2
SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
#else
SDL_DisableScreenSaver();
#endif
vid_vsync.modified = true;
SDL_DisableScreenSaver();
#ifdef _WIN32
{ //win32 apis are very insistant upon having a window context for things that have nothing to do with windowing system stuff.
@ -201,7 +202,6 @@ qboolean GLVID_Init (rendererstate_t *info, unsigned char *palette)
#else
SDL_SysWMinfo wmInfo;
SDL_GetWMInfo(&wmInfo);
memset(&bi, 0, sizeof(bi));
mainwindow = wmInfo.window; //note that this is usually still null
#endif
}
@ -245,6 +245,7 @@ void GL_DoSwap (void)
return;
screenflush = 0;
#if SDL_MAJOR_VERSION >= 2
if (vid_vsync.modified)
{
if (*vid_vsync.string)
@ -256,7 +257,6 @@ void GL_DoSwap (void)
vid_vsync.modified = false;
}
#if SDL_MAJOR_VERSION >= 2
SDL_GL_SwapWindow(sdlwindow);
#else
SDL_GL_SwapBuffers();