jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #487 from proski/x11rdp

Browse Source 
X11rdp build system fixes
This commit is contained in:
Itamar Reis Peixoto 2016-11-13 20:46:48 -02:00 committed by GitHub
commit ad62e52f28
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xorg/X11R7.6/buildx.sh
View File

@ -278,8 +278,8 @@ fi
# this will copy the build X server with the other X server binaries # this will copy the build X server with the other X server binaries
cd rdp cd rdp
strip X11rdp
cp X11rdp $X11RDPBASE/bin cp X11rdp $X11RDPBASE/bin
strip $X11RDPBASE/bin/X11rdp
if [ "$2" = "drop" ]; then if [ "$2" = "drop" ]; then
echo "" echo ""

24
xorg/X11R7.6/rdp/Makefile
View File

@ -1,6 +1,9 @@
# X11RDPBASE is the top-level X11rdp install directory
ifeq ($(X11RDPBASE),)
$(error X11RDPBASE needs to be set)
endif
#X11RDPBASE is an environment variable that needs to be set BINBASE = $(X11RDPBASE)/bin
INCBASE = $(X11RDPBASE)/include INCBASE = $(X11RDPBASE)/include
LIBBASE = $(X11RDPBASE)/lib LIBBASE = $(X11RDPBASE)/lib
@ -23,23 +26,24 @@ fbcmap_mi.o
#fbcmap_mi.o #fbcmap_mi.o
#fbcmap.o #fbcmap.o
LIBS = $(XSRCBASE)/dbe/.libs/libdbe.a \ LIBS = \
$(XSRCBASE)/dix/.libs/libdix.a \
$(XSRCBASE)/dix/.libs/libmain.a \ $(XSRCBASE)/dix/.libs/libmain.a \
librdp.a \
$(XSRCBASE)/dbe/.libs/libdbe.a \
$(XSRCBASE)/dix/.libs/libdix.a \
$(XSRCBASE)/fb/.libs/libfb.a \ $(XSRCBASE)/fb/.libs/libfb.a \
$(XSRCBASE)/mi/.libs/libmi.a \ $(XSRCBASE)/mi/.libs/libmi.a \
$(XSRCBASE)/os/.libs/libos.a \
$(XSRCBASE)/randr/.libs/librandr.a \ $(XSRCBASE)/randr/.libs/librandr.a \
$(XSRCBASE)/record/.libs/librecord.a \
$(XSRCBASE)/render/.libs/librender.a \ $(XSRCBASE)/render/.libs/librender.a \
$(XSRCBASE)/os/.libs/libos.a \
$(XSRCBASE)/record/.libs/librecord.a \
$(XSRCBASE)/xkb/.libs/libxkb.a \ $(XSRCBASE)/xkb/.libs/libxkb.a \
$(XSRCBASE)/Xext/.libs/libXext.a \ $(XSRCBASE)/Xext/.libs/libXext.a \
$(XSRCBASE)/Xi/.libs/libXi.a \ $(XSRCBASE)/Xi/.libs/libXi.a \
$(XSRCBASE)/glx/.libs/libglx.a \ $(XSRCBASE)/glx/.libs/libglx.a \
$(XSRCBASE)/xfixes/.libs/libxfixes.a \ $(XSRCBASE)/xfixes/.libs/libxfixes.a \
$(XSRCBASE)/damageext/.libs/libdamageext.a \ $(XSRCBASE)/damageext/.libs/libdamageext.a \
$(XSRCBASE)/miext/damage/.libs/libdamage.a \ $(XSRCBASE)/miext/damage/.libs/libdamage.a
librdp.a
LLIBS = -Wl,-rpath=$(LIBBASE) -lfreetype -lz -lm -lXfont -lXau \ LLIBS = -Wl,-rpath=$(LIBBASE) -lfreetype -lz -lm -lXfont -lXau \
-lXdmcp -lpixman-1 -lrt -ldl -lcrypto -lGL -lXdamage -lXdmcp -lpixman-1 -lrt -ldl -lcrypto -lGL -lXdamage
@ -98,7 +102,7 @@ all: X11rdp
X11rdp: $(OBJS) X11rdp: $(OBJS)
$(AR) rvu librdp.a $(OBJS) $(AR) rvu librdp.a $(OBJS)
ranlib librdp.a ranlib librdp.a
$(CC) $(LDFLAGS) -o X11rdp $(LIBS) $(LIBS) $(LLIBS) $(CC) $(LDFLAGS) -o X11rdp $(LIBS) $(LLIBS)
clean: clean:
rm -f $(OBJS) librdp.a rm -f $(OBJS) librdp.a
@ -113,4 +117,4 @@ fbcmap_mi.o: ../build_dir/xorg-server-1.9.3/fb/fbcmap_mi.c
$(CC) $(CFLAGS) -c ../build_dir/xorg-server-1.9.3/fb/fbcmap_mi.c $(CC) $(CFLAGS) -c ../build_dir/xorg-server-1.9.3/fb/fbcmap_mi.c
install: all install: all
$(INSTALL) X11rdp $(X11RDPBASE)/bin/X11rdp $(INSTALL) X11rdp $(BINBASE)/X11rdp