Changeset 9568 in vbox for trunk/src/VBox

Timestamp:

Jun 10, 2008 12:46:22 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: Some updates to the build environment on the mac.

File:

• trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk (modified) (3 diffs)

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

@@ -75 +75 @@
 
 ifeq ($(KBUILD_TARGET),darwin)
- VBOX_INCS_QT4       = $(foreach mod, $(VBOX_MODULE_QT4), $(join $(join /Library/Frameworks/, $(mod)), .framework/Headers))
+ # This is temporary until the tools server is updated:
+ VBOX_PATH_QT4_LIB = /Library/Frameworks
+ # This is necessary because we didn't include the Qt header in framework
+ # notation (e.g.: <QtCore/QObject>)).
+ VBOX_INCS_QT4       = $(foreach mod, $(VBOX_MODULE_QT4), $(join $(join $(VBOX_PATH_QT4_LIB)/, $(mod)), .framework/Headers))
  VBOX_LIBS_QT4       =
 else
@@ -137 +141 @@
 endif
 
-# The Qt DLLs (move to the root Makefile.kmk, and remove bin from INSTALLS below).
-bin_SOURCES += $(VBOX_QT4_RUNTIME)
-bin_INST = $(INST_BIN)
-bin_MODE = 644
+ifeq ($(KBUILD_TARGET),darwin)
+ # Create the targets of the form
+ # @executable_path/../Qt???.framework/Versions/4/Qt???
+ QT_LIB_INSTALL=$(foreach mod, $(VBOX_MODULE_QT4), $(join $(join $(PATH_BIN)/../lib/, $(mod)), .framework/Versions/4/$(mod)))
+ # Todo: Only installing the libraries isn't sufficient. For user provided
+ # frameworks (usual installed in /Library/Frameworks) we must run
+ # install_name_tool on the VirtualBox4 app and *all* used libraries. This has
+ # to be done recursively for the library part.
+ $(QT_LIB_INSTALL): \
+        $(PATH_BIN)/../lib/%: $(VBOX_PATH_QT4_LIB)/%
+        $(call MSG_INST_FILE,$<,$@)
+        $(QUIET)$(MKDIR) -p $(@D)
+        $(QUIET)$(INSTALL) -m 0644 $< $(@D)
+ OTHERS = $(QT_LIB_INSTALL)
+else
+ # The Qt DLLs (move to the root Makefile.kmk, and remove bin from INSTALLS below).
+ bin_SOURCES += $(VBOX_QT4_RUNTIME)
+ bin_INST = $(INST_BIN)
+ bin_MODE = 644
+endif
 
 # Template copy from the qt3 stuff. Appended a "4" on the
@@ -225 +245 @@
     $(VBOX_XCURSOR_LIBS)
  else ifeq ($(KBUILD_TARGET),darwin)
-  TEMPLATE_VBOXQT4GUIEXE_LDFLAGS += $(foreach mod, $(VBOX_MODULE_QT4), -framework $(mod)) \
+  # We have to add the framework path to both the linker and the compiler also.
+  # Note that the -F flag is apple gcc only.
+  TEMPLATE_VBOXQT4GUIEXE_LDFLAGS += -F$(VBOX_PATH_QT4_LIB) $(foreach mod, $(VBOX_MODULE_QT4), -framework $(mod)) \
         -framework Carbon -framework QuickTime -bind_at_load
+  TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS += -F$(VBOX_PATH_QT4_LIB)
   TEMPLATE_VBOXQT4GUIEXE_LIBS +=
   TEMPLATE_VBOXQT4GUIEXE_LIBPATH +=