diff options
author | Simon Rettberg | 2019-07-30 16:07:15 +0200 |
---|---|---|
committer | Simon Rettberg | 2019-07-30 16:07:15 +0200 |
commit | 813ac136e48f60d4c2b13e808107870dafcc4d52 (patch) | |
tree | 396a6c98276f6e9a04216933daebdf3af7b81d46 /OSX/XScreenSaverGLView.h | |
parent | Flush X events before locking if we have an external ungrab command (diff) | |
parent | Update to 5.43 (diff) | |
download | xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.tar.gz xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.tar.xz xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.zip |
Merge branch 'master' into openslx (5.43)
Diffstat (limited to 'OSX/XScreenSaverGLView.h')
-rw-r--r-- | OSX/XScreenSaverGLView.h | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/OSX/XScreenSaverGLView.h b/OSX/XScreenSaverGLView.h deleted file mode 100644 index a4d1ebf..0000000 --- a/OSX/XScreenSaverGLView.h +++ /dev/null @@ -1,39 +0,0 @@ -/* xscreensaver, Copyright (c) 2006-2016 Jamie Zawinski <jwz@jwz.org> - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation. No representations are made about the suitability of this - * software for any purpose. It is provided "as is" without express or - * implied warranty. - */ - -/* This is a subclass of Apple's ScreenSaverView that knows how to run - xscreensaver programs without X11 via the dark magic of the "jwxyz" - library. In xscreensaver terminology, this is the replacement for - the "screenhack.c" module. - */ - -#import "XScreenSaverView.h" - -#ifdef USE_IPHONE -# import <OpenGLES/EAGL.h> -# import <OpenGLES/ES1/gl.h> -# import <OpenGLES/ES1/glext.h> -# import <QuartzCore/QuartzCore.h> -# import "jwzglesI.h" -#else -# import <AppKit/NSOpenGL.h> -#endif - -@interface XScreenSaverGLView : XScreenSaverView -{ -# ifdef USE_IPHONE - GLuint gl_depthbuffer; - BOOL _suppressRotationAnimation; - jwzgles_state *_glesState; -# endif /* USE_IPHONE */ -} - -@end |