Changeset 645

Timestamp:

Dec 3, 2006, 8:00:22 AM (19 years ago)

Author:

bird

Message:

Fixed bugs dealing with the order SDK properties was applied to sources.

File:

• trunk/src/gmake/kbuild.c (modified) (5 diffs)

trunk/src/gmake/kbuild.c

@@ -791 +791 @@
 {
     struct variable *pVar;
-    unsigned iSdk;
+    unsigned iSdk, iSdkEnd;
     int cVars, iVar, iVarEnd;
     size_t cchTotal;
@@ -831 +831 @@
 
     /* the global sdks */
-    for (iSdk = pSdks->iGlobal; iSdk < pSdks->iGlobal + pSdks->cGlobal; iSdk++)
+    iSdkEnd = iDirection == 1 ? pSdks->iGlobal + pSdks->cGlobal : pSdks->iGlobal - 1;
+    for (iSdk = iDirection == 1 ? pSdks->iGlobal : pSdks->iGlobal + pSdks->cGlobal - 1;
+         iSdk != iSdkEnd; 
+         iSdk += iDirection)
     {
         struct variable *pSdk = &pSdks->pa[iSdk];
@@ -865 +868 @@
 
     /* the target sdks */
-    for (iSdk = pSdks->iTarget; iSdk < pSdks->iTarget + pSdks->cTarget; iSdk++)
+    iSdkEnd = iDirection == 1 ? pSdks->iTarget + pSdks->cTarget : pSdks->iTarget - 1;
+    for (iSdk = iDirection == 1 ? pSdks->iTarget : pSdks->iTarget + pSdks->cTarget - 1;
+         iSdk != iSdkEnd; 
+         iSdk += iDirection)
     {
         struct variable *pSdk = &pSdks->pa[iSdk];
@@ -899 +905 @@
 
     /* the source sdks */
-    for (iSdk = pSdks->iSource; iSdk < pSdks->iSource + pSdks->cSource; iSdk++)
+    iSdkEnd = iDirection == 1 ? pSdks->iSource + pSdks->cSource : pSdks->iSource - 1;
+    for (iSdk = iDirection == 1 ? pSdks->iSource : pSdks->iSource + pSdks->cSource - 1; 
+         iSdk != iSdkEnd; 
+         iSdk += iDirection)
     {
         struct variable *pSdk = &pSdks->pa[iSdk];
@@ -934 +943 @@
 
     /* the target + source sdks */
-    for (iSdk = pSdks->iTargetSource; iSdk < pSdks->iTargetSource + pSdks->cTargetSource; iSdk++)
+    iSdkEnd = iDirection == 1 ? pSdks->iTargetSource + pSdks->cTargetSource : pSdks->iTargetSource - 1;
+    for (iSdk = iDirection == 1 ? pSdks->iTargetSource : pSdks->iTargetSource + pSdks->cTargetSource - 1;
+         iSdk != iSdkEnd;
+         iSdk += iDirection)
     {
         struct variable *pSdk = &pSdks->pa[iSdk];