Changeset 16014 in vbox

Timestamp:

Jan 18, 2009 12:04:12 AM (16 years ago)

Author:

vboxsync

Message:

Makefiles: Added LIBPATHs corresponding to the INCS for *BSD; VBOXGUESTR3EXE needs iconv on *BSD.

Location:

trunk

Files:

• Config.kmk (modified) (6 diffs)
• src/VBox/Additions/common/VBoxService/Makefile.kmk (modified) (1 diff)
• src/VBox/Additions/x11/xclient/Makefile.kmk (modified) (2 diffs)
• src/VBox/Runtime/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -2406 +2406 @@
         /usr/X11R6/include \
         /usr/local/include
+TEMPLATE_VBOXR3EXE_LIBPATH            += \
+        /usr/lib \
+        /usr/X11R6/lib \
+        /usr/local/lib
  else ifeq ($(KBUILD_TARGET),solaris)
 TEMPLATE_VBOXR3EXE_TOOL                = GXX3PLAIN
@@ -2746 +2750 @@
         /usr/X11R6/include \
         /usr/local/include
- else ifeq ($(KBUILD_TARGET),solaris)
+TEMPLATE_VBOXMAINEXE_LIBPATH            += \
+        /usr/lib \
+        /usr/X11R6/lib \
+        /usr/local/lib
+else ifeq ($(KBUILD_TARGET),solaris)
 TEMPLATE_VBOXMAINEXE_TOOL                = GXX3PLAIN
 TEMPLATE_VBOXMAINEXE_DEFS               += _REENTRANT
@@ -2991 +2999 @@
   ifeq ($(KBUILD_TARGET),freebsd)
    TEMPLATE_VBOXQTGUIEXE_INCS += \
-        /usr/include \
-        /usr/X11R6/include \
-        /usr/local/include
+        /usr/include \
+        /usr/X11R6/include \
+        /usr/local/include
+   TEMPLATE_VBOXQTGUIEXE_LIBPATH += \
+        /usr/lib \
+        /usr/X11R6/lib \
+        /usr/local/lib
   endif
   ifeq ($(KBUILD_TARGET),solaris)
@@ -3216 +3228 @@
   ifeq ($(KBUILD_TARGET),freebsd)
    TEMPLATE_VBOXQT4GUIEXE_INCS += \
-        /usr/include \
-        /usr/X11R6/include \
-        /usr/local/include
+        /usr/include \
+        /usr/X11R6/include \
+        /usr/local/include
+   TEMPLATE_VBOXQT4GUIEXE_LIBPATH += \
+        /usr/lib \
+        /usr/X11R6/lib \
+        /usr/local/lib
   endif
   ifeq ($(KBUILD_TARGET),solaris)
@@ -3369 +3385 @@
         /usr/X11R6/include \
         /usr/local/include
+TEMPLATE_VBOXBLDPROG_LIBPATH            += \
+        /usr/lib \
+        /usr/X11R6/lib \
+        /usr/local/lib
  else ifeq ($(KBUILD_HOST),solaris)
 TEMPLATE_VBOXBLDPROG_TOOL                = GXX3PLAIN
@@ -3453 +3473 @@
  TEMPLATE_VBOXGUESTR3EXE_LIBS     = pthread rt m
 endif
+if1of ($(KBUILD_TARGET),freebsd netbsd openbsd)
+ TEMPLATE_VBOXGUESTR3EXE_LIBS     = $(TEMPLATE_VBOXR3EXE_LIBS) iconv
+endif
 
 #

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

@@ -42 +42 @@
         $(VBOX_LIB_IPRT_GUEST_R3) \
         $(VBOX_LIB_VBGL_R3)
-## @todo r=bird: Move to the template.
-VBoxService_LIBS.freebsd = \
-        iconv
-VBoxService_LIBPATH.freebsd = \
-        /usr/local/lib
 
 include $(KBUILD_PATH)/subfooter.kmk

trunk/src/VBox/Additions/x11/xclient/Makefile.kmk

@@ -37 +37 @@
 VBoxClient_LIBPATH = \
         $(VBOX_LIBPATH32_X11)
+VBoxClient_LIBS.freebsd = \
+        iconv
 VBoxClient_LIBS = \
         $(VBOX_LIB_IPRT_GUEST_R3) \
@@ -47 +49 @@
         supc++ \
         gcc_eh
-
-## @todo r=bird: move to the template (that's what they are there for). ditto for VBoxService.
-VBoxClient_LIBPATH.freebsd += \
-        /usr/local/lib
-VBoxClient_LIBS.freebsd += \
-        iconv
 ifdef VBOX_X11_SEAMLESS_GUEST
  VBoxClient_DEFS += SEAMLESS_GUEST DYNAMIC_RESIZE

trunk/src/VBox/Runtime/Makefile.kmk

@@ -740 +740 @@
 VBoxRT_LIBS.solaris            = \
         kstat
-VBoxRT_LIBPATH.freebsd         = \
-        /usr/local/lib
 VBoxRT_LDFLAGS.darwin          = -framework IOKit -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxRT.dylib
 ifdef VBOX_USE_VCC80