diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-11-01 16:44:08 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-11-01 16:44:08 +0100 |
| commit | 7b63809aefde4b45684a71d0a60e0c00b287837a (patch) | |
| tree | 4e5a7216dd84d25aae7bae01dd0e2f650401e537 /nx-X11/programs/Xserver/Imakefile | |
| parent | 753535e390c1036e12d1fc593a232782a68bb927 (diff) | |
| parent | 2a0994122ff23cdcb852596a457ce3e57e48f9df (diff) | |
| download | nx-libs-7b63809aefde4b45684a71d0a60e0c00b287837a.tar.gz nx-libs-7b63809aefde4b45684a71d0a60e0c00b287837a.tar.bz2 nx-libs-7b63809aefde4b45684a71d0a60e0c00b287837a.zip | |
Merge branch 'uli42-pr/fix_broken_damage' into 3.6.x
Attributes GH PR #870: https://github.com/ArcticaProject/nx-libs/pull/870
Diffstat (limited to 'nx-X11/programs/Xserver/Imakefile')
| -rw-r--r-- | nx-X11/programs/Xserver/Imakefile | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index cd81c650b..8c281c453 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -134,9 +134,7 @@ INSTPGMFLAGS = OS = os/LibraryTargetName(os) BSDEMUL = $(DEPXBSDLIB) FB = fb/LibraryTargetName(fb) -#if (!(defined(NXAgentServer) && NXAgentServer)) DAMAGE = miext/damage/LibraryTargetName(damage) -#endif SHADOW = miext/shadow/LibraryTargetName(shadow) LAYER = miext/layer/LibraryTargetName(layer) #if !HasFfs && (defined(mingwArchitecture) || defined(cygwinArchitecture)) @@ -247,7 +245,6 @@ NXAGENTOBJS = hw/nxagent/miinitext.o \ hw/nxagent/NXextension.o \ hw/nxagent/NXglxext.o \ hw/nxagent/NXresource.o \ - hw/nxagent/NXdamage.o \ $(NULL) #elif !defined(Win32Architecture) NXAGENTOBJS = hw/nxagent/miinitext.o \ @@ -264,7 +261,6 @@ NXAGENTOBJS = hw/nxagent/miinitext.o \ hw/nxagent/NXglxext.o \ hw/nxagent/NXxvdisp.o \ hw/nxagent/NXresource.o \ - hw/nxagent/NXdamage.o \ $(NULL) #else NXAGENTOBJS = hw/nxagent/miinitext.o \ @@ -281,7 +277,6 @@ NXAGENTOBJS = hw/nxagent/miinitext.o \ hw/nxagent/NXglxext.o \ hw/nxagent/NXxvdisp.o \ hw/nxagent/NXresource.o \ - hw/nxagent/NXdamage.o \ dix/main.o \ $(NULL) #endif |