Changeset 16438 in vbox

Timestamp:

Jan 31, 2009 1:54:49 AM (16 years ago)

Author:

vboxsync

Message:

kStuff: Use r23 with 64-bit MachO support

Location:

trunk/src/libs/kStuff

Files:

• . (modified) (1 prop)
• Makefile.kmk (modified) (3 diffs)

trunk/src/libs/kStuff

@@ -1 @@
-kStuff -r 2 http://www.virtualbox.org/svn/kstuff-mirror/trunk
+kStuff -r 23 http://www.virtualbox.org/svn/kbuild-mirror/trunk/kStuff

@@ -1 @@
-kStuff -r 2 http://www.virtualbox.org/svn/kstuff-mirror/trunk
+kStuff -r 23 http://www.virtualbox.org/svn/kbuild-mirror/trunk/kStuff

trunk/src/libs/kStuff/Makefile.kmk

@@ -29 +29 @@
 VBox-kStuff_TEMPLATE = VBOXR3
 VBox-kStuff_DEFS = IN_RT_R3
-#VBox-kStuff_DEFS.strict = K_STRICT KLDRMODMACHO_STRICT KLDRMODMACHO_STRICT2 - after updating the external.
+VBox-kStuff_DEFS.strict = K_STRICT KLDRMODMACHO_STRICT KLDRMODMACHO_STRICT2
 VBox-kStuff_DEFS.debug  = $(VBox-kStuff_DEFS.strict)
-VBox-kStuff_INCS = kStuff/include
+VBox-kStuff_INCS = \
+        kStuff/include \
+        $(VBox-kStuff_0_OUTDIR)
+VBox-kStuff_ORDERDEPS = \
+        $(VBox-kStuff_0_OUTDIR)/kErrNameConsts.h
 VBox-kStuff_SOURCES = \
         kStuff/kLdr/kLdrMod.c \
@@ -44 +48 @@
         kStuff/kCpu/kCpuGetArchAndCpu.c \
         \
+        kStuff/kErr/kErrName.c \
         \
         kStuff/kHlp/Generic/kHlpMemPComp.c \
@@ -70 +75 @@
         iprt/kRdrFile-iprt.cpp
 
-#       kStuff/kErr/kErrName.c
+# Generate the error constants.
+$$(VBox-kStuff_0_OUTDIR)/kErrNameConsts.h: \
+                $(PATH_SUB_CURRENT)/kStuff/include/k/kErrors.h \
+                $(MAKEFILE_CURRENT) \
+                | $$(dir $$@)
+        $(RM) -f $@
+        $(SED) \
+                -e '/^#define  *\(K[A-Z_]*ERR_[^ ()]*\) .*$$/!d' \
+                -e 's/^#define  *\(K[A-Z_]*ERR_[^ ()]*\) .*$$/ERR_CONST(\1)/' \
+                -e '/K[A-Z_]*ERR_[A-Z0-9_]*BASE/d' \
+                -e '/K[A-Z_]*ERR_[A-Z0-9_]*END/d' \
+                --output $@ \
+                $<
 
 include $(KBUILD_PATH)/subfooter.kmk

@@ -1 @@
-kStuff -r 2 http://www.virtualbox.org/svn/kstuff-mirror/trunk
+kStuff -r 23 http://www.virtualbox.org/svn/kbuild-mirror/trunk/kStuff