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:
parent
663c405165
commit
13b586ea06
88 changed files with 52 additions and 18490 deletions
|
@ -3988,7 +3988,7 @@ void Host_DoRunFile(hrf_t *f)
|
|||
qboolean Host_RunFile(const char *fname, int nlen, vfsfile_t *file)
|
||||
{
|
||||
hrf_t *f;
|
||||
#if defined(_WIN32) && !defined(_SDL)
|
||||
#if defined(_WIN32) && !defined(FTE_SDL)
|
||||
//win32 file urls are basically fucked, so defer to the windows api.
|
||||
char utf8[MAX_OSPATH*3];
|
||||
if (nlen >= 7 && !strncmp(fname, "file://", 7))
|
||||
|
|
|
@ -36,10 +36,8 @@ extern cvar_t in_xflip;
|
|||
extern float mousecursor_x, mousecursor_y;
|
||||
extern float mousemove_x, mousemove_y;
|
||||
|
||||
//#ifdef _SDL
|
||||
void IN_ActivateMouse(void);
|
||||
void IN_DeactivateMouse(void);
|
||||
//#endif
|
||||
|
||||
int CL_TargettedSplit(qboolean nowrap);
|
||||
|
||||
|
|
|
@ -631,7 +631,7 @@ void R2D_Conback_Callback(struct cvar_s *var, char *oldvalue)
|
|||
}
|
||||
}
|
||||
|
||||
#if defined(_WIN32) && !defined(_SDL)
|
||||
#if defined(_WIN32) && !defined(FTE_SDL)
|
||||
#include <windows.h>
|
||||
qboolean R2D_Font_WasAdded(char *buffer, char *fontfilename)
|
||||
{
|
||||
|
@ -706,7 +706,7 @@ void R2D_Font_Changed(void)
|
|||
if (qrenderer == QR_NONE)
|
||||
return;
|
||||
|
||||
#if defined(_WIN32) && !defined(_SDL)
|
||||
#if defined(_WIN32) && !defined(FTE_SDL)
|
||||
if (!strcmp(gl_font.string, "?"))
|
||||
{
|
||||
BOOL (APIENTRY *pChooseFontA)(LPCHOOSEFONTA) = NULL;
|
||||
|
|
|
@ -666,7 +666,7 @@ static int DSOUND_InitCard_Internal (soundcardinfo_t *sc, char *cardname)
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef _SDL
|
||||
#ifdef FTE_SDL
|
||||
#define mainwindow GetDesktopWindow()
|
||||
#endif
|
||||
if (DS_OK != dh->pDS->lpVtbl->SetCooperativeLevel (dh->pDS, mainwindow, DSSCL_EXCLUSIVE))
|
||||
|
@ -700,7 +700,7 @@ static int DSOUND_InitCard_Internal (soundcardinfo_t *sc, char *cardname)
|
|||
dsbuf.lpwfxFormat = NULL;
|
||||
|
||||
#ifdef DSBCAPS_GLOBALFOCUS
|
||||
#ifndef _SDL
|
||||
#ifndef FTE_SDL
|
||||
if (snd_inactive.ival || sys_parentwindow
|
||||
) /*always inactive if we have a parent window, because we can't tell properly otherwise*/
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue