Changeset 74291 in vbox for trunk

Timestamp:

Sep 15, 2018 5:13:16 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/Makefile.kmk: RuntimeBldProg build fix for OS/2.

File:

• trunk/src/VBox/Runtime/Makefile.kmk (modified) (7 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1791 +1791 @@
         common/err/errmsgxpcom.cpp
 endif
-ifeq ($(KBUILD_HOST),win)
- RuntimeBldProg_SOURCES        += \
-        common/string/RTUtf16NLenEx.cpp \
-        common/string/RTUtf16CopyAscii.cpp \
-        common/string/RTUtf16End.cpp \
-        generic/RTPathGetCurrentDrive-generic.cpp
-endif
 RuntimeBldProg_SOURCES.darwin = $(filter-out \
         generic/cdrom-generic.cpp \
@@ -1832 +1825 @@
 RuntimeBldProg_SOURCES.win = \
         common/dbg/dbgmoddbghelp.cpp \
+        common/string/mempcpy.asm
+        generic/mppresent-generic-online.cpp \
         generic/RTDirExists-generic.cpp \
         generic/RTDirSetTimes-generic.cpp \
@@ -1837 +1832 @@
         generic/RTFileSetAllocationSize-generic.cpp \
         generic/RTPathAbs-generic.cpp \
+        generic/RTPathGetCurrentDrive-generic.cpp \
         generic/RTRandAdvCreateSystemFaster-generic.cpp \
         generic/RTRandAdvCreateSystemTruer-generic.cpp \
-        generic/RTSemEventWait-generic.cpp \
         generic/RTSemEventMultiWait-2-ex-generic.cpp \
         generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp \
+        generic/RTSemEventWait-generic.cpp \
         generic/RTSemMutexRequest-generic.cpp \
         generic/RTSemMutexRequestDebug-generic.cpp \
-        generic/mppresent-generic-online.cpp \
         generic/semrw-$(if-expr defined(VBOX_WITH_LOCKLESS_SEMRW),lockless-,)generic.cpp \
         generic/uuid-generic.cpp \
+        nt/fileioutils-nt.cpp \
         nt/RTErrConvertFromNtStatus.cpp \
-        nt/fileioutils-nt.cpp \
+        r3/nt/direnum-r3-nt.cpp \
         r3/nt/dirrel-r3-nt.cpp \
         r3/nt/fs-nt.cpp \
@@ -1856 +1852 @@
         r3/nt/RTPathQueryInfo-nt.cpp \
         r3/nt/RTPathSetMode-r3-nt.cpp \
-        r3/win/env-win.cpp \
-        r3/win/RTHandleGetStandard-win.cpp \
         r3/win/alloc-win.cpp \
         r3/win/allocex-win.cpp \
         r3/win/dir-win.cpp \
-        $(if-expr defined(VBOX_WITH_NT_DIRENUM),r3/nt/direnum-r3-nt.cpp,r3/win/direnum-win.cpp generic/RTDirQueryInfo-generic.cpp) \
+        r3/win/env-win.cpp \
         r3/win/errvars-win.cpp \
         r3/win/fileio-win.cpp \
@@ -1869 +1863 @@
         r3/win/pipe-win.cpp \
         r3/win/process-win.cpp \
+        r3/win/RTHandleGetStandard-win.cpp \
         r3/win/RTLogWriteDebugger-win.cpp \
         r3/win/rtProcInitExePath-win.cpp \
+        r3/win/RTUuidCreate-win.cpp \
         r3/win/sched-win.cpp \
         r3/win/semevent-win.cpp \
@@ -1882 +1878 @@
         r3/win/utf16locale-win.cpp \
         r3/win/utf8-win.cpp \
-        r3/win/RTUuidCreate-win.cpp \
         win/errmsgwin.cpp \
         win/RTErrConvertFromWin32.cpp \
-        common/string/mempcpy.asm
+        common/string/RTUtf16CopyAscii.cpp \
+        common/string/RTUtf16End.cpp \
+        common/string/RTUtf16NLenEx.cpp \
 
 RuntimeBldProg_SOURCES.win.amd64 := \
@@ -1893 +1890 @@
         $(RuntimeWin32ASM_SOURCES) \
         common/string/memrchr.asm
+
+RuntimeBldProg_SOURCES.os2 += \
+        generic/RTPathGetCurrentDrive-generic.cpp