Changeset 9500

Timestamp:

06/08/08 02:56:13 (6 months ago)

Author:

vboxsync

Message:

Preparing 64-bit guest additions building (focusing on windows atm.)

Files:

• trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk (modified) (6 diffs)
• trunk/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h (modified) (1 diff)

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

@@ -27 +27 @@
-# Target config.
-#
-,
+$(VBOX_WITH_64BIT_ADDITIONS), 
- LIBRARIES += \
-        VBoxGuestR0Lib \
@@ -34 +34 @@
-        VBoxGuestR3Lib \
-        VBoxGuestR3LibShared
-
+ 
-  LIBRARIES += \
-        VBoxGuestR3LibXFree86
- endif
-
+ # This case is going to become obsolete with 64-bit guest additions.
- # As we build Windows Additions on Linux as well, we need a
- # separate Linux target for each library so that both platforms
- # are built.
- # NOTE: This is going to be obsoleted before long, everyone is going to
- #       use VBoxGuestR0Lib* and VBoxGuestR3Lib.
- ifdef VBOX_WITH_WIN32_ADDITIONS
-  ifndef VBOX_ADDITIONS_LINUX_ONLY
@@ -79 +77 @@
-VBoxGuestR0Lib_DEFS         = VBOX_HGCM
-VBoxGuestR0Lib_INCS         = \
-
+R0
-VBoxGuestR0Lib_INCS.win     = \
-        $(PATH_SUB_ROOT)/WINNT/SharedFolders/include
@@ -121 +119 @@
-        VBoxGuestR3LibTime.cpp \
-        VBoxGuestR3LibVideo.cpp
+ifdef VBOX_WITH_64BIT_ADDITIONS ## @todo get rid of this hack.
+ ifeq ($(KBUILD_TARGET),win)
+  VBoxGuestR3Lib_SOURCES   = VBoxGuestR3Lib.cpp
+ endif
+endif
-
-#
@@ -151 +154 @@
-
-
+ifndef VBOX_WITH_64BIT_ADDITIONS
+
-#
-# VBoxGuestLib (Windows)
@@ -177 +182 @@
-#VBoxGuestLibBase_DEFS      += LOG_ENABLED
-
+endif # VBOX_WITH_64BIT_ADDITIONS
-
-include $(KBUILD_PATH)/subfooter.kmk

trunk/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h

@@ -23 +23 @@
-#define ___VBGLR3Internal_h
-
+#if defined(RT_OS_WINDOWS)
+# include <Windows.h>
+#endif
-#include <VBox/VBoxGuest.h>
-