Commit 148f7506 authored by Mike Gabriel's avatar Mike Gabriel

hw/nxagent/NXdamage.c: Shrink file, drop duplicate code that can identically be…

hw/nxagent/NXdamage.c: Shrink file, drop duplicate code that can identically be found in miext/damage/damage.c.
parent fd31518f
...@@ -187,7 +187,9 @@ INSTPGMFLAGS = ...@@ -187,7 +187,9 @@ INSTPGMFLAGS =
cfb24/ModuleLibraryTargetName(cfb24) cfb24/ModuleLibraryTargetName(cfb24)
CFB32 = cfb/ModuleLibraryTargetName(cfb) \ CFB32 = cfb/ModuleLibraryTargetName(cfb) \
cfb32/ModuleLibraryTargetName(cfb32) cfb32/ModuleLibraryTargetName(cfb32)
#if (!(defined(NXAgentServer) && NXAgentServer))
DAMAGE = miext/damage/ModuleLibraryTargetName(damage) DAMAGE = miext/damage/ModuleLibraryTargetName(damage)
#endif
SHADOW = miext/shadow/ModuleLibraryTargetName(shadow) SHADOW = miext/shadow/ModuleLibraryTargetName(shadow)
LAYER = miext/layer/ModuleLibraryTargetName(layer) LAYER = miext/layer/ModuleLibraryTargetName(layer)
#else #else
...@@ -212,7 +214,9 @@ INSTPGMFLAGS = ...@@ -212,7 +214,9 @@ INSTPGMFLAGS =
cfb/LibraryTargetName(cfb) cfb/LibraryTargetName(cfb)
CFB32 = cfb32/LibraryTargetName(cfb32) \ CFB32 = cfb32/LibraryTargetName(cfb32) \
cfb/LibraryTargetName(cfb) cfb/LibraryTargetName(cfb)
#if (!(defined(NXAgentServer) && NXAgentServer))
DAMAGE = miext/damage/LibraryTargetName(damage) DAMAGE = miext/damage/LibraryTargetName(damage)
#endif
SHADOW = miext/shadow/LibraryTargetName(shadow) SHADOW = miext/shadow/LibraryTargetName(shadow)
LAYER = miext/layer/LibraryTargetName(layer) LAYER = miext/layer/LibraryTargetName(layer)
#endif #endif
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
DEFINES = -DROOTLESS_WORKAROUND DEFINES = -DROOTLESS_WORKAROUND
#endif #endif
#if (!(defined(NXAgentServer) && NXAgentServer))
SRCS = damage.c SRCS = damage.c
OBJS = damage.o OBJS = damage.o
...@@ -21,6 +22,7 @@ NormalLibraryTarget(damage,$(OBJS)) ...@@ -21,6 +22,7 @@ NormalLibraryTarget(damage,$(OBJS))
LintLibraryTarget(damage,$(SRCS)) LintLibraryTarget(damage,$(SRCS))
NormalLintTarget($(SRCS)) NormalLintTarget($(SRCS))
#endif
DependTarget() DependTarget()
......
...@@ -1324,6 +1324,8 @@ damageDamageChars (DrawablePtr pDrawable, ...@@ -1324,6 +1324,8 @@ damageDamageChars (DrawablePtr pDrawable,
#define TT_POLY16 2 #define TT_POLY16 2
#define TT_IMAGE16 3 #define TT_IMAGE16 3
#ifndef NXAGENT_SERVER
static int static int
damageText (DrawablePtr pDrawable, damageText (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
...@@ -1445,6 +1447,7 @@ damageImageText16(DrawablePtr pDrawable, ...@@ -1445,6 +1447,7 @@ damageImageText16(DrawablePtr pDrawable,
DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable); DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
} }
#endif /* NXAGENT_SERVER */
static void static void
damageImageGlyphBlt(DrawablePtr pDrawable, damageImageGlyphBlt(DrawablePtr pDrawable,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment