diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2016-06-25 01:35:40 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2016-06-25 01:35:40 +0200 |
| commit | 975511c875674f097bbd2be33fa947a48d8c77c6 (patch) | |
| tree | 207bba2c48054f551f19ed5aa89b9dd9616b8c60 /nx-X11/programs/Xserver/Imakefile | |
| parent | 9df153668423af868d0df739188a772fbc3356c6 (diff) | |
| parent | a5befd4e20813910022ed771cb599f15bbf4664d (diff) | |
| download | nx-libs-975511c875674f097bbd2be33fa947a48d8c77c6.tar.gz nx-libs-975511c875674f097bbd2be33fa947a48d8c77c6.tar.bz2 nx-libs-975511c875674f097bbd2be33fa947a48d8c77c6.zip | |
Merge branch 'sunweaver-pr/hw-nxagent-drop-duplicate-Xserver-code_disable-Xserver-code-and-include-in-nxagent' into arctica-3.6.x
Attributes GH PR #120: https://github.com/ArcticaProject/nx-libs/pull/120
Diffstat (limited to 'nx-X11/programs/Xserver/Imakefile')
| -rw-r--r-- | nx-X11/programs/Xserver/Imakefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index d1f2ff335..3e320f8e1 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -187,7 +187,9 @@ INSTPGMFLAGS = cfb24/ModuleLibraryTargetName(cfb24) CFB32 = cfb/ModuleLibraryTargetName(cfb) \ cfb32/ModuleLibraryTargetName(cfb32) +#if (!(defined(NXAgentServer) && NXAgentServer)) DAMAGE = miext/damage/ModuleLibraryTargetName(damage) +#endif SHADOW = miext/shadow/ModuleLibraryTargetName(shadow) LAYER = miext/layer/ModuleLibraryTargetName(layer) #else @@ -212,7 +214,9 @@ INSTPGMFLAGS = cfb/LibraryTargetName(cfb) CFB32 = cfb32/LibraryTargetName(cfb32) \ cfb/LibraryTargetName(cfb) +#if (!(defined(NXAgentServer) && NXAgentServer)) DAMAGE = miext/damage/LibraryTargetName(damage) +#endif SHADOW = miext/shadow/LibraryTargetName(shadow) LAYER = miext/layer/LibraryTargetName(layer) #endif @@ -356,7 +360,6 @@ NXAGENTOBJS = hw/nxagent/miinitext.o \ hw/nxagent/NXmiglyph.o \ hw/nxagent/NXmiexpose.o \ hw/nxagent/NXresource.o \ - hw/nxagent/NXmiwindow.o \ hw/nxagent/NXdamage.o #elif !defined(LynxOSArchitecture) && \ !defined(Win32Architecture) && \ @@ -377,7 +380,6 @@ NXAGENTOBJS = hw/nxagent/miinitext.o \ hw/nxagent/NXmiglyph.o \ hw/nxagent/NXmiexpose.o \ hw/nxagent/NXresource.o \ - hw/nxagent/NXmiwindow.o \ hw/nxagent/NXdamage.o #else NXAGENTOBJS = hw/nxagent/miinitext.o \ @@ -396,7 +398,6 @@ NXAGENTOBJS = hw/nxagent/miinitext.o \ hw/nxagent/NXmiglyph.o \ hw/nxagent/NXmiexpose.o \ hw/nxagent/NXresource.o \ - hw/nxagent/NXmiwindow.o \ hw/nxagent/NXdamage.o \ dix/main.o #endif |