diff options
author | Jay Sorg <jay.sorg@gmail.com> | 2012-03-07 21:02:41 -0800 |
---|---|---|
committer | Jay Sorg <jay.sorg@gmail.com> | 2012-03-07 21:02:41 -0800 |
commit | 1986fcc6afee53bf43bad1ee3f841c344a5c8e70 (patch) | |
tree | 02a643d314bb0f040108595238ee65cb34a4a942 /xorg/X11R7.6/rdp/Makefile | |
parent | 5b40f518c187e172658e91c42eef713312485a79 (diff) | |
download | xrdp-proprietary-1986fcc6afee53bf43bad1ee3f841c344a5c8e70.tar.gz xrdp-proprietary-1986fcc6afee53bf43bad1ee3f841c344a5c8e70.zip |
xrdp:X11R7.6: work on building X11rdp
Diffstat (limited to 'xorg/X11R7.6/rdp/Makefile')
-rw-r--r-- | xorg/X11R7.6/rdp/Makefile | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/xorg/X11R7.6/rdp/Makefile b/xorg/X11R7.6/rdp/Makefile index fca19322..c373d91e 100644 --- a/xorg/X11R7.6/rdp/Makefile +++ b/xorg/X11R7.6/rdp/Makefile @@ -4,28 +4,30 @@ INCBASE = $(X11RDPBASE)/include LIBBASE = $(X11RDPBASE)/lib -OBJS = rdpmain.o rdpdraw.o rdpinput.o rdpmisc.o rdpup.o miinitext.o fbcmap.o - -LIBS = ../../dbe/.libs/libdbe.a \ - ../../dix/.libs/libdix.a \ - ../../fb/.libs/libfb.a \ - ../../mfb/.libs/libmfb.a \ - ../../mi/.libs/libmi.a \ - ../../os/.libs/libos.a \ - ../../randr/.libs/librandr.a \ - ../../record/.libs/librecord.a \ - ../../render/.libs/librender.a \ - ../../xkb/.libs/libxkb.a \ - ../../XTrap/.libs/libxtrap.a \ - ../../Xext/.libs/libXext.a \ - ../../Xi/.libs/libXi.a \ - ../../GL/glx/.libs/libglx.a \ - ../../GL/mesa/.libs/libGLcore.a \ - ../../xfixes/.libs/libxfixes.a \ +XSRCBASE = ../build_dir/xorg-server-1.9.3 + +OBJS = rdpmain.o rdpdraw.o rdpinput.o rdpmisc.o rdpup.o miinitext.o + +# fbcmap.o + +LIBS = $(XSRCBASE)/dbe/.libs/libdbe.a \ + $(XSRCBASE)/dix/.libs/libdix.a \ + $(XSRCBASE)/dix/.libs/libmain.a \ + $(XSRCBASE)/fb/.libs/libfb.a \ + $(XSRCBASE)/mi/.libs/libmi.a \ + $(XSRCBASE)/os/.libs/libos.a \ + $(XSRCBASE)/randr/.libs/librandr.a \ + $(XSRCBASE)/record/.libs/librecord.a \ + $(XSRCBASE)/render/.libs/librender.a \ + $(XSRCBASE)/xkb/.libs/libxkb.a \ + $(XSRCBASE)/Xext/.libs/libXext.a \ + $(XSRCBASE)/Xi/.libs/libXi.a \ + $(XSRCBASE)/glx/.libs/libglx.a \ + $(XSRCBASE)/xfixes/.libs/libxfixes.a \ librdp.a \ - -lfreetype -lz -lm -lXfont -lXau -lXdmcp + -lfreetype -lz -lm -lXfont -lXau -lXdmcp -lpixman-1 -CFLAGS = -O2 -fno-strength-reduce \ +CFLAGS = -O2 -Wall -fno-strength-reduce \ -I../../include \ -I../../cfb \ -I../../mfb \ @@ -80,8 +82,8 @@ X11rdp: $(OBJS) clean: rm -f $(OBJS) librdp.a -miinitext.o: ../../mi/miinitext.c - $(CC) $(CFLAGS) -c ../../mi/miinitext.c +miinitext.o: ../build_dir/xorg-server-1.9.3/mi/miinitext.c + $(CC) $(CFLAGS) -I../build_dir/xorg-server-1.9.3/Xext -c ../build_dir/xorg-server-1.9.3/mi/miinitext.c -fbcmap.o: ../../fb/fbcmap.c - $(CC) $(CFLAGS) -c ../../fb/fbcmap.c +#fbcmap.o: ../../fb/fbcmap.c +# $(CC) $(CFLAGS) -c ../../fb/fbcmap.c |