summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--xorg/server/module/Makefile2
-rw-r--r--xorg/server/readme.txt2
-rw-r--r--xorg/server/xrdpdev/Makefile3
-rw-r--r--xorg/server/xrdpdev/xorg.conf8
4 files changed, 7 insertions, 8 deletions
diff --git a/xorg/server/module/Makefile b/xorg/server/module/Makefile
index cb2439fa..f2442c82 100644
--- a/xorg/server/module/Makefile
+++ b/xorg/server/module/Makefile
@@ -5,7 +5,7 @@ rdpPolyRectangle.o rdpPolyArc.o rdpFillPolygon.o rdpPolyFillRect.o \
rdpPolyFillArc.o rdpPolyText8.o rdpPolyText16.o rdpImageText8.o \
rdpImageText16.o rdpImageGlyphBlt.o rdpPolyGlyphBlt.o rdpPushPixels.o
-CFLAGS = -O2 -Wall -I/usr/include/xorg -I/usr/include/pixman-1
+CFLAGS = -O2 -Wall -fPIC -I/usr/include/xorg -I/usr/include/pixman-1
LDFLAGS =
diff --git a/xorg/server/readme.txt b/xorg/server/readme.txt
index f9380ef7..3c607e85 100644
--- a/xorg/server/readme.txt
+++ b/xorg/server/readme.txt
@@ -7,5 +7,5 @@ to run it
create /etc/X11/xrdp
copy xorg.conf into it
-Xorg -config xrdp/xorg.conf -logfile /tmp/Xjay.log :10
+Xorg -config xrdp/xorg.conf -logfile /tmp/Xjay.log -novtswitch -sharevts -noreset :10
diff --git a/xorg/server/xrdpdev/Makefile b/xorg/server/xrdpdev/Makefile
index 1e97b94f..1c680268 100644
--- a/xorg/server/xrdpdev/Makefile
+++ b/xorg/server/xrdpdev/Makefile
@@ -1,7 +1,7 @@
OBJS = xrdpdev.o
-CFLAGS = -O2 -Wall -I/usr/include/xorg -I/usr/include/pixman-1 -I../module
+CFLAGS = -O2 -Wall -fPIC -I/usr/include/xorg -I/usr/include/pixman-1 -I../module
LDFLAGS =
@@ -14,4 +14,3 @@ xrdpdev_drv.so: $(OBJS) Makefile
clean:
rm -f $(OBJS) xrdpdev_drv.so
-
diff --git a/xorg/server/xrdpdev/xorg.conf b/xorg/server/xrdpdev/xorg.conf
index 9cda5d4d..a44c92dd 100644
--- a/xorg/server/xrdpdev/xorg.conf
+++ b/xorg/server/xrdpdev/xorg.conf
@@ -6,9 +6,9 @@ Section "ServerLayout"
InputDevice "xrdpKeyboard" "CoreKeyboard"
EndSection
-Section "ServerFlags"
- Option "DontVTSwitch" "on"
-EndSection
+#Section "ServerFlags"
+# Option "DontVTSwitch" "on"
+#EndSection
Section "Files"
FontPath "/usr/X11R6/lib/X11/fonts/misc/:unscaled"
@@ -51,7 +51,7 @@ Section "Monitor"
EndSection
Section "Device"
- Identifier "Video Card (xrdpdev)"
+ Identifier "Video Card (xrdpdev)"
Driver "xrdpdev"
EndSection