frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Xephyr: better compilation without GLX 

* hw/kdrive/ephyr/ephyrinit.c: protect GLX related code with GLXEXT
	  macro
This commit is contained in:
Dodji Seketeli 2007-10-04 12:06:19 +02:00
parent 604ebb5a6d
commit 8018733c39
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/kdrive/ephyr/ephyrinit.c
View File

@ -33,9 +33,12 @@ extern Window EphyrPreExistingHostWin;
extern Bool EphyrWantGrayScale; extern Bool EphyrWantGrayScale;
extern Bool kdHasPointer; extern Bool kdHasPointer;
extern Bool kdHasKbd; extern Bool kdHasKbd;
#ifdef GLXEXT
extern Bool ephyrNoDRI; extern Bool ephyrNoDRI;
extern Bool ephyrNoXV;
extern Bool noGlxVisualInit; extern Bool noGlxVisualInit;
#endif
extern Bool ephyrNoXV;
void processScreenArg (char *screen_size, char *parent_id) ; void processScreenArg (char *screen_size, char *parent_id) ;
@ -102,7 +105,9 @@ ddxUseMsg (void)
ErrorF("-grayscale Simulate 8bit grayscale\n"); ErrorF("-grayscale Simulate 8bit grayscale\n");
ErrorF("-fakexa Simulate acceleration using software rendering\n"); ErrorF("-fakexa Simulate acceleration using software rendering\n");
ErrorF("-verbosity <level> Set log verbosity level\n"); ErrorF("-verbosity <level> Set log verbosity level\n");
#ifdef GLXEXT
ErrorF("-nodri do not use DRI\n"); ErrorF("-nodri do not use DRI\n");
#endif
ErrorF("-noxv do not use XV\n"); ErrorF("-noxv do not use XV\n");
ErrorF("\n"); ErrorF("\n");
@ -206,6 +211,7 @@ ddxProcessArgument (int argc, char **argv, int i)
exit(1) ; exit(1) ;
} }
} }
#ifdef GLXEXT
else if (!strcmp (argv[i], "-nodri")) else if (!strcmp (argv[i], "-nodri"))
{ {
noGlxVisualInit = FALSE ; noGlxVisualInit = FALSE ;
@ -213,6 +219,7 @@ ddxProcessArgument (int argc, char **argv, int i)
EPHYR_LOG ("no direct rendering enabled\n") ; EPHYR_LOG ("no direct rendering enabled\n") ;
return 1 ; return 1 ;
} }
#endif
else if (!strcmp (argv[i], "-noxv")) else if (!strcmp (argv[i], "-noxv"))
{ {
ephyrNoXV = TRUE ; ephyrNoXV = TRUE ;