projects / packages / X11.git / blame
| Commit | Line | Data |
|---|---|---|
| 37f44e2a | 1 | --- xc.orig/config/cf/Library.tmpl 2004-08-08 14:23:13.000000000 +0200 |
| 2 | +++ xc/config/cf/Library.tmpl 2004-08-08 15:10:06.794996504 +0200 | |
| 3 | @@ -214,9 +214,9 @@ | |
| 4 | # if !DoSharedLib && defined(IncludeSharedObjectInNormalLib) | |
| 5 | # define _NormalObjCompile(options) NormalRelocLibObjCompile(options) | |
| 6 | # else | |
| 7 | -# define _NormalObjCompile(options) NormalLibObjCompile(options) | |
| 8 | +# define _NormalObjCompile(options) NormalLibObjCompile(options $(PICFLAGS)) | |
| 9 | # endif | |
| 10 | -# define _NormalObjCplusplusCompile(options) NormalLibObjCplusplusCompile(options) | |
| 11 | +# define _NormalObjCplusplusCompile(options) NormalLibObjCplusplusCompile(options $(PICFLAGS)) | |
| 12 | # define _NormalCleanDir() $(_NULLCMD_) | |
| 13 | # endif | |
| 14 | #endif | |
| 15 | @@ -229,8 +229,8 @@ | |
| 16 | # define _SharedObjCompile(options) NormalSharedLibObjCompile(options) | |
| 17 | # define _SharedObjCplusplusCompile(options) NormalSharedLibObjCplusplusCompile(options) | |
| 18 | #else | |
| 19 | -# define _SharedObjCompile(options) NormalLibObjCompile(options) | |
| 20 | -# define _SharedObjCplusplusCompile(options) NormalLibObjCplusplusCompile(options) | |
| 21 | +# define _SharedObjCompile(options) NormalLibObjCompile(options $(PICFLAGS)) | |
| 22 | +# define _SharedObjCplusplusCompile(options) NormalLibObjCplusplusCompile(options $(PICFLAGS)) | |
| 23 | #endif | |
| 24 | #endif | |
| 25 | ||
| c37c7d75 AM |
26 | --- xc.org/programs/Xserver/hw/xfree86/parser/Imakefile.org 2006-01-01 20:23:00.400963000 +0100 |
| 27 | +++ xc/programs/Xserver/hw/xfree86/parser/Imakefile 2006-01-01 20:49:54.830963000 +0100 | |
| 28 | @@ -11,6 +11,8 @@ | |
| 29 | ||
| 30 | #define UseDBMalloc NO | |
| 31 | ||
| 32 | +#define IncludeSharedObjectInNormalLib | |
| 33 | + | |
| 34 | #if UseDBMalloc | |
| 35 | SYS_LIBRARIES=-ldbmalloc | |
| 36 | DBMALLOCDEFINE=-DDBMALLOC |