diff options
Diffstat (limited to 'src/glut')
| -rw-r--r-- | src/glut/glx/SConscript | 2 | ||||
| -rw-r--r-- | src/glut/glx/glut_fullscrn.c | 1 | ||||
| -rw-r--r-- | src/glut/glx/glut_gamemode.c | 1 | ||||
| -rw-r--r-- | src/glut/glx/glut_init.c | 1 | ||||
| -rw-r--r-- | src/glut/glx/glut_menu2.c | 1 | ||||
| -rw-r--r-- | src/glut/glx/glut_overlay.c | 1 | ||||
| -rw-r--r-- | src/glut/glx/layerutil.c | 1 |
7 files changed, 2 insertions, 6 deletions
diff --git a/src/glut/glx/SConscript b/src/glut/glx/SConscript index 5234e6d58ac..9363b5ca5cc 100644 --- a/src/glut/glx/SConscript +++ b/src/glut/glx/SConscript @@ -105,5 +105,7 @@ env.InstallSharedLibrary(glut, version=(3, 7, 1)) if env['platform'] == 'windows': glut = env.FindIxes(glut, 'LIBPREFIX', 'LIBSUFFIX') +else: + glut = env.FindIxes(glut, 'SHLIBPREFIX', 'SHLIBSUFFIX') Export('glut') diff --git a/src/glut/glx/glut_fullscrn.c b/src/glut/glx/glut_fullscrn.c index aab3b487638..78a7a6148b6 100644 --- a/src/glut/glx/glut_fullscrn.c +++ b/src/glut/glx/glut_fullscrn.c @@ -14,7 +14,6 @@ #if !defined(_WIN32) #include <X11/Xlib.h> -#include <X11/Xatom.h> #endif /* SGI optimization introduced in IRIX 6.3 to avoid X server diff --git a/src/glut/glx/glut_gamemode.c b/src/glut/glx/glut_gamemode.c index 3ffeafee57f..4a92099f3fe 100644 --- a/src/glut/glx/glut_gamemode.c +++ b/src/glut/glx/glut_gamemode.c @@ -18,7 +18,6 @@ #ifndef _WIN32 #include <X11/Xlib.h> -#include <X11/Xatom.h> /* SGI optimization introduced in IRIX 6.3 to avoid X server round trips for interning common X atoms. */ diff --git a/src/glut/glx/glut_init.c b/src/glut/glx/glut_init.c index 78843e93bc2..842aefc93c7 100644 --- a/src/glut/glx/glut_init.c +++ b/src/glut/glx/glut_init.c @@ -15,7 +15,6 @@ #if !defined(_WIN32) #include <X11/Xlib.h> -#include <X11/Xatom.h> #endif /* SGI optimization introduced in IRIX 6.3 to avoid X server diff --git a/src/glut/glx/glut_menu2.c b/src/glut/glx/glut_menu2.c index 969b8120b44..3a66101bc42 100644 --- a/src/glut/glx/glut_menu2.c +++ b/src/glut/glx/glut_menu2.c @@ -25,7 +25,6 @@ #include <X11/Xlib.h> #include "glutint.h" -#include "layerutil.h" /* CENTRY */ /* DEPRICATED, use glutMenuStatusFunc instead. */ diff --git a/src/glut/glx/glut_overlay.c b/src/glut/glx/glut_overlay.c index 837bbc3cb2a..db1abe005d8 100644 --- a/src/glut/glx/glut_overlay.c +++ b/src/glut/glx/glut_overlay.c @@ -17,7 +17,6 @@ #if !defined(_WIN32) #include <X11/Xlib.h> #include <X11/Xutil.h> -#include <X11/Xatom.h> /* for XA_RGB_DEFAULT_MAP atom */ #if defined (__vms) #include <Xmu/StdCmap.h> /* for XmuLookupStandardColormap */ #else diff --git a/src/glut/glx/layerutil.c b/src/glut/glx/layerutil.c index 26ba0b6029d..36d43e59f0a 100644 --- a/src/glut/glx/layerutil.c +++ b/src/glut/glx/layerutil.c @@ -13,7 +13,6 @@ /* SGI optimization introduced in IRIX 6.3 to avoid X server round trips for interning common X atoms. */ -#include <X11/Xatom.h> #if defined(_SGI_EXTRA_PREDEFINES) && !defined(NO_FAST_ATOMS) #include <X11/SGIFastAtom.h> #else |