Unverified Commit 4904bfe1 authored by Mike Gabriel's avatar Mike Gabriel

Merge branch 'uli42-pr/fix_region_crash' into 3.6.x

parents bdc698b7 6f22fb9e
...@@ -123,6 +123,9 @@ OBJS = $(CBRT_OBJ) \ ...@@ -123,6 +123,9 @@ OBJS = $(CBRT_OBJ) \
#if NXLibraries #if NXLibraries
NX_DEFINES = -DNXAGENT_SERVER \
$(NULL)
/* /*
* To build the NX agent we need the XINPUT symbol * To build the NX agent we need the XINPUT symbol
* in order to build the XInputExtension, since we * in order to build the XInputExtension, since we
...@@ -155,7 +158,7 @@ LINTLIBS = \ ...@@ -155,7 +158,7 @@ LINTLIBS = \
../os/llib-los.ln \ ../os/llib-los.ln \
$(NULL) $(NULL)
DEFINES = $(FFS_DEFINES) DEFINES = $(FFS_DEFINES) $(NX_DEFINES)
NormalLibraryObjectRule() NormalLibraryObjectRule()
NormalLibraryTarget(mi,$(OBJS)) NormalLibraryTarget(mi,$(OBJS))
......
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