Changeset 12498 in vbox for trunk/src

Timestamp:

Sep 16, 2008 3:54:06 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt: X11 keyboard code is not Linux-specific

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• Makefile.kmk (modified) (4 diffs)
• src/X11 (moved) (moved from trunk/src/VBox/Frontends/VirtualBox4/src/linux )
• src/X11/COPYING.LIB (copied) (copied from trunk/src/VBox/Frontends/VirtualBox4/src/linux/COPYING.LIB )
• src/X11/Makefile (copied) (copied from trunk/src/VBox/Frontends/VirtualBox4/src/linux/Makefile )
• src/X11/XKeyboard-new.cpp (copied) (copied from trunk/src/VBox/Frontends/VirtualBox4/src/linux/XKeyboard-new.cpp )
• src/X11/keyboard-layouts.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox4/src/linux/keyboard-layouts.h )
• src/X11/keyboard-list.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox4/src/linux/keyboard-list.h )
• src/X11/keyboard-new.c (copied) (copied from trunk/src/VBox/Frontends/VirtualBox4/src/linux/keyboard-new.c )
• src/X11/keyboard-tables.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox4/src/linux/keyboard-tables.h )
• src/X11/keyboard-types.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox4/src/linux/keyboard-types.h )
• src/X11/keyboard.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox4/src/linux/keyboard.h )

trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk

@@ -62 +62 @@
 VBoxKeyboard_TEMPLATE = VBOXR3
 VBoxKeyboard_SOURCES  = \
-        src/linux/keyboard-new.c
+        src/X11/keyboard-new.c
 VBoxKeyboard_LIBS     = X11
 VBoxKeyboard_LIBPATH  = $(VBOX_LIBPATH_X11)
@@ -71 +71 @@
 # redistributed with usable sources.
 #
-# This rule will link create a temporary symlink to src/linux/ and tar
+# This rule will link create a temporary symlink to src/X11/ and tar
 # up the selected files into a tarball that is installed into the
 # bin directory (probably belongs in /usr/shared/somewhere really,
@@ -79 +79 @@
 $(PATH_BIN)/vboxkeyboard.tar.gz: $(abspathex \
                 $(VBoxKeyboard_SOURCES) \
-                src/linux/COPYING.LIB \
-                src/linux/keyboard.h \
-                src/linux/keyboard-layouts.h \
-                src/linux/keyboard-list.h \
-                src/linux/keyboard-tables.h \
-                src/linux/keyboard-types.h \
-                src/linux/Makefile \
+                src/X11/COPYING.LIB \
+                src/X11/keyboard.h \
+                src/X11/keyboard-layouts.h \
+                src/X11/keyboard-list.h \
+                src/X11/keyboard-tables.h \
+                src/X11/keyboard-types.h \
+                src/X11/Makefile \
                 ,$(PATH_SUB_CURRENT))
         $(call MSG_TOOL,tar/gzip,,$@)
         $(QUIET2)$(RM) -f $(PATH_TARGET)/vboxkeyboard $@
-        $(QUIET)$(LN_SYMLINK) $(VBOX_VIRTUALBOX4_SRC)/src/linux/ $(PATH_TARGET)/vboxkeyboard
+        $(QUIET)$(LN_SYMLINK) $(VBOX_VIRTUALBOX4_SRC)/src/X11/ $(PATH_TARGET)/vboxkeyboard
         $(QUIET)cd $(PATH_TARGET) \
                 && tar -chvf - $(addprefix vboxkeyboard/,$(notdir $^)) \
@@ -357 +357 @@
  endif
  VirtualBox4_SOURCES += \
-        src/linux/XKeyboard-new.cpp \
+        src/X11/XKeyboard-new.cpp \
         src/VBoxX11Helper.cpp
 else