diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-02-27 04:08:51 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-02-27 04:08:51 +0100 |
| commit | 0a5d26d121a8420feb25bd68c8f1623edf50e0a8 (patch) | |
| tree | 104d1f0ff7e856a3c2e54433046e52346e80d356 /nx-X11/programs/Xserver/dix/Imakefile | |
| parent | e1f2902bb1ad29f852f97dc08a3e3e29ad88c384 (diff) | |
| parent | fff875549f70b5f16f9e15cb8fdb4022939bf806 (diff) | |
| download | nx-libs-0a5d26d121a8420feb25bd68c8f1623edf50e0a8.tar.gz nx-libs-0a5d26d121a8420feb25bd68c8f1623edf50e0a8.tar.bz2 nx-libs-0a5d26d121a8420feb25bd68c8f1623edf50e0a8.zip | |
Merge branch 'sunweaver-pr/hard-code-rgb-colors' into 3.6.x
Attributes GH PR #319: https://github.com/ArcticaProject/nx-libs/pull/319
Diffstat (limited to 'nx-X11/programs/Xserver/dix/Imakefile')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/Imakefile | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/nx-X11/programs/Xserver/dix/Imakefile b/nx-X11/programs/Xserver/dix/Imakefile index 7acd1b45c..1024de965 100644 --- a/nx-X11/programs/Xserver/dix/Imakefile +++ b/nx-X11/programs/Xserver/dix/Imakefile @@ -91,7 +91,6 @@ OBJS = \ * .macros files or site.def in the directory util/imake.includes/: * * DefaultFontPath COMPILEDDEFAULTFONTPATH - * DefaultRGBDatabase RGB_DB * * The sample util/imake.includes/Imake.tmpl will provide generic defaults. * The values in site.h are simply a last line of defense and should not be @@ -103,11 +102,6 @@ DEFAULTFONTPATH = DefaultFontPath SITE_FONT_PATH = -DCOMPILEDDEFAULTFONTPATH=\"$(DEFAULTFONTPATH)\" #endif -#ifdef DefaultRGBDatabase -DEFAULTRGBDATABASE = DefaultRGBDatabase - SITE_RGB_DB = -DRGB_DB=\"$(DEFAULTRGBDATABASE)\" -#endif - #ifdef DefaultDisplayClass DEFAULTDISPLAYCLASS = DefaultDisplayClass SITE_DISPLAY_CLASS = -DCOMPILEDDISPLAYCLASS=\"$(DEFAULTDISPLAYCLASS)\" @@ -129,7 +123,7 @@ VENDORRELEASE = XVendorRelease #endif #endif -SITE_DEFINES = $(SITE_FONT_PATH) $(SITE_RGB_DB) $(SITE_DISPLAY_CLASS) +SITE_DEFINES = $(SITE_FONT_PATH) $(SITE_DISPLAY_CLASS) VENDOR_DEFINES = $(VENDOR_STRING) $(VENDOR_RELEASE) $(QUARTZ_DEFINES) |