Changeset 18785 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 6, 2009 4:01:39 PM (16 years ago)

Author:

vboxsync

Message:

API/MachineImpl: double-dash command line options and support starting VMs using SDL frontend

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (4 diffs)
• Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -3826 +3826 @@
         Utf8Str idStr = mData->mUuid.toString();
 # ifdef RT_OS_WINDOWS /** @todo drop this once the RTProcCreate bug has been fixed */
-        const char * args[] = {path, "-startvm", idStr, 0 };
+        const char * args[] = {path, "--startvm", idStr, 0 };
 # else
         Utf8Str name = mUserData->mName;
-        const char * args[] = {path, "-comment", name, "-startvm", idStr, 0 };
+        const char * args[] = {path, "--comment", name, "--startvm", idStr, 0 };
 # endif
         vrc = RTProcCreate (path, args, env, 0, &pid);
@@ -3840 +3840 @@
     else
 
+#ifdef VBOX_WITH_VBOXSDL
+    if (type == "sdl" || type == "GUI/SDL")
+    {
+        const char VBoxSDL_exe[] = "VBoxSDL" HOSTSUFF_EXE;
+        Assert (sz >= sizeof (VBoxSDL_exe));
+        strcpy (cmd, VBoxSDL_exe);
+
+        Utf8Str idStr = mData->mUuid.toString();
+# ifdef RT_OS_WINDOWS
+        const char * args[] = {path, "--startvm", idStr, 0 };
+# else
+        Utf8Str name = mUserData->mName;
+        const char * args[] = {path, "--comment", name, "--startvm", idStr, 0 };
+# endif
+        vrc = RTProcCreate (path, args, env, 0, &pid);
+    }
+#else /* !VBOX_WITH_VBOXSDL */
+    if (0)
+        ;
+#endif /* !VBOX_WITH_VBOXSDL */
+
+    else
+
 #ifdef VBOX_WITH_VRDP
     if (type == "vrdp")
@@ -3849 +3872 @@
         Utf8Str idStr = mData->mUuid.toString();
 # ifdef RT_OS_WINDOWS
-        const char * args[] = {path, "-startvm", idStr, 0 };
+        const char * args[] = {path, "--startvm", idStr, 0 };
 # else
         Utf8Str name = mUserData->mName;
-        const char * args[] = {path, "-comment", name, "-startvm", idStr, 0 };
+        const char * args[] = {path, "--comment", name, "--startvm", idStr, 0 };
 # endif
         vrc = RTProcCreate (path, args, env, 0, &pid);
@@ -3872 +3895 @@
         Utf8Str idStr = mData->mUuid.toString();
 # ifdef RT_OS_WINDOWS
-        const char * args[] = {path, "-startvm", idStr, "-capture", 0 };
+        const char * args[] = {path, "--startvm", idStr, "--capture", 0 };
 # else
         Utf8Str name = mUserData->mName;
-        const char * args[] = {path, "-comment", name, "-startvm", idStr, "-capture", 0 };
+        const char * args[] = {path, "--comment", name, "--startvm", idStr, "--capture", 0 };
 # endif
         vrc = RTProcCreate (path, args, env, 0, &pid);

trunk/src/VBox/Main/Makefile.kmk

@@ -196 +196 @@
         VBOX_MAIN_SETTINGS_ADDONS \
         $(VBOX_MAIN_DEFS) \
+        $(if $(VBOX_WITH_VBOXSDL),VBOX_WITH_VBOXSDL,) \
         $(if $(VBOX_WITH_VRDP),VBOX_WITH_VRDP,) \
         $(if $(VBOX_WITH_HEADLESS),VBOX_WITH_HEADLESS,) \