diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2012-03-13 17:18:10 -0700 |
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2012-03-13 17:18:10 -0700 |
| commit | 35bc7a1588a1a6c40fe1d20c07b2bc66e93b88e9 (patch) | |
| tree | 316eee90522c1e36233caad309dee58aff67cba8 /xorg/X11R7.6/rdp/Makefile | |
| parent | 288961c60f5e7472a61a0c4cc65d3dc568148114 (diff) | |
| download | xrdp-proprietary-35bc7a1588a1a6c40fe1d20c07b2bc66e93b88e9.tar.gz xrdp-proprietary-35bc7a1588a1a6c40fe1d20c07b2bc66e93b88e9.zip | |
xorg: added DAMAGE, fix keyboard sync
Diffstat (limited to 'xorg/X11R7.6/rdp/Makefile')
| -rw-r--r-- | xorg/X11R7.6/rdp/Makefile | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/xorg/X11R7.6/rdp/Makefile b/xorg/X11R7.6/rdp/Makefile index f73d697f..3caf5692 100644 --- a/xorg/X11R7.6/rdp/Makefile +++ b/xorg/X11R7.6/rdp/Makefile @@ -28,10 +28,14 @@ LIBS = $(XSRCBASE)/dbe/.libs/libdbe.a \ $(XSRCBASE)/Xi/.libs/libXi.a \ $(XSRCBASE)/glx/.libs/libglx.a \ $(XSRCBASE)/xfixes/.libs/libxfixes.a \ - librdp.a \ - -lfreetype -lz -lm -lXfont -lXau -lXdmcp -lpixman-1 -lrt -ldl -lcrypto -lGL + $(XSRCBASE)/damageext/.libs/libdamageext.a \ + $(XSRCBASE)/miext/damage/.libs/libdamage.a \ + librdp.a -CFLAGS = -g -Wall -fno-strength-reduce \ +LLIBS = -Wl,-rpath=$(LIBBASE) -lfreetype -lz -lm -lXfont -lXau \ + -lXdmcp -lpixman-1 -lrt -ldl -lcrypto -lGL -lXdamage + +CFLAGS = -O2 -Wall -fno-strength-reduce \ -I../../include \ -I../../cfb \ -I../../mfb \ @@ -52,7 +56,7 @@ CFLAGS = -g -Wall -fno-strength-reduce \ -DDBE -DEVI -DXVMC -DFONTCACHE -DGCCUSESGAS -DSTATIC_COLOR \ -DAVOID_GLYPHBLT -DFUNCPROTO=15 -DNARROWPROTO -DDDXOSFATALERROR \ -DPART_NET -DDDXTIME -D_HAVE_XALLOC_DECLS \ - \ + -DDAMAGE \ -DXFIXES \ -DSMART_SCHEDULE -DSERVER_LOCK -DGLXEXT -DSHAPE -DRENDER -DRANDR \ -DBIGREQS -D_POSIX_SOURCE -D_BSD_SOURCE -DSCREENSAVER \ @@ -60,6 +64,8 @@ CFLAGS = -g -Wall -fno-strength-reduce \ -DDPMSExtension -DXvExtension -DXvMCExtension -DXResExtension \ -DMITSHM -DPIXPRIV -DNDEBUG -DDDXOSINIT -DXKB -DXINPUT +#-DDAMAGE + # -pedantic # -DXCSECURITY -DXF86BIGFONT @@ -82,12 +88,12 @@ all: X11rdp X11rdp: $(OBJS) $(AR) rvu librdp.a $(OBJS) ranlib librdp.a - $(CC) $(LDFLAGS) -o X11rdp $(LIBS) $(LIBS) + $(CC) $(LDFLAGS) -o X11rdp $(LIBS) $(LIBS) $(LLIBS) clean: rm -f $(OBJS) librdp.a -miinitext.o: ../build_dir/xorg-server-1.9.3/mi/miinitext.c +miinitext.o: ../build_dir/xorg-server-1.9.3/mi/miinitext.c Makefile $(CC) $(CFLAGS) -I../build_dir/xorg-server-1.9.3/Xext -c ../build_dir/xorg-server-1.9.3/mi/miinitext.c fbcmap.o: ../build_dir/xorg-server-1.9.3/fb/fbcmap.c |