Changeset 1349 in vbox for trunk

Timestamp:

Mar 8, 2007 10:43:39 PM (18 years ago)

Author:

vboxsync

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

19331

Message:

Ported VRDP to darwin. Also modified the VBOXMAINEXE/VBOXMAIN templates to include the sdk and xpcom header by default.

Location:

trunk

Files:

• Config.kmk (modified) (5 diffs)
• src/VBox/Main/Makefile (modified) (4 diffs)

trunk/Config.kmk

@@ -249 +249 @@
  # Don't bother with SDL ttf for now.
  VBOX_WITH_SECURELABEL=
- # Later.
+ ifdef VBOX_OSE
+  # Qt/Mac v3.3.x requires patching to work for us.
+  VBOX_WITH_QTGUI=
+ endif
+ # Later:
  VBOX_WITH_USB=
  VBOX_WITH_INSTALLER=
  VBOX_WITH_DOCS=
- VBOX_WITH_VRDP=
  VBOX_WITH_VRDP_AUTHMOD=
  VBOX_WITH_VRDP_RDESKTOP=
- ifdef VBOX_OSE
-  VBOX_WITH_QTGUI=
- endif
 endif
 
@@ -1486 +1486 @@
 TEMPLATE_VBOXMAINEXE_DEFS                = IN_RING3 UNICODE
 TEMPLATE_VBOXMAINEXE_LIBS.kprofile       = $(LIB_KPROFILE)
+TEMPLATE_VBOXMAINEXE_INCS                = \
+        $(VBOX_PATH_SDK)/include
+ifdef VBOX_WITH_XPCOM
+ TEMPLATE_VBOXMAINEXE_INCS              += \
+        $(VBOX_XPCOM_INCS)
+endif
 
 ifeq ($(BUILD_TARGET),win)
@@ -1502 +1508 @@
  TEMPLATE_VBOXMAINEXE_CFLAGS.debug       = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS.debug)
  TEMPLATE_VBOXMAINEXE_CFLAGS.kprofile    = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS.kprofile)
- TEMPLATE_VBOXMAINEXE_INCS               = \
+ TEMPLATE_VBOXMAINEXE_INCS              += \
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_INC)
  TEMPLATE_VBOXMAINEXE_LDFLAGS            = \
@@ -1529 +1535 @@
 TEMPLATE_VBOXMAINEXE_CFLAGS.debug        = -fno-inline
 TEMPLATE_VBOXMAINEXE_CFLAGS.kprofile     = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS.kprofile)
+TEMPLATE_VBOXMAINEXE_INCS               += $(VBOX_XPCOM_INCS)
  ifeq ($(BUILD_TARGET),linux)
 TEMPLATE_VBOXMAINEXE_LIBS                = pthread m $(LIB_UUID) rt
@@ -1584 +1591 @@
 TEMPLATE_VBOXMAINCLIENT             = VBox MAIN Client
 TEMPLATE_VBOXMAINCLIENT_EXTENDS     = VBOXMAINEXE
-TEMPLATE_VBOXMAINCLIENT_INCS        = $(TEMPLATE_VBOXMAINEXE_INCS) \
-        $(VBOX_PATH_SDK)/include
-ifdef VBOX_WITH_XPCOM
-TEMPLATE_VBOXMAINCLIENT_INCS       += \
-    $(VBOX_XPCOM_INCS)
-endif
-TEMPLATE_VBOXMAINCLIENT_LIBS        = $(TEMPLATE_VBOXMAINEXE_LIBS) \
-    $(LIB_RUNTIME)
 ifeq ($(BUILD_TARGET),win)
  TEMPLATE_VBOXMAINCLIENT_LIBS.win   = $(TEMPLATE_VBOXMAINEXE_LIBS.win) \

trunk/src/VBox/Main/Makefile

@@ -125 +125 @@
         include \
         $(PATH_VBoxSVC) \
-        $(PATH_VBoxCOM) \
-        $(VBOX_PATH_SDK)/include
-ifneq ($(BUILD_TARGET),win)
-VBoxSVC_INCS += \
-        $(VBOX_XPCOM_INCS)
-endif
+        $(PATH_VBoxCOM)
 ifdef VBOX_WITH_XPCOM
 VBoxSVC_LIBS += \
@@ -231 +226 @@
         include \
         $(PATH_VBoxC) \
-        $(PATH_VBoxCOM) \
-        $(VBOX_PATH_SDK)/include
-ifneq ($(BUILD_TARGET),win)
-VBoxC_INCS          += \
-        $(VBOX_XPCOM_INCS)
-endif
+        $(PATH_VBoxCOM)
 VBoxC_LDFLAGS.darwin = -install_name @executable_path/VBoxC.dylib
 ifdef VBOX_USE_VCC80
@@ -364 +354 @@
         $(VBoxCOM_COMMON_SOURCES) \
         $(PATH_VBoxCOM)/VirtualBox_i.c
-VBoxCOM_INCS = \
-        $(VBOX_PATH_SDK)/include
 
 
@@ -376 +364 @@
         linux/helpers.cpp
 VBoxXPCOM_INCS = \
-        $(VBOX_PATH_SDK)/include \
-        include \
-        $(VBOX_XPCOM_INCS)
+        include