diff options
| author | daryll <daryll> | 2000-06-09 02:29:33 +0000 |
|---|---|---|
| committer | daryll <daryll> | 2000-06-09 02:29:33 +0000 |
| commit | cc07bbc7e27656dc17fdb830f9d5dc1aa0169e30 (patch) | |
| tree | f88d74713c9ca146f1e68d1aab0dc1e2bf2c5d21 /xc/config/cf/X11.tmpl | |
| parent | 4b274a3060b167202592c2d892cd75057b729fdf (diff) | |
Merge the latest version of the trunk into my tdfx-2-0 branch.tdfx-2-0-20000608-merge
Diffstat (limited to 'xc/config/cf/X11.tmpl')
| -rw-r--r-- | xc/config/cf/X11.tmpl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/xc/config/cf/X11.tmpl b/xc/config/cf/X11.tmpl index 2e2fbf4cf..d55f6eb04 100644 --- a/xc/config/cf/X11.tmpl +++ b/xc/config/cf/X11.tmpl @@ -1422,7 +1422,7 @@ ProjectUnsharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBSRC),XBuildLibDir) #define SharedLibGlx HasSharedLibraries #endif #ifndef NormalLibGlx -#define NormalLibGlx YES +#define NormalLibGlx (!SharedLibX11 | ForceNormalLib) #endif #ifndef DebugLibGlx #define DebugLibGlx NO @@ -1430,6 +1430,9 @@ ProjectUnsharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBSRC),XBuildLibDir) #ifndef ProfileLibGlx #define ProfileLibGlx NO #endif +#ifndef LinkGLToUsrLib +#define LinkGLToUsrLib NO +#endif #endif #ifndef SharedLibXext |