Changeset 4841 in vbox

Timestamp:

Sep 17, 2007 5:42:47 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

24556

Message:

Solaris.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxSDL/Makefile.kmk (modified) (3 diffs)
• Main/ConsoleImpl.cpp (modified) (1 diff)
• Main/Makefile.kmk (modified) (1 diff)
• Main/include/VirtualBoxXMLUtil.h (modified) (1 diff)
• Main/xml/VirtualBox-settings-solaris.xsd (copied) (copied from trunk/src/VBox/Main/xml/VirtualBox-settings-linux.xsd ) (4 diffs)

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

@@ -64 +64 @@
 VBoxSDL_LIBS.linux = \
         $(LIB_XCURSOR)
-VBoxSDL_LDFLAGS.darwin = \
-        -framework Foundation -framework AppKit
+VBoxSDL_LIBS.solaris = \
+        $(LIB_XCURSOR) \
+        $(LIB_X11)
 ifdef VBOX_OPENGL
  #VBoxSDL_LIBS.linux += GL
@@ -71 +72 @@
 VBoxSDL_LIBPATH.linux = \
         $(VBOX_LIBPATH_X11)
+VBoxSDL_LIBPATH.solaris = \
+        $(VBOX_LIBPATH_X11)
+VBoxSDL_LDFLAGS.darwin = \
+        -framework Foundation -framework AppKit
 
 VBoxSDL_CLEAN = $(PATH_VBoxSDL)/Ico64x01.h
@@ -101 +106 @@
 tstSDL_LIBS.linux += GL
 endif
+tstSDL_LDFLAGS.darwin = \
+        -framework Foundation -framework AppKit
 tstSDL_LIBPATH.linux = \
         $(VBOX_LIBPATH_X11)
-tstSDL_LDFLAGS.darwin = \
-        -framework Foundation -framework AppKit
+tstSDL_LIBPATH.solaris = \
+        $(VBOX_LIBPATH_X11)
 
 tstSDL_CXXFLAGS.win = \

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -5222 +5222 @@
         /** @todo Implement tap networking for OS/2. */
         int rcVBox = VERR_NOT_IMPLEMENTED;
+#elif defined(RT_OS_SOLARIS)
+        /** @todo Implemented tap networking for Solaris. */
+        int rcVBox = VERR_NOT_IMPLEMENTED;
 #elif defined(VBOX_WITH_UNIXY_TAP_NETWORKING)
 # error "PORTME: Implement OS specific TAP interface open/creation."

trunk/src/VBox/Main/Makefile.kmk

@@ -457 +457 @@
 VBOX_XML_SCHEMA.win    = xml/VirtualBox-settings-windows.xsd
 VBOX_XML_SCHEMA.os2    = xml/VirtualBox-settings-os2.xsd
+VBOX_XML_SCHEMA.solaris= xml/VirtualBox-settings-solaris.xsd
 
 VirtualBoxXMLUtil.cpp_DEPS = $(VBOX_XML_ENTITIES) $(VBOX_XML_ENTITIES_COMMON)

trunk/src/VBox/Main/include/VirtualBoxXMLUtil.h

@@ -40 +40 @@
 #elif defined (RT_OS_OS2)
 #   define VBOX_XML_PLATFORM     "os2"
+#elif defined (RT_OS_SOLARIS)
+#   define VBOX_XML_PLATFORM     "solaris"
 #else
 #   error Unsupported platform!

trunk/src/VBox/Main/xml/VirtualBox-settings-solaris.xsd

@@ -4 +4 @@
  *  :folding=explicit:collapseFolds=1:
  *
- *  innotek VirtualBox Settings Schema Version 1.0-linux
+ *  innotek VirtualBox Settings Schema Version 1.0-solaris
 
      Copyright (C) 2004-2007 innotek GmbH
@@ -27 +27 @@
 <xsd:annotation>
   <xsd:documentation xml:lang="en">
-    innotek VirtualBox Settings Schema Version 1.0-linux.
+    innotek VirtualBox Settings Schema Version 1.0-solaris.
     Copyright (c) 2004-2007 innotek GmbH.
   </xsd:documentation>
@@ -92 +92 @@
       <xsd:restriction base="xsd:token">
         <xsd:enumeration value="null"/>
-        <xsd:enumeration value="oss"/>
-        <xsd:enumeration value="alsa"/>
+        <xsd:enumeration value="esd"/>
       </xsd:restriction>
     </xsd:simpleType>
@@ -108 +107 @@
     <xsd:complexContent>
       <xsd:extension base="TVirtualBox">
-        <xsd:attribute name="version" type="xsd:token" fixed="1.2-linux" use="required"/>
+        <xsd:attribute name="version" type="xsd:token" fixed="1.2-solaris" use="required"/>
       </xsd:extension>
     </xsd:complexContent>