Changeset 10180

Timestamp:

07/04/08 03:07:20 (2 months ago)

Author:

vboxsync

Message:

Fixed VBOX_OPENSSL_INCS. Made VBOX_WITH_KCHMVIEWER work the way it should.

Files:

• trunk/Config.kmk (modified) (7 diffs)
• trunk/src/libs/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -18 +18 @@
-# be useful, but WITHOUT ANY WARRANTY of any kind.
-#
+
+# Marker.
+VBOX_ROOT_CONFIG_KMK_INCLUDED = 1
-
-#
@@ -318 +321 @@
- # Don't bother with SDL ttf for now.
- VBOX_WITH_SECURELABEL=
+ # We'll use the native html/help viewer.
+ VBOX_WITH_KCHMVIEWER=
- # Later:
- VBOX_WITH_VRDP_AUTHMOD=
@@ -333 +338 @@
- VBOX_WITH_EHCI=
- VBOX_WITH_DOCS=
+ VBOX_WITH_KCHMVIEWER=
-endif
-
@@ -347 +353 @@
- VBOX_WITH_INTERNAL_NETWORKING=
- VBOX_WITH_PDM_ASYNC_COMPLETION=
+ VBOX_WITH_KCHMVIEWER=
-endif
-
@@ -359 +366 @@
- VBOX_WITH_DOCS=
- VBOX_WITH_PDM_ASYNC_COMPLETION=
+ VBOX_WITH_KCHMVIEWER=
-endif
-
@@ -366 +374 @@
- VBOX_WITH_VRDP_RDESKTOP=
- VBOX_WITH_OGL=
+ VBOX_WITH_KCHMVIEWER=
-endif
-
-ifeq ($(KBUILD_TARGET),win)
- VBOX_WITH_VRDP_RDESKTOP=
+ VBOX_WITH_KCHMVIEWER=
-endif
-
@@ -1335 +1345 @@
-SDK_VBOX_OPENSSL      = .
-if1of ($(KBUILD_TARGET), darwin linux solaris win)
-
-
-
+
+
+
+
+
+
+
+
-endif
-SDK_VBOX_OPENSSL_LIBS?= $(PATH_LIB)/VBox-libcrypto$(VBOX_SUFF_LIB)

trunk/src/libs/Makefile.kmk

@@ -92 +92 @@
-ifdef VBOX_WITH_VRDP
- if1of ($(KBUILD_TARGET), darwin linux solaris win)
-PATH_OBJ)/src/libs/openssl-0.9.8h/include
+SDK_VBOX_OPENSSL_DEFAULT_INCS)
-   subdirs += openssl-0.9.8h
-  endif