diff options
Diffstat (limited to 'src/libs/Makefile.kmk')
| -rw-r--r-- | src/libs/Makefile.kmk | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/libs/Makefile.kmk b/src/libs/Makefile.kmk index 9d846a7e..8fe7218d 100644 --- a/src/libs/Makefile.kmk +++ b/src/libs/Makefile.kmk @@ -4,7 +4,7 @@ # # -# Copyright (C) 2006-2012 Oracle Corporation +# Copyright (C) 2006-2013 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; @@ -26,7 +26,7 @@ include $(KBUILD_PATH)/subheader.kmk # Compression libs used by IPRT and <what was it again?>. include $(PATH_SUB_CURRENT)/liblzf-3.4/Makefile.kmk -if !defined(VBOX_ONLY_SDK) && !defined(VBOX_ONLY_TESTSUITE) \ +if !defined(VBOX_ONLY_SDK) \ && "$(SDK_VBOX_ZLIB_INCS)" == "$(PATH_ROOT)/src/libs/zlib-1.2.6" include $(PATH_SUB_CURRENT)/zlib-1.2.6/Makefile.kmk endif @@ -39,8 +39,8 @@ endif # !VBOX_ONLY_DOCS # Libcurl for inet access if defined(VBOX_WITH_LIBCURL) && !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS) && !defined(VBOX_ONLY_SDK) && !defined(VBOX_ONLY_TESTSUITE) \ - && "$(SDK_VBOX_LIBCURL_INCS)" == "$(PATH_ROOT)/src/libs/curl-7.19.4/include" - include $(PATH_SUB_CURRENT)/curl-7.19.4/Makefile.kmk + && "$(SDK_VBOX_LIBCURL_INCS)" == "$(PATH_ROOT)/src/libs/curl-7.27.0/include" + include $(PATH_SUB_CURRENT)/curl-7.27.0/Makefile.kmk endif # The kStuff lib used by IPRT and the debugger. @@ -52,11 +52,11 @@ endif if !defined(VBOX_ONLY_SDK) \ && ( "$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)" \ || defined(VBOX_WITH_EXTPACK_PUEL_BUILD)) - include $(PATH_SUB_CURRENT)/openssl-0.9.8t/Makefile.kmk + include $(PATH_SUB_CURRENT)/openssl-0.9.8y/Makefile.kmk endif # libjpeg for VRDP video redirection -if defined(VBOX_WITH_VRDP) && defined(VBOX_WITH_VRDP_VIDEO_CHANNEL) +if defined(VBOX_WITH_VRDP) include $(PATH_SUB_CURRENT)/jpeg-8a/Makefile.kmk endif @@ -68,18 +68,16 @@ if defined(VBOX_WITH_MAIN) \ include $(PATH_SUB_CURRENT)/xpcom18a4/Makefile.kmk endif - # FFmpeg & VP8 for test videos. - if defined(VBOX_WITH_FFMPEG) && !defined(VBOX_OSE) && !defined(VBOX_ONLY_DOCS) && !defined(VBOX_WITH_SDK) - if1of ($(KBUILD_TARGET), darwin linux solaris) - include $(PATH_SUB_CURRENT)/ffmpeg-20060710/Makefile.kmk - endif + # VP8 for video capture + if defined(VBOX_WITH_VPX) && !defined(VBOX_ONLY_DOCS) && !defined(VBOX_WITH_SDK) \ + && ("$(SDK_VBOX_VPX_INCS)" == "$(SDK_VBOX_VPX_DEFAULT_INCS)") if1of ($(KBUILD_TARGET), darwin linux solaris win) include $(PATH_SUB_CURRENT)/libvpx/Makefile.kmk endif endif endif -if !defined(VBOX_ONLY_TESTSUITE) && !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS) +if !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS) ifeq ($(SDK_VBOX_LIBXML2_INCS),$(PATH_ROOT)/src/libs/libxml2-2.6.31/include) include $(PATH_SUB_CURRENT)/libxml2-2.6.31/Makefile.kmk endif |