Changeset 6654 in vbox

Timestamp:

Jan 31, 2008 1:08:43 PM (17 years ago)

Author:

vboxsync

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

27720

Message:

Unbroke the OS/2 additions build.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp (modified) (3 diffs)
• src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -2799 +2799 @@
 #   The _MINI and _SHARED are both compiled as PIC and intended for linking into a .so/.dll/.dylib.
 #
+ifeq ($(BUILD_TARGET),os2)
+VBOX_LIB_IPRT_GUEST_R3          = $(VBOX_PATH_ADDITIONS_LIB)/os2/RuntimeOS2GuestR3$(VBOX_SUFF_LIB)
+else
 VBOX_LIB_IPRT_GUEST_R3          = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3$(VBOX_SUFF_LIB)
+endif
 VBOX_LIB_IPRT_GUEST_R3_MINI     = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3Mini$(VBOX_SUFF_LIB)
 VBOX_LIB_IPRT_GUEST_R0          = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR0$(VBOX_SUFF_LIB)
+ifeq ($(BUILD_TARGET),os2)
+VBOX_LIB_VBGL_R3                = $(VBOX_PATH_ADDITIONS_LIB)/os2/VBoxGuestR3LibOS2$(VBOX_SUFF_LIB)
+else
 VBOX_LIB_VBGL_R3                = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3Lib$(VBOX_SUFF_LIB)
+endif
 VBOX_LIB_VBGL_R3_XFREE86        = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3LibXFree86$(VBOX_SUFF_LIB)
 VBOX_LIB_VBGL_R3_SHARED         = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3LibShared$(VBOX_SUFF_LIB)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp

@@ -52 +52 @@
 #include "VBoxGuestInternal.h"
 #include <VBox/VBoxGuest.h>
+#include <VBox/VBoxDev.h>               /* VMMDEV_RAM_SIZE */
 #include <VBox/version.h>
 #include <iprt/initterm.h>
@@ -59 +60 @@
 #include <iprt/assert.h>
 #include <iprt/log.h>
+#include <iprt/memobj.h>
+#include <iprt/mem.h>
+#include <iprt/param.h>
 
 
@@ -202 +206 @@
                 g_cchInitText = RTStrPrintf(&g_szInitText[0], g_cchInitTextMax, "VBoxGuest.sys: VBoxGuestOS2InitDevExt failed, rc=%Vrc\n", rc);
 
-            rc2 = RTR0MemObjFree(g_MemObjMMIO, true /* fFreeMappings */); AssertRC(rc2);
+            int rc2 = RTR0MemObjFree(g_MemObjMMIO, true /* fFreeMappings */); AssertRC(rc2);
             g_MemObjMMIO = g_MemMapMMIO = NIL_RTR0MEMOBJ;
         }

trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk

@@ -219 +219 @@
 #
 VBoxGuestR3LibOS2_TEMPLATE = VBOXOS2GUESTR3LIB
-VBoxGuestR3LibOS2_SOURCES  = VBoxGuestR3Lib.cpp VBoxGuestR3LibClipboard.cpp
 VBoxGuestR3LibOS2_DEFS     = VBOX_HGCM
+VBoxGuestR3LibOS2_SOURCES  = $(VBoxGuestR3Lib_SOURCES)