Changeset 9165 for trunk/make/setup.mak

Timestamp:

Aug 29, 2002, 12:01:46 PM (23 years ago)

Author:

bird

Message:

Added new tools. Restructured tools. More options. Fixes.

File:

• trunk/make/setup.mak (modified) (4 diffs)

trunk/make/setup.mak

@@ -1 @@
-# $Id: setup.mak,v 1.15 2002-08-28 03:47:09 bird Exp $
+# $Id: setup.mak,v 1.16 2002-08-29 10:01:40 bird Exp $
 
 #
@@ -130 +130 @@
 PATH_INCLUDES   = $(PATH_ROOT)\include\win;.;$(PATH_ROOT)\include
 # Where the temporary files goes.
-PATH_OBJ        = $(PATH_ROOT)\obj\$(SHT_TRGPLTFRM)$(SHT_BLDMD)$(SHT_BLDENV)
+PATH_OBJ        = $(PATH_ROOT)\obj\$(SHT_TRGPLTFRM)$(SHT_BLDMD)$(SHT_BLDENV:-=_)
 # Where the libraries goes.
 PATH_LIB        = $(PATH_ROOT)\lib\$(BUILD_MODE)
@@ -206 +206 @@
 MAKE_INCLUDE_PROCESS    = $(PATH_MAKE)\process.mak
 
+# -----------------------------------------------------------------------------
+# Build the environments variables
+# -----------------------------------------------------------------------------
+
+# In the makefiles you're allowed to use the BUILD_ENVS_PRE,
+# BUILD_ENV_FORCE, BUILD_ENVS_POST variables to make private changes to the
+# environment. These are combined with the two base ones as follows:
+#   $(BUILD_ENVS_BASE_PRE) $(BUILD_ENVS_PRE) $(ENV_ENVS) $(BUILD_ENVS_BASE_POST) $(BUILD_ENVS_POST)
+#
+# BUILD_ENV_FORCE is used for changing the base compiler. Do *NOT* use
+# BUILD_ENV for that! BUILD_ENV_FORCE isn't used directly but in the setup
+# string above, but ENV_ENVS from the setup.[w]xyz.mk setup file is used.
+#
+
+# These strings are passed on to the BuildEnv.cmd script to setup the correct
+# shell environment.
+# TODO   Should these be overridable by setup.[w]xyz.mak ? (kso)
+BUILD_ENVS_BASE_POST    = toolkit40
+BUILD_ENVS_BASE_POST_16 =
+BUILD_ENVS_BASE_PRE     = buildsetup emx cvs
+BUILD_ENVS_BASE_PRE_16  = buildsetup emx cvs toolkit40 ddkbase
+
 
 # -----------------------------------------------------------------------------
@@ -279 +301 @@
 #
 
-# -----------------------------------------------------------------------------
-# Build the environments
-# -----------------------------------------------------------------------------
-
-# In the makefiles you're allowed to use the BUILD_ENVS_PRE,
-# BUILD_ENV_FORCE, BUILD_ENVS_POST variables to make private changes to the
-# environment. These are combined with the two base ones as follows:
-#   $(BUILD_ENVS_BASE_PRE) $(BUILD_ENVS_PRE) $(ENV_ENVS) $(BUILD_ENVS_BASE_POST) $(BUILD_ENVS_POST)
-#
-# BUILD_ENV_FORCE is used for changing the base compiler. Do *NOT* use
-# BUILD_ENV for that! BUILD_ENV_FORCE isn't used directly but in the setup
-# string above, but ENV_ENVS from the setup.[w]xyz.mk setup file is used.
-#
-
-# These strings are passed on to the BuildEnv.cmd script to setup the correct
-# shell environment.
-# TODO   Should these be overridable by setup.[w]xyz.mak ? (kso)
-
-BUILD_ENVS_BASE_POST    = toolkit40
-BUILD_ENVS_BASE_POST_16 =
-BUILD_ENVS_BASE_PRE     = buildsetup emx cvs
-BUILD_ENVS_BASE_PRE_16  = buildsetup emx cvs toolkit40 ddkbase
-
-#
+
+# -----------------------------------------------------------------------------
 # Forwarding processing.
-#
+# -----------------------------------------------------------------------------
 !if $(BUILD_FORWARDING)