Changeset 480 for trunk/kBuild

Timestamp:

Jul 22, 2006, 10:40:51 PM (19 years ago)

Author:

bird

Message:

win and nt

File:

• trunk/kBuild/header.kmk (modified) (6 diffs)

trunk/kBuild/header.kmk

@@ -255 +255 @@
 
 # Win32 & Win64
-ifeq ($(filter-out win32 win64 nt,$(BUILD_TARGET)),)
+ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
 EXEC_X86_WIN32      :=
 HOSTSUFF_EXE        := .exe
@@ -272 +272 @@
  endif
  ifeq ($(wildcard $(PATH_TOOLS)/kmk_ash$(HOSTSUFF_EXE)),)
-  ifeq ($(filter-out win64 nt,$(BUILD_PLATFORM)),)
+  ifeq ($(filter-out win64 win nt ,$(BUILD_PLATFORM)),)
    PATH_TOOLS       := $(PATH_KBUILD)/bin/x86.win32
   endif
@@ -286 +286 @@
 # Build target setup.
 #
-ifeq ($(BUILD_TARGET),os2)
+ifeq ($(filter-out win32 win64 win nt os2,$(BUILD_TARGET)),)
 SUFF_OBJ            := .obj
 SUFF_LIB            := .lib
@@ -293 +293 @@
 SUFF_SYS            := .sys
 SUFF_RES            := .res
-endif
-ifeq ($(filter-out win32 win64,$(BUILD_TARGET)),)
-SUFF_OBJ            := .obj
-SUFF_LIB            := .lib
-SUFF_DLL            := .dll
-SUFF_EXE            := .exe
-SUFF_SYS            := .sys
-SUFF_RES            := .res
-endif
-ifeq ($(BUILD_TARGET),linux)
-SUFF_OBJ            := .o
-SUFF_LIB            := .a
-SUFF_DLL            := .so
-SUFF_EXE            :=
-SUFF_SYS            := .a
-SUFF_RES            :=
 endif
 ifeq ($(BUILD_TARGET),l4)
@@ -318 +302 @@
 SUFF_RES            :=
 endif
+ifndef SUFF_OBJ
+SUFF_OBJ            := .o
+SUFF_LIB            := .a
+SUFF_DLL            := .so
+SUFF_EXE            :=
+SUFF_SYS            := .a
+SUFF_RES            :=
+endif
 
 #
@@ -472 +464 @@
 #
 # @param        $1      The paths to the directories which must be created.
-ifeq ($(filter-out win32 win64,$(BUILD_PLATFORM)),)
+ifeq ($(filter-out win32 win64 win nt,$(BUILD_PLATFORM)),)
 DIRDEP = $(patsubst %/,%,$(1))
 else