| 1 |
tmb |
1041989 |
diff -Nurp VirtualBox-5.1.0.p20/Config.kmk VirtualBox-5.1.0.p21/Config.kmk |
| 2 |
|
|
--- VirtualBox-5.1.0.p20/Config.kmk 2016-07-12 17:47:20.000000000 +0300 |
| 3 |
|
|
+++ VirtualBox-5.1.0.p21/Config.kmk 2016-07-13 19:37:01.512721807 +0300 |
| 4 |
|
|
@@ -3446,19 +3446,19 @@ VBOXLNX32GUEST_SUFF_LIB = .a |
| 5 |
tmb |
410737 |
# SDKs for external libraries. |
| 6 |
|
|
# |
| 7 |
tmb |
894803 |
SDK_VBOX_LIBXML2 = . |
| 8 |
tmb |
1090913 |
-SDK_VBOX_LIBXML2_INCS ?= $(PATH_ROOT)/src/libs/libxml2-2.9.4/include |
| 9 |
tmb |
894803 |
+SDK_VBOX_LIBXML2_INCS ?= /usr/include/libxml2 |
| 10 |
tmb |
410737 |
SDK_VBOX_LIBXML2_DEFS ?= _REENTRANT |
| 11 |
|
|
SDK_VBOX_LIBXML2_DEFS.win += WIN32 _WINDOWS _MBCS |
| 12 |
|
|
# note: no linking to LIB here, we do that explicitly in src/VBox/Runtime/Makefile.kmk to link |
| 13 |
|
|
# libxml against VBoxRT |
| 14 |
|
|
|
| 15 |
|
|
SDK_VBOX_LIBPNG = . |
| 16 |
tmb |
913599 |
-SDK_VBOX_LIBPNG_INCS ?= $(PATH_ROOT)/src/libs/libpng-1.2.54 |
| 17 |
doktor5000 |
916641 |
+SDK_VBOX_LIBPNG_INCS ?= `/usr/bin/pkg-config libpng --variable=includedir` |
| 18 |
tmb |
410737 |
SDK_VBOX_LIBPNG_LIBS ?= $(PATH_STAGE_LIB)/VBox-libpng$(VBOX_SUFF_LIB) |
| 19 |
|
|
|
| 20 |
|
|
SDK_VBOX_ZLIB = . |
| 21 |
|
|
if1of ($(KBUILD_TARGET), os2 solaris win) |
| 22 |
tmb |
894803 |
- SDK_VBOX_ZLIB_INCS ?= $(PATH_ROOT)/src/libs/zlib-1.2.8 |
| 23 |
tmb |
410737 |
+ SDK_VBOX_ZLIB_INCS ?= /usr/include/ |
| 24 |
|
|
SDK_VBOX_ZLIB_LIBS ?= $(PATH_STAGE_LIB)/VBox-zlib$(VBOX_SUFF_LIB) |
| 25 |
|
|
else |
| 26 |
|
|
SDK_VBOX_ZLIB_INCS ?= |
Parent Directory
| 
Revision Log