Changeset 9039 for trunk/src

Timestamp:

Aug 20, 2002, 7:47:53 AM (23 years ago)

Author:

bird

Message:

Fixes to adapt to build system changes.

Location:

trunk/src/win32k/kKrnlLib/src

Files:

• Dev16.mak (modified) (2 diffs)
• Dev16R3Tst.mak (modified) (2 diffs)
• Extract.mak (modified) (2 diffs)
• Extract16.mak (modified) (2 diffs)
• Makefile (modified) (3 diffs)
• MkCallTab.mak (modified) (2 diffs)
• srcR3Tst.mak (modified) (3 diffs)

trunk/src/win32k/kKrnlLib/src/Dev16.mak

@@ -1 @@
-# $Id: Dev16.mak,v 1.6 2002-08-20 05:04:42 bird Exp $
+# $Id: Dev16.mak,v 1.7 2002-08-20 05:47:52 bird Exp $
 
 #
@@ -15 +15 @@
 !if [SET INCLUDE=]
 !endif
-BUILD_ENV  = MSCV6
+BUILD_ENV_FORCE = MSCV6-16
 PATH_ROOT  = ..\..\..\..
 !include $(PATH_ROOT)\make\setup.mak

trunk/src/win32k/kKrnlLib/src/Dev16R3Tst.mak

@@ -1 @@
-# $Id: Dev16R3Tst.mak,v 1.4 2002-08-20 05:04:42 bird Exp $
+# $Id: Dev16R3Tst.mak,v 1.5 2002-08-20 05:47:52 bird Exp $
 
 #
@@ -15 +15 @@
 !if [SET INCLUDE=]
 !endif
-BUILD_ENV  = MSCV6
+BUILD_ENV_FORCE = MSCV6
 PATH_ROOT  = ..\..\..\..
 !include $(PATH_ROOT)\make\setup.mak

trunk/src/win32k/kKrnlLib/src/Extract.mak

@@ -1 @@
-# $Id: Extract.mak,v 1.7 2002-08-20 05:04:42 bird Exp $
+# $Id: Extract.mak,v 1.8 2002-08-20 05:47:53 bird Exp $
 
 #
@@ -34 +34 @@
 
 TARGET_OBJS =\
-$(PATH_ROOT)\obj\$(NAME_1)$(NAME_2)mscv6\Extract16.$(EXT_LIB)\Extract.$(EXT_OBJ)\
+$(PATH_ROOT)\obj\$(SHT_TRGPLTFRM)$(SHT_BLDMD)mscv6-16\Extract16.$(EXT_LIB)\Extract.$(EXT_OBJ)\
 $(PATH_TARGET)\Extract32.$(EXT_OBJ)\
 $(PATH_TARGET)\krnlPrologs.$(EXT_OBJ)\
 
 TARGET_LIBS =\
-$(PATH_ROOT)\obj\$(NAME_1)$(NAME_2)mscv6\Extract16.$(EXT_LIB)\Extract16.$(EXT_LIB)\
+$(PATH_ROOT)\obj\$(SHT_TRGPLTFRM)$(SHT_BLDMD)mscv6-16\Extract16.$(EXT_LIB)\Extract16.$(EXT_LIB)\
 $(PATH_TOOLKIT)\lib\os2286.lib\
 $(PATH_MSC)\lib\clibcep.lib\

trunk/src/win32k/kKrnlLib/src/Extract16.mak

@@ -1 @@
-# $Id: Extract16.mak,v 1.6 2002-08-20 05:04:42 bird Exp $
+# $Id: Extract16.mak,v 1.7 2002-08-20 05:47:53 bird Exp $
 
 #
@@ -16 +16 @@
 !if [SET INCLUDE=]
 !endif
-BUILD_ENV  = MSCV6
+BUILD_ENV_FORCE = MSCV6-16
 PATH_ROOT  = ..\..\..\..
 !include $(PATH_ROOT)\make\setup.mak

trunk/src/win32k/kKrnlLib/src/Makefile

@@ -1 @@
-# $Id: Makefile,v 1.8 2002-08-20 05:04:44 bird Exp $
+# $Id: Makefile,v 1.9 2002-08-20 05:47:53 bird Exp $
 
 #
