aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-05-30 21:16:29 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-05-30 21:16:29 +0200
commit4904bfe1f57d50134fd12a08424d299ef4094ef5 (patch)
tree4e63ce60e31e6f8dab29a419c82f056e057eac4c
parentbdc698b7a6b7a0f46019785c288d1baf5fdc9e2e (diff)
parent6f22fb9ee4232473793c8c1f1fce5ab27269b715 (diff)
downloadnx-libs-4904bfe1f57d50134fd12a08424d299ef4094ef5.tar.gz
nx-libs-4904bfe1f57d50134fd12a08424d299ef4094ef5.tar.bz2
nx-libs-4904bfe1f57d50134fd12a08424d299ef4094ef5.zip
Merge branch 'uli42-pr/fix_region_crash' into 3.6.x
Attributes GH PR #927: https://github.com/ArcticaProject/nx-libs/pull/927
-rw-r--r--nx-X11/programs/Xserver/mi/Imakefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/mi/Imakefile b/nx-X11/programs/Xserver/mi/Imakefile
index 46e5191ad..71245a407 100644
--- a/nx-X11/programs/Xserver/mi/Imakefile
+++ b/nx-X11/programs/Xserver/mi/Imakefile
@@ -123,6 +123,9 @@ OBJS = $(CBRT_OBJ) \
#if NXLibraries
+NX_DEFINES = -DNXAGENT_SERVER \
+ $(NULL)
+
/*
* To build the NX agent we need the XINPUT symbol
* in order to build the XInputExtension, since we
@@ -155,7 +158,7 @@ LINTLIBS = \
../os/llib-los.ln \
$(NULL)
-DEFINES = $(FFS_DEFINES)
+DEFINES = $(FFS_DEFINES) $(NX_DEFINES)
NormalLibraryObjectRule()
NormalLibraryTarget(mi,$(OBJS))