@@ -59 +59 @@
 $(PATH_OBJ)\kKrnlLib_newrel.$(EXT_LIB)\kKrnlLib_newrel.$(EXT_LIB)\
 \
-$(PATH_ROOT)\obj\$(NAME_1)$(NAME_2)mscv6\kKrnlLib_dev16.$(EXT_LIB)\kKrnlLib_dev16.$(EXT_LIB)\
+$(PATH_ROOT)\obj\$(SHT_TRGPLTFRM)$(SHT_BLDMD)mscv6-16\kKrnlLib_dev16.$(EXT_LIB)\kKrnlLib_dev16.$(EXT_LIB)\
 \
 $(PATH_TARGET)\SymDB32.$(EXT_OBJ)\
@@ -68 +68 @@
 $(PATH_OBJ)\kKrnlLib_newdbg.$(EXT_LIB)\kKrnlLib_newdbg.$(EXT_LIB)\
 $(PATH_OBJ)\kKrnlLib_newrel.$(EXT_LIB)\kKrnlLib_newrel.$(EXT_LIB)\
-$(PATH_ROOT)\obj\$(NAME_1)$(NAME_2)mscv6\kKrnlLib_dev16.$(EXT_LIB)\kKrnlLib_dev16.$(EXT_LIB)\
+$(PATH_ROOT)\obj\$(SHT_TRGPLTFRM)$(SHT_BLDMD)mscv6-16\kKrnlLib_dev16.$(EXT_LIB)\kKrnlLib_dev16.$(EXT_LIB)\
 
 TARGET_NO_DEP=\

trunk/src/win32k/kKrnlLib/src/MkCallTab.mak

@@ -1 @@
-# $Id: MkCallTab.mak,v 1.7 2002-08-20 05:04:43 bird Exp $
+# $Id: MkCallTab.mak,v 1.8 2002-08-20 05:47:53 bird Exp $
 
 #
@@ -15 +15 @@
 !if [SET INCLUDE=]
 !endif
-BUILD_ENV  = MSCV6
+BUILD_ENV_FORCE = MSCV6-16
 PATH_ROOT  = ..\..\..\..
 !include $(PATH_ROOT)\make\setup.mak

trunk/src/win32k/kKrnlLib/src/srcR3Tst.mak

@@ -1 @@
-# $Id: srcR3Tst.mak,v 1.5 2002-08-20 05:04:43 bird Exp $
+# $Id: srcR3Tst.mak,v 1.6 2002-08-20 05:47:53 bird Exp $
 
 #
@@ -69 +69 @@
 $(PATH_OBJ)\kKrnlLib_newrelR3Tst.$(EXT_LIB)\kKrnlLib_newrelR3Tst.$(EXT_LIB)\
 \
-$(PATH_ROOT)\obj\$(NAME_1)$(NAME_2)mscv6\kKrnlLib_dev16R3Tst.$(EXT_LIB)\kKrnlLib_dev16R3Tst.$(EXT_LIB)\
+$(PATH_ROOT)\obj\$(SHT_TRGPLTFRM)$(SHT_BLDMD)mscv6-16\kKrnlLib_dev16R3Tst.$(EXT_LIB)\kKrnlLib_dev16R3Tst.$(EXT_LIB)\
 \
 $(PATH_TARGET)\SymDB32.$(EXT_OBJ)\
@@ -79 +79 @@
 $(PATH_OBJ)\kKrnlLib_newdbgR3Tst.$(EXT_LIB)\kKrnlLib_newdbgR3Tst.$(EXT_LIB)\
 $(PATH_OBJ)\kKrnlLib_newrelR3Tst.$(EXT_LIB)\kKrnlLib_newrelR3Tst.$(EXT_LIB)\
-$(PATH_ROOT)\obj\$(NAME_1)$(NAME_2)mscv6\kKrnlLib_dev16.$(EXT_LIB)\kKrnlLib_dev16.$(EXT_LIB)\
+$(PATH_ROOT)\obj\$(SHT_TRGPLTFRM)$(SHT_BLDMD)mscv6-16\kKrnlLib_dev16.$(EXT_LIB)\kKrnlLib_dev16.$(EXT_LIB)\