ide/sdk: Fixed forcing bit depth option not invoked for static libraries

diff --git a/compiler/bootstrap/ecc/Makefile b/compiler/bootstrap/ecc/Makefile
index 3e58619..0c106fe 100644 (file)
--- a/compiler/bootstrap/ecc/Makefile
+++ b/compiler/bootstrap/ecc/Makefile
@@ -84,8 +84,10 @@ endif
 
 CECFLAGS += -cpp $(_CPP)
 
+OFLAGS += $(FORCE_32_BIT)
+
 ifndef STATIC_LIBRARY_TARGET
-OFLAGS += $(FORCE_32_BIT) \
+OFLAGS += \
         -L../ecere/obj/bootstrap.$(PLATFORM) \
         -L../libec/obj/bootstrap.$(PLATFORM)
 endif

diff --git a/compiler/bootstrap/ecc/bootstrap/ecc.c b/compiler/bootstrap/ecc/bootstrap/ecc.c
index 5712e49..586ffe7 100644 (file)
--- a/compiler/bootstrap/ecc/bootstrap/ecc.c
+++ b/compiler/bootstrap/ecc/bootstrap/ecc.c
@@ -1027,7 +1027,7 @@ __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types
 {
 struct GlobalData * data = (data = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_GlobalData), data->fullName = __ecereNameSpace__ecere__sys__CopyString("__thisModule"), data->dataTypeString = __ecereNameSpace__ecere__sys__CopyString("Module"), data->module = privateModule, data);
 
-data->key = (unsigned int)data->fullName;
+data->key = (uintptr_t)data->fullName;
 __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalData.functions, (struct __ecereNameSpace__ecere__sys__BTNode *)data);
 }
 snprintf(command, sizeof command, "%s%s -x c -E \"%s\"", cppCommand, cppOptions ? cppOptions : "", GetSourceFile());

diff --git a/compiler/bootstrap/ecere/Makefile b/compiler/bootstrap/ecere/Makefile
index 973dd5f..e6bc1d2 100644 (file)
--- a/compiler/bootstrap/ecere/Makefile
+++ b/compiler/bootstrap/ecere/Makefile
@@ -116,9 +116,7 @@ ECFLAGS += \
 
 CECFLAGS += -cpp $(_CPP)
 
-ifndef STATIC_LIBRARY_TARGET
 OFLAGS += $(FORCE_32_BIT)
-endif
 
 # TARGETS
 

diff --git a/compiler/bootstrap/ecp/Makefile b/compiler/bootstrap/ecp/Makefile
index f099f9a..6c9aa33 100644 (file)
--- a/compiler/bootstrap/ecp/Makefile
+++ b/compiler/bootstrap/ecp/Makefile
@@ -84,8 +84,10 @@ endif
 
 CECFLAGS += -cpp $(_CPP)
 
+OFLAGS += $(FORCE_32_BIT)
+
 ifndef STATIC_LIBRARY_TARGET
-OFLAGS += $(FORCE_32_BIT) \
+OFLAGS += \
         -L../ecere/obj/bootstrap.$(PLATFORM) \
         -L../libec/obj/bootstrap.$(PLATFORM)
 endif

diff --git a/compiler/bootstrap/ecs/Makefile b/compiler/bootstrap/ecs/Makefile
index c3c8576..0facdba 100644 (file)
--- a/compiler/bootstrap/ecs/Makefile
+++ b/compiler/bootstrap/ecs/Makefile
@@ -84,8 +84,10 @@ endif
 
 CECFLAGS += -cpp $(_CPP)
 
+OFLAGS += $(FORCE_32_BIT)
+
 ifndef STATIC_LIBRARY_TARGET
-OFLAGS += $(FORCE_32_BIT) \
+OFLAGS += \
         -L../ecere/obj/bootstrap.$(PLATFORM) \
         -L../libec/obj/bootstrap.$(PLATFORM)
 endif

diff --git a/compiler/bootstrap/libec/Makefile b/compiler/bootstrap/libec/Makefile
index b1a756f..2aa6cd8 100644 (file)
--- a/compiler/bootstrap/libec/Makefile
+++ b/compiler/bootstrap/libec/Makefile
@@ -106,9 +106,7 @@ ECFLAGS += \
 
 CECFLAGS += -cpp $(_CPP)
 
-ifndef STATIC_LIBRARY_TARGET
 OFLAGS += $(FORCE_32_BIT)
-endif
 
 # TARGETS
 

diff --git a/compiler/bootstrap/libec/bootstrap/ast.c b/compiler/bootstrap/libec/bootstrap/ast.c
index b5d1150..dc5af6f 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/ast.c
+++ b/compiler/bootstrap/libec/bootstrap/ast.c
@@ -3639,6 +3639,14 @@ specType->kind = 21;
 }
 else if(spec->type == 1)
 {
+if(spec->name && (!strcmp(spec->name, "intptr") || !strcmp(spec->name, "uintptr")))
+{
+specType->kind = 22;
+if(!strcmp(spec->name, "uintptr"))
+specType->isSigned = 0x0;
+}
+else
+{
 struct Symbol * symbol = spec->name ? FindType(curContext, spec->name) : (((void *)0));
 
 if(symbol && symbol->type)
@@ -3658,6 +3666,7 @@ if(!specType->_class)
 specType->kind = 3;
 }
 }
+}
 else if(spec->type == 2)
 {
 specType->kind = 15;

diff --git a/compiler/bootstrap/libec/bootstrap/pass2.c b/compiler/bootstrap/libec/bootstrap/pass2.c
index fa9ac33..3001779 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/pass2.c
+++ b/compiler/bootstrap/libec/bootstrap/pass2.c
@@ -1083,7 +1083,7 @@ struct Expression * exp = *expPtr;
 
 *memberExpPtr = (((void *)0));
 newExp = CopyExpression(exp);
-*(struct Expression **)((unsigned char *)newExp + (unsigned int)((unsigned char *)memberExpPtr - (unsigned char *)exp)) = memberExp;
+*(struct Expression **)((unsigned char *)newExp + ((unsigned char *)memberExpPtr - (unsigned char *)exp)) = memberExp;
 memberExp->member.exp = idExp;
 exp->type = 5;
 exp->list = bracketExp->list;
@@ -1101,7 +1101,7 @@ struct Expression * exp = *expPtr;
 
 *memberExpPtr = (((void *)0));
 newExp = CopyExpression(exp);
-*(struct Expression **)((unsigned char *)newExp + (unsigned int)((unsigned char *)memberExpPtr - (unsigned char *)exp)) = (*memberExp->list).last;
+*(struct Expression **)((unsigned char *)newExp + ((unsigned char *)memberExpPtr - (unsigned char *)exp)) = (*memberExp->list).last;
 exp->type = 5;
 exp->list = memberExp->list;
 memberExp->list = (((void *)0));

diff --git a/compiler/ecc/Makefile b/compiler/ecc/Makefile
index 08d5be2..89f44cf 100644 (file)
--- a/compiler/ecc/Makefile
+++ b/compiler/ecc/Makefile
@@ -86,8 +86,10 @@ ECFLAGS += \
 
 CECFLAGS += -cpp $(_CPP)
 
+OFLAGS += $(FORCE_32_BIT)
+
 ifndef STATIC_LIBRARY_TARGET
-OFLAGS += $(FORCE_32_BIT) \
+OFLAGS += \
         -L../../obj/$(PLATFORM)/bin \
         -L../../obj/$(PLATFORM)/lib
 endif

diff --git a/compiler/ecp/Makefile b/compiler/ecp/Makefile
index ca9c534..d448482 100644 (file)
--- a/compiler/ecp/Makefile
+++ b/compiler/ecp/Makefile
@@ -86,8 +86,10 @@ ECFLAGS += \
 
 CECFLAGS += -cpp $(_CPP)
 
+OFLAGS += $(FORCE_32_BIT)
+
 ifndef STATIC_LIBRARY_TARGET
-OFLAGS += $(FORCE_32_BIT) \
+OFLAGS += \
         -L../../obj/$(PLATFORM)/bin \
         -L../../obj/$(PLATFORM)/lib
 endif

diff --git a/compiler/ecs/Makefile b/compiler/ecs/Makefile
index 714f9ae..877dbed 100644 (file)
--- a/compiler/ecs/Makefile
+++ b/compiler/ecs/Makefile
@@ -86,8 +86,10 @@ ECFLAGS += \
 
 CECFLAGS += -cpp $(_CPP)
 
+OFLAGS += $(FORCE_32_BIT)
+
 ifndef STATIC_LIBRARY_TARGET
-OFLAGS += $(FORCE_32_BIT) \
+OFLAGS += \
         -L../../obj/$(PLATFORM)/bin \
         -L../../obj/$(PLATFORM)/lib
 endif

diff --git a/compiler/libec/Makefile b/compiler/libec/Makefile
index c8a842d..e534530 100644 (file)
--- a/compiler/libec/Makefile
+++ b/compiler/libec/Makefile
@@ -119,8 +119,10 @@ ECFLAGS += \
 
 CECFLAGS += -cpp $(_CPP)
 
+OFLAGS += $(FORCE_32_BIT)
+
 ifndef STATIC_LIBRARY_TARGET
-OFLAGS += $(FORCE_32_BIT) \
+OFLAGS += \
         -L../../obj/$(PLATFORM)/bin \
         -L../../obj/$(PLATFORM)/lib
 endif

diff --git a/compiler/libec/src/ast.ec b/compiler/libec/src/ast.ec
index e9aab44..34c02fd 100644 (file)
--- a/compiler/libec/src/ast.ec
+++ b/compiler/libec/src/ast.ec
@@ -2157,25 +2157,34 @@ public Type ProcessType(OldList specs, Declarator decl)
                }
                else if(spec.type == nameSpecifier)
                {
-                  Symbol symbol = spec.name ? FindType(curContext, spec.name) : null;
-                  if(symbol && symbol.type)
+                  if(spec.name && (!strcmp(spec.name, "intptr") || !strcmp(spec.name, "uintptr")))
                   {
-                     // Free Type Contents:
-                     Type dummy { };
-                     *dummy = *specType;
-                     FreeType(dummy);
-
-                     CopyTypeInto(specType, symbol.type);
-                     specType.typeName = CopyString(symbol.type.name);
+                     specType.kind = intPtrType;
+                     if(!strcmp(spec.name, "uintptr"))
+                        specType.isSigned = false;
                   }
-                  else if(!isTypedef) // !specType.kind)    // TESTING THIS FOR enum / typedef problem
+                  else
                   {
-                     // key.sym enum values need FindClass:
-                     specType._class = spec.name ? FindClass(spec.name) : null;
-                     // specType._class = spec.symbol; 
-                     specType.kind = classType;
-                     if(!specType._class)
-                        specType.kind = intType;
+                     Symbol symbol = spec.name ? FindType(curContext, spec.name) : null;
+                     if(symbol && symbol.type)
+                     {
+                        // Free Type Contents:
+                        Type dummy { };
+                        *dummy = *specType;
+                        FreeType(dummy);
+
+                        CopyTypeInto(specType, symbol.type);
+                        specType.typeName = CopyString(symbol.type.name);
+                     }
+                     else if(!isTypedef) // !specType.kind)    // TESTING THIS FOR enum / typedef problem
+                     {
+                        // key.sym enum values need FindClass:
+                        specType._class = spec.name ? FindClass(spec.name) : null;
+                        // specType._class = spec.symbol; 
+                        specType.kind = classType;
+                        if(!specType._class)
+                           specType.kind = intType;
+                     }
                   }
                }
                else if(spec.type == enumSpecifier)

diff --git a/deps/freetype-2.3.12/Makefile b/deps/freetype-2.3.12/Makefile
index a6038ae..a7133a2 100644 (file)
--- a/deps/freetype-2.3.12/Makefile
+++ b/deps/freetype-2.3.12/Makefile
@@ -159,10 +159,6 @@ PRJ_CFLAGS += \
 
 CECFLAGS += -cpp $(_CPP)
 
-ifndef STATIC_LIBRARY_TARGET
-OFLAGS +=
-endif
-
 # TARGETS
 
 all: objdir $(TARGET)

diff --git a/deps/libffi-3.0.11/Makefile b/deps/libffi-3.0.11/Makefile
index 6404e4f..cfd96fc 100644 (file)
--- a/deps/libffi-3.0.11/Makefile
+++ b/deps/libffi-3.0.11/Makefile
@@ -77,10 +77,6 @@ PRJ_CFLAGS += \
 
 CECFLAGS += -cpp $(_CPP)
 
-ifndef STATIC_LIBRARY_TARGET
-OFLAGS +=
-endif
-
 # TARGETS
 
 all: objdir $(TARGET)

diff --git a/ear/cmd/Makefile b/ear/cmd/Makefile
index 51ac0f3..8357d8c 100644 (file)
--- a/ear/cmd/Makefile
+++ b/ear/cmd/Makefile
@@ -87,8 +87,10 @@ ECFLAGS += \
 
 CECFLAGS += -cpp $(_CPP)
 
+OFLAGS += $(FORCE_32_BIT)
+
 ifndef STATIC_LIBRARY_TARGET
-OFLAGS += $(FORCE_32_BIT) \
+OFLAGS += \
         -L../../obj/$(PLATFORM)/bin \
         -L../../obj/$(PLATFORM)/lib
 endif

diff --git a/ear/extract/Makefile b/ear/extract/Makefile
index 7a0100f..1e83e88 100644 (file)
--- a/ear/extract/Makefile
+++ b/ear/extract/Makefile
@@ -168,8 +168,10 @@ endif
 
 CECFLAGS += -cpp $(_CPP)
 
+OFLAGS += $(FORCE_32_BIT)
+
 ifndef STATIC_LIBRARY_TARGET
-OFLAGS += $(FORCE_32_BIT) \
+OFLAGS += \
         -L../../ecere/obj/vanilla.$(PLATFORM) \
         -L../../deps/zlib/obj/release.$(PLATFORM)
 endif

diff --git a/ecere/Makefile b/ecere/Makefile
index 56bb22d..5a4c9bc 100644 (file)
--- a/ecere/Makefile
+++ b/ecere/Makefile
@@ -502,9 +502,7 @@ endif
 
 CECFLAGS += -cpp $(_CPP)
 
-ifndef STATIC_LIBRARY_TARGET
 OFLAGS += $(FORCE_32_BIT)
-endif
 
 # TARGETS
 

diff --git a/ecere/Makefile.ecereCOM b/ecere/Makefile.ecereCOM
index 64fa9c5..83705d3 100644 (file)
--- a/ecere/Makefile.ecereCOM
+++ b/ecere/Makefile.ecereCOM
@@ -124,9 +124,7 @@ endif
 
 CECFLAGS += -cpp $(_CPP)
 
-ifndef STATIC_LIBRARY_TARGET
 OFLAGS += $(FORCE_32_BIT)
-endif
 
 # TARGETS
 

diff --git a/ecere/Makefile.vanilla b/ecere/Makefile.vanilla
index ba3d424..0ff42cf 100644 (file)
--- a/ecere/Makefile.vanilla
+++ b/ecere/Makefile.vanilla
@@ -452,9 +452,7 @@ endif
 
 CECFLAGS += -cpp $(_CPP)
 
-ifndef STATIC_LIBRARY_TARGET
 OFLAGS += $(FORCE_32_BIT)
-endif
 
 # TARGETS
 

diff --git a/eda/drivers/sqlite/Makefile b/eda/drivers/sqlite/Makefile
index eb53335..02533b1 100644 (file)
--- a/eda/drivers/sqlite/Makefile
+++ b/eda/drivers/sqlite/Makefile
@@ -139,8 +139,10 @@ endif
 
 CECFLAGS += -cpp $(_CPP)
 
+OFLAGS += $(FORCE_32_BIT)
+
 ifndef STATIC_LIBRARY_TARGET
-OFLAGS += $(FORCE_32_BIT) \
+OFLAGS += \
         -L../../../obj/$(PLATFORM)/bin \
         -L../../../obj/$(PLATFORM)/lib
 endif

diff --git a/eda/drivers/sqliteCipher/Makefile b/eda/drivers/sqliteCipher/Makefile
index 4e5dfee..d9e08a7 100644 (file)
--- a/eda/drivers/sqliteCipher/Makefile
+++ b/eda/drivers/sqliteCipher/Makefile
@@ -148,8 +148,10 @@ endif
 
 CECFLAGS += -cpp $(_CPP)
 
+OFLAGS += $(FORCE_32_BIT)
+
 ifndef STATIC_LIBRARY_TARGET
-OFLAGS += $(FORCE_32_BIT) \
+OFLAGS += \
         -L../../../obj/$(PLATFORM)/bin \
         -L../../../obj/$(PLATFORM)/lib
 endif

diff --git a/eda/libeda/Makefile b/eda/libeda/Makefile
index 2bf3ec5..8727767 100644 (file)
--- a/eda/libeda/Makefile
+++ b/eda/libeda/Makefile
@@ -113,8 +113,10 @@ endif
 
 CECFLAGS += -cpp $(_CPP)
 
+OFLAGS += $(FORCE_32_BIT)
+
 ifndef STATIC_LIBRARY_TARGET
-OFLAGS += $(FORCE_32_BIT) \
+OFLAGS += \
         -L../../obj/$(PLATFORM)/bin \
         -L../../obj/$(PLATFORM)/lib
 endif

diff --git a/eda/libeda/src/EDB.ec b/eda/libeda/src/EDB.ec
index b756015..173f494 100644 (file)
--- a/eda/libeda/src/EDB.ec
+++ b/eda/libeda/src/EDB.ec
@@ -1186,23 +1186,23 @@ static class EDBRow : DriverRow
             {
                case first:
                   node = index.tree.first;
-                  num = node ? node.key : 0;
+                  num = node ? (uint)node.key : 0;
                   return _num != 0;
                case next:
                   node = node ? node.next : index.tree.first;
-                  num = node ? node.key : 0;
+                  num = node ? (uint)node.key : 0;
                   return _num != 0;
                case last:
                   node = index.tree.last;
-                  num = node ? node.key : 0;
+                  num = node ? (uint)node.key : 0;
                   return _num != 0;
                case previous:
                   node = node ? node.prev : index.tree.last;
-                  num = node ? node.key : 0;
+                  num = node ? (uint)node.key : 0;
                   return _num != 0;
                case middle:
                   node = index.tree.root;
-                  num = node ? node.key : 0;
+                  num = node ? (uint)node.key : 0;
                   return _num != 0;
                case nil:
                   num = 0;
@@ -1313,7 +1313,7 @@ static class EDBRow : DriverRow
                      node = node ? node.next : null;
                   else
                      move = next;
-                  result = node ? order * CompareRowNum(node.key, field, data) : 1;
+                  result = node ? order * CompareRowNum((uint)node.key, field, data) : 1;
                   // We won't find this on our right
                   if(result > 0)
                   {
@@ -1325,14 +1325,14 @@ static class EDBRow : DriverRow
                   else if(result == 0)
                   {
                      this.node = node;
-                     num = node.key;
+                     num = (uint)node.key;
                      return true;                  
                   }
                }
                else if(move == previous)
                {
                   node = node ? node.prev : null;
-                  result = node ? order * CompareRowNum(node.key, field, data) : -1;
+                  result = node ? order * CompareRowNum((uint)node.key, field, data) : -1;
                   // We won't find this on our left
                   if(result < 0)
                   {
@@ -1344,7 +1344,7 @@ static class EDBRow : DriverRow
                   else if(result == 0)
                   {
                      this.node = node;
-                     num = node.key;
+                     num = (uint)node.key;
                      return true;                  
                   }
                }
@@ -1355,8 +1355,8 @@ static class EDBRow : DriverRow
                   while(node)
                   {
                      BTNode max = node.maximum, min = node.minimum;
-                     int maxResult = order * CompareRowNum(max.key, field, data);
-                     int minResult = order * CompareRowNum(min.key, field, data);
+                     int maxResult = order * CompareRowNum((uint)max.key, field, data);
+                     int minResult = order * CompareRowNum((uint)min.key, field, data);
                      if(maxResult >= 0 && minResult <= 0) break;
                      node = node.parent;
                   }
@@ -1368,7 +1368,7 @@ static class EDBRow : DriverRow
                   while(node)
                   {
                      BTNode max = node.maximum;
-                     result = order * CompareRowNum(max.key, field, data);
+                     result = order * CompareRowNum((uint)max.key, field, data);
                      if(result >= 0) break;
                      node = node.parent;
                   }
@@ -1379,7 +1379,7 @@ static class EDBRow : DriverRow
                   while(node)
                   {
                      BTNode min = node.minimum;
-                     result = order * CompareRowNum(min.key, field, data);
+                     result = order * CompareRowNum((uint)min.key, field, data);
                      if(result <= 0) break;
                      node = node.parent;
                   }
@@ -1390,7 +1390,7 @@ static class EDBRow : DriverRow
                // Go down
                while(node)
                {
-                  result = order * CompareRowNum(node.key, field, data);
+                  result = order * CompareRowNum((uint)node.key, field, data);
                   if(!result) break;
                   node = (result < 0) ? node.right : node.left;
                }
@@ -1400,10 +1400,10 @@ static class EDBRow : DriverRow
                {
                   lastNode = node;
                   node = (move == last || move == previous) ? node.next : node.prev;
-                  if(node) result = order * CompareRowNum(node.key, field, data);
+                  if(node) result = order * CompareRowNum((uint)node.key, field, data);
                }
                this.node = lastNode;
-               num = lastNode ? lastNode.key : 0;
+               num = lastNode ? (uint)lastNode.key : 0;
                return lastNode ? true : false;
             }
             else
@@ -1534,7 +1534,7 @@ static class EDBRow : DriverRow
                      node = node ? node.next : null;
                   else
                      move = next;
-                  result = node ? MultipleCompareRowNum(node.key, findData, numFields) : 1;
+                  result = node ? MultipleCompareRowNum((uint)node.key, findData, numFields) : 1;
                   // We won't find this on our right
                   if(result > 0)
                   {
@@ -1546,14 +1546,14 @@ static class EDBRow : DriverRow
                   else if(result == 0)
                   {
                      this.node = node;
-                     num = node.key;
+                     num = (uint)node.key;
                      return true;                  
                   }
                }
                else if(move == previous)
                {
                   node = node ? node.prev : null;
-                  result = node ? MultipleCompareRowNum(node.key, findData, numFields) : -1;
+                  result = node ? MultipleCompareRowNum((uint)node.key, findData, numFields) : -1;
                   // We won't find this on our left
                   if(result < 0)
                   {
@@ -1565,7 +1565,7 @@ static class EDBRow : DriverRow
                   else if(result == 0)
                   {
                      this.node = node;
-                     num = node.key;
+                     num = (uint)node.key;
                      return true;                  
                   }
                }
@@ -1578,7 +1578,7 @@ static class EDBRow : DriverRow
                   while(node)
                   {
                      BTNode max = node.maximum;
-                     result = MultipleCompareRowNum(max.key, findData, numFields);
+                     result = MultipleCompareRowNum((uint)max.key, findData, numFields);
                      if(result >= 0) break;
                      node = node.parent;
                   }
@@ -1589,7 +1589,7 @@ static class EDBRow : DriverRow
                   while(node)
                   {
                      BTNode min = node.minimum;
-                     result = MultipleCompareRowNum(min.key, findData, numFields);
+                     result = MultipleCompareRowNum((uint)min.key, findData, numFields);
                      if(result <= 0) break;
                      node = node.parent;
                   }
@@ -1600,7 +1600,7 @@ static class EDBRow : DriverRow
                // Go down
                while(node)
                {
-                  result = MultipleCompareRowNum(node.key, findData, numFields);
+                  result = MultipleCompareRowNum((uint)node.key, findData, numFields);
                   if(!result) break;
                   node = (result < 0) ? node.right : node.left;
                }
@@ -1610,10 +1610,10 @@ static class EDBRow : DriverRow
                {
                   lastNode = node;
                   node = (move == last || move == previous) ? node.next : node.prev;
-                  if(node) result = MultipleCompareRowNum(node.key, findData, numFields);
+                  if(node) result = MultipleCompareRowNum((uint)node.key, findData, numFields);
                }
                this.node = lastNode;
-               num = lastNode ? lastNode.key : 0;
+               num = lastNode ? (uint)lastNode.key : 0;
                return lastNode ? true : false;
             }
             else

diff --git a/eda/libeda/src/idList.ec b/eda/libeda/src/idList.ec
index 92ce1c8..9da121d 100644 (file)
--- a/eda/libeda/src/idList.ec
+++ b/eda/libeda/src/idList.ec
@@ -500,7 +500,7 @@ public class StringList
 
    bool Add(String string)
    {
-      BTNode node { key = (uint)CopyString(string) };
+      BTNode node { key = (uintptr)CopyString(string) };
       if(strings.Add(node))
          return true;
       else

diff --git a/epj2make/Makefile b/epj2make/Makefile
index 2f586c1..d117750 100644 (file)
--- a/epj2make/Makefile
+++ b/epj2make/Makefile
@@ -100,8 +100,10 @@ endif
 
 CECFLAGS += -cpp $(_CPP)
 
+OFLAGS += $(FORCE_32_BIT)
+
 ifndef STATIC_LIBRARY_TARGET
-OFLAGS += $(FORCE_32_BIT) \
+OFLAGS += \
         -L../obj/$(PLATFORM)/bin \
         -L../obj/$(PLATFORM)/lib
 endif

diff --git a/ide/Makefile b/ide/Makefile
index 442e280..f9ebc8d 100644 (file)
--- a/ide/Makefile
+++ b/ide/Makefile
@@ -220,8 +220,10 @@ endif
 
 CECFLAGS += -cpp $(_CPP)
 
+OFLAGS += $(FORCE_32_BIT)
+
 ifndef STATIC_LIBRARY_TARGET
-OFLAGS += $(FORCE_32_BIT) \
+OFLAGS += \
         -L../obj/$(PLATFORM)/bin \
         -L../obj/$(PLATFORM)/lib
 endif

diff --git a/ide/locale/ide.pot b/ide/locale/ide.pot
index de235a9..138dc49 100644 (file)
--- a/ide/locale/ide.pot
+++ b/ide/locale/ide.pot
@@ -74,19 +74,19 @@ msgstr "%s - %s%smakefile for %s config...\n"
 msgid "%s Compiler\n"
 msgstr "%s Compiler\n"
 
-#: ./src/debugger/Debugger.ec:2883
+#: ./src/debugger/Debugger.ec:2885
 msgid "%s Constructor, %s:%d\n"
 msgstr "%s Constructor, %s:%d\n"
 
-#: ./src/debugger/Debugger.ec:2885
+#: ./src/debugger/Debugger.ec:2887
 msgid "%s Destructor, %s:%d\n"
 msgstr "%s Destructor, %s:%d\n"
 
-#: ./src/debugger/Debugger.ec:2887
+#: ./src/debugger/Debugger.ec:2889
 msgid "%s Function, %s:%d\n"
 msgstr "%s Function, %s:%d\n"
 
-#: ./src/debugger/Debugger.ec:2879
+#: ./src/debugger/Debugger.ec:2881
 msgid "%s Method, %s:%d\n"
 msgstr "%s Method, %s:%d\n"
 
@@ -94,7 +94,7 @@ msgstr "%s Method, %s:%d\n"
 msgid "%s Project"
 msgstr "%s Project"
 
-#: ./src/debugger/Debugger.ec:2881
+#: ./src/debugger/Debugger.ec:2883
 msgid "%s Property, %s:%d\n"
 msgstr "%s Property, %s:%d\n"
 
@@ -512,6 +512,11 @@ msgstr "Condition"
 msgid "Configurations: "
 msgstr "Configurations: "
 
+#: ./src/designer/CodeEditor.ec:38
+#: ./src/designer/CodeEditor.ec:39
+msgid "Consolas"
+msgstr "Consolas"
+
 #: ./src/ProjectSettings.ec:2117
 msgid "Console Application"
 msgstr "Console Application"
@@ -526,15 +531,10 @@ msgstr "Copy"
 msgid "Couldn't create file."
 msgstr "Couldn't create file."
 
-#: ./src/debugger/Debugger.ec:2387
+#: ./src/debugger/Debugger.ec:2388
 msgid "Couldn't read memory"
 msgstr "Couldn't read memory"
 
-#: ./src/designer/CodeEditor.ec:35
-#: ./src/designer/CodeEditor.ec:36
-msgid "Courier New"
-msgstr "Courier New"
-
 #: ./src/dialogs/NewProjectDialog.ec:219
 msgid "Create Form"
 msgstr "Create Form"
@@ -573,23 +573,23 @@ msgstr "Debug compiling"
 msgid "Debuggable"
 msgstr "Debuggable"
 
-#: ./src/debugger/Debugger.ec:3340
+#: ./src/debugger/Debugger.ec:3342
 msgid "Debugger Error: No target process ID\n"
 msgstr "Debugger Error: No target process ID\n"
 
-#: ./src/debugger/Debugger.ec:1896
+#: ./src/debugger/Debugger.ec:1898
 msgid "Debugger Fatal Error: Couldn't get GDB process ID\n"
 msgstr "Debugger Fatal Error: Couldn't get GDB process ID\n"
 
-#: ./src/debugger/Debugger.ec:1885
+#: ./src/debugger/Debugger.ec:1887
 msgid "Debugger Fatal Error: Couldn't start GDB\n"
 msgstr "Debugger Fatal Error: Couldn't start GDB\n"
 
-#: ./src/debugger/Debugger.ec:2684
+#: ./src/debugger/Debugger.ec:2686
 msgid "Debugger Fatal Error: GDB lost\n"
 msgstr "Debugger Fatal Error: GDB lost\n"
 
-#: ./src/debugger/Debugger.ec:2309
+#: ./src/debugger/Debugger.ec:2310
 msgid "Debugger required for symbol evaluation in \"%s\""
 msgstr "Debugger required for symbol evaluation in \"%s\""
 
@@ -597,9 +597,9 @@ msgstr "Debugger required for symbol evaluation in \"%s\""
 msgid "Debugging compressed applications is not supported\n"
 msgstr "Debugging compressed applications is not supported\n"
 
-#: ./src/debugger/Debugger.ec:2001
-#: ./src/debugger/Debugger.ec:2685
-#: ./src/debugger/Debugger.ec:3357
+#: ./src/debugger/Debugger.ec:2003
+#: ./src/debugger/Debugger.ec:2687
+#: ./src/debugger/Debugger.ec:3359
 msgid "Debugging stopped\n"
 msgstr "Debugging stopped\n"
 
@@ -649,7 +649,7 @@ msgstr "Deleteing intermediate objects for %s %s in project %s...\n"
 msgid "Deleting target and object files..."
 msgstr "Deleting target and object files..."
 
-#: ./src/debugger/Debugger.ec:2303
+#: ./src/debugger/Debugger.ec:2304
 msgid "Dereference failure for \"%s\""
 msgstr "Dereference failure for \"%s\""
 
@@ -719,7 +719,7 @@ msgstr "Edit"
 msgid "Editor"
 msgstr "Editor"
 
-#: ./src/debugger/Debugger.ec:2383
+#: ./src/debugger/Debugger.ec:2384
 msgid "Empty string"
 msgstr "Empty string"
 
@@ -765,11 +765,11 @@ msgstr "Error opening project file"
 msgid "Error writing project file"
 msgstr "Error writing project file"
 
-#: ./src/debugger/Debugger.ec:2270
+#: ./src/debugger/Debugger.ec:2271
 msgid "Error: Struct member not found for \"%s\""
 msgstr "Error: Struct member not found for \"%s\""
 
-#: ./src/debugger/Debugger.ec:2496
+#: ./src/debugger/Debugger.ec:2497
 msgid "Evaluation failed for \"%s\" of type \"%s\""
 msgstr "Evaluation failed for \"%s\" of type \"%s\""
 
@@ -1032,7 +1032,7 @@ msgstr "Include Files"
 msgid "Include Subdirectories"
 msgstr "Include Subdirectories"
 
-#: ./src/debugger/Debugger.ec:2312
+#: ./src/debugger/Debugger.ec:2313
 msgid "Incorrect debugger state for symbol evaluation in \"%s\""
 msgstr "Incorrect debugger state for symbol evaluation in \"%s\""
 
@@ -1048,14 +1048,14 @@ msgstr "Initializing Debugger"
 msgid "Intermediate Objects Directory"
 msgstr "Intermediate Objects Directory"
 
-#: ./src/debugger/Debugger.ec:2405
+#: ./src/debugger/Debugger.ec:2406
 msgid "Invalid Enum Value"
 msgstr "Invalid Enum Value"
 
-#: ./src/debugger/Debugger.ec:1099
-#: ./src/debugger/Debugger.ec:1115
-#: ./src/debugger/Debugger.ec:1128
-#: ./src/debugger/Debugger.ec:1234
+#: ./src/debugger/Debugger.ec:1101
+#: ./src/debugger/Debugger.ec:1117
+#: ./src/debugger/Debugger.ec:1130
+#: ./src/debugger/Debugger.ec:1236
 msgid "Invalid Source Directory"
 msgstr "Invalid Source Directory"
 
@@ -1063,7 +1063,7 @@ msgstr "Invalid Source Directory"
 msgid "Invalid Unicode Keypoint (0x%08X)"
 msgstr "Invalid Unicode Keypoint (0x%08X)"
 
-#: ./src/debugger/Debugger.ec:2503
+#: ./src/debugger/Debugger.ec:2504
 msgid "Invalid expression: \"%s\""
 msgstr "Invalid expression: \"%s\""
 
@@ -1134,11 +1134,11 @@ msgstr "Makefile doesn't exist. "
 msgid "Match case"
 msgstr "Match case"
 
-#: ./src/debugger/Debugger.ec:2290
+#: ./src/debugger/Debugger.ec:2291
 msgid "Member \"%s\" not found in class \"%s\""
 msgstr "Member \"%s\" not found in class \"%s\""
 
-#: ./src/debugger/Debugger.ec:2300
+#: ./src/debugger/Debugger.ec:2301
 msgid "Memory can't be read at %s"
 msgstr "Memory can't be read at %s"
 
@@ -1179,7 +1179,7 @@ msgstr "Microsoft Visual Studio 2010 (10.0) Compiler"
 msgid "Misc"
 msgstr "Misc"
 
-#: ./src/debugger/Debugger.ec:2494
+#: ./src/debugger/Debugger.ec:2495
 msgid "Missing property evaluation support for \"%s\""
 msgstr "Missing property evaluation support for \"%s\""
 
@@ -1252,11 +1252,11 @@ msgstr "Next"
 msgid "No Line Numbers"
 msgstr "No Line Numbers"
 
-#: ./src/debugger/Debugger.ec:1239
+#: ./src/debugger/Debugger.ec:1241
 msgid "No Source Directory Provided"
 msgstr "No Source Directory Provided"
 
-#: ./src/debugger/Debugger.ec:2095
+#: ./src/debugger/Debugger.ec:2096
 msgid "No source file found for selected frame"
 msgstr "No source file found for selected frame"
 
@@ -1273,11 +1273,11 @@ msgstr "Normal"
 msgid "Nothing to be found. Please specify at least one criteria."
 msgstr "Nothing to be found. Please specify at least one criteria."
 
-#: ./src/debugger/Debugger.ec:2348
+#: ./src/debugger/Debugger.ec:2349
 msgid "Null string"
 msgstr "Null string"
 
-#: ./src/debugger/Debugger.ec:2315
+#: ./src/debugger/Debugger.ec:2316
 msgid "Null type for \"%s\""
 msgstr "Null type for \"%s\""
 
@@ -1498,11 +1498,11 @@ msgstr "Properties.."
 msgid "Properties..."
 msgstr "Properties..."
 
-#: ./src/debugger/Debugger.ec:723
+#: ./src/debugger/Debugger.ec:722
 msgid "Provide source file location for %s"
 msgstr "Provide source file location for %s"
 
-#: ./src/debugger/Debugger.ec:1208
+#: ./src/debugger/Debugger.ec:1209
 msgid "Provide source files location directory for %s"
 msgstr "Provide source files location directory for %s"
 
@@ -1782,10 +1782,10 @@ msgstr "Start"
 msgid "Starting Debug"
 msgstr "Starting Debug"
 
-#: ./src/debugger/Debugger.ec:871
-#: ./src/debugger/Debugger.ec:891
-#: ./src/debugger/Debugger.ec:935
-#: ./src/debugger/Debugger.ec:1841
+#: ./src/debugger/Debugger.ec:873
+#: ./src/debugger/Debugger.ec:893
+#: ./src/debugger/Debugger.ec:937
+#: ./src/debugger/Debugger.ec:1843
 msgid "Starting debug mode\n"
 msgstr "Starting debug mode\n"
 
@@ -1832,7 +1832,7 @@ msgstr "Strict Name Spaces"
 msgid "Supports forcing bit depth"
 msgstr "Supports forcing bit depth"
 
-#: ./src/debugger/Debugger.ec:2266
+#: ./src/debugger/Debugger.ec:2267
 msgid "Symbol \"%s\" not found"
 msgstr "Symbol \"%s\" not found"
 
@@ -1873,7 +1873,7 @@ msgstr "Target Type"
 msgid "Target and object files deleted\n"
 msgstr "Target and object files deleted\n"
 
-#: ./src/debugger/Debugger.ec:2743
+#: ./src/debugger/Debugger.ec:2745
 msgid "Target doesn't contain debug information!\n"
 msgstr "Target doesn't contain debug information!\n"
 
@@ -1915,20 +1915,20 @@ msgstr "The following file"
 msgid "The following file%s could not be re-opened.%s"
 msgstr "The following file%s could not be re-opened.%s"
 
-#: ./src/debugger/Debugger.ec:841
+#: ./src/debugger/Debugger.ec:843
 msgid "The program %s has exited (gdb provided an unknown reason)%s.\n"
 msgstr "The program %s has exited (gdb provided an unknown reason)%s.\n"
 
-#: ./src/debugger/Debugger.ec:835
+#: ./src/debugger/Debugger.ec:837
 msgid "The program %s has exited normally%s.\n"
 msgstr "The program %s has exited normally%s.\n"
 
-#: ./src/debugger/Debugger.ec:839
+#: ./src/debugger/Debugger.ec:841
 msgid "The program %s has exited with a signal%s.\n"
 msgstr "The program %s has exited with a signal%s.\n"
 
-#: ./src/debugger/Debugger.ec:833
-#: ./src/debugger/Debugger.ec:837
+#: ./src/debugger/Debugger.ec:835
+#: ./src/debugger/Debugger.ec:839
 msgid "The program %s has exited%s.\n"
 msgstr "The program %s has exited%s.\n"
 
@@ -1936,7 +1936,7 @@ msgstr "The program %s has exited%s.\n"
 msgid "The project %s was modified by another application.\nWould you like to reload it and lose your changes?"
 msgstr "The project %s was modified by another application.\nWould you like to reload it and lose your changes?"
 
-#: ./src/debugger/Debugger.ec:1098
+#: ./src/debugger/Debugger.ec:1100
 msgid "This is the project directory.\nWould you like to try again?"
 msgstr "This is the project directory.\nWould you like to try again?"
 
@@ -1944,7 +1944,7 @@ msgstr "This is the project directory.\nWould you like to try again?"
 msgid "This project is already present in workspace."
 msgstr "This project is already present in workspace."
 
-#: ./src/debugger/Debugger.ec:1114
+#: ./src/debugger/Debugger.ec:1116
 msgid "This source directory is already specified.\nWould you like to try again?"
 msgstr "This source directory is already specified.\nWould you like to try again?"
 
@@ -1988,7 +1988,7 @@ msgstr "Tree:"
 msgid "Type"
 msgstr "Type"
 
-#: ./src/debugger/Debugger.ec:1127
+#: ./src/debugger/Debugger.ec:1129
 msgid "Unable to locate source file.\nWould you like to try again?"
 msgstr "Unable to locate source file.\nWould you like to try again?"
 
@@ -2002,15 +2002,15 @@ msgstr "Unable to open file %s\n\n"
 msgid "Unable to save %s file.\n"
 msgstr "Unable to save %s file.\n"
 
-#: ./src/debugger/Debugger.ec:2306
+#: ./src/debugger/Debugger.ec:2307
 msgid "Unknown error for \"%s\""
 msgstr "Unknown error for \"%s\""
 
-#: ./src/debugger/Debugger.ec:3406
+#: ./src/debugger/Debugger.ec:3408
 msgid "Unknown output"
 msgstr "Unknown output"
 
-#: ./src/debugger/Debugger.ec:3384
+#: ./src/debugger/Debugger.ec:3386
 msgid "Unknown prompt"
 msgstr "Unknown prompt"
 
@@ -2133,11 +2133,11 @@ msgstr "Writing symbol loader...\n"
 msgid "You have modified projects.\nSave changes to "
 msgstr "You have modified projects.\nSave changes to "
 
-#: ./src/debugger/Debugger.ec:1238
+#: ./src/debugger/Debugger.ec:1240
 msgid "You must provide a source directory in order to place a breakpoint in this file.\nWould you like to try again?"
 msgstr "You must provide a source directory in order to place a breakpoint in this file.\nWould you like to try again?"
 
-#: ./src/debugger/Debugger.ec:1233
+#: ./src/debugger/Debugger.ec:1235
 msgid "You must provide a valid source directory in order to place a breakpoint in this file.\nWould you like to try again?"
 msgstr "You must provide a valid source directory in order to place a breakpoint in this file.\nWould you like to try again?"
 
@@ -2182,11 +2182,11 @@ msgstr "eC/C/C++ Files (*.ec, *.eh, *.c, *.cpp, *.cc, *.cxx, *.h, *.hpp, *.hh, *
 msgid "eC/C/C++ Source Files (*.ec, *.c, *.cpp, *.cc, *.cxx)"
 msgstr "eC/C/C++ Source Files (*.ec, *.c, *.cpp, *.cc, *.cxx)"
 
-#: ./src/debugger/Debugger.ec:3550
+#: ./src/debugger/Debugger.ec:3552
 msgid "err: Unable to create FIFO %s\n"
 msgstr "err: Unable to create FIFO %s\n"
 
-#: ./src/debugger/Debugger.ec:3551
+#: ./src/debugger/Debugger.ec:3553
 msgid "err: Unable to open FIFO %s for read\n"
 msgstr "err: Unable to open FIFO %s for read\n"
 
@@ -2213,7 +2213,7 @@ msgstr "folder"
 msgid "found"
 msgstr "found"
 
-#: ./src/debugger/Debugger.ec:2897
+#: ./src/debugger/Debugger.ec:2899
 msgid "inside %s, %s\n"
 msgstr "inside %s, %s\n"
 
@@ -2247,7 +2247,7 @@ msgstr "s were "
 msgid "single file"
 msgstr "single file"
 
-#: ./src/debugger/Debugger.ec:2903
+#: ./src/debugger/Debugger.ec:2905
 msgid "unknown source\n"
 msgstr "unknown source\n"
 

diff --git a/ide/src/project/Project.ec b/ide/src/project/Project.ec
index 6c586f4..e65519d 100644 (file)
--- a/ide/src/project/Project.ec
+++ b/ide/src/project/Project.ec
@@ -2661,21 +2661,30 @@ private:
          f.Puts("\n");
          f.Puts("\n");
 
-         f.Puts("ifndef STATIC_LIBRARY_TARGET\n");
-         f.Puts("OFLAGS +=");
          forceBitDepth = (options && options.buildBitDepth) || numCObjects;
-         if(forceBitDepth)
-            f.Puts((!options || !options.buildBitDepth || options.buildBitDepth == bits32) ? " $(FORCE_32_BIT)" : " $(FORCE_64_BIT) \\\n");
-
-         if(GetProfile(config))
-            f.Puts(" -pg");
-         if(config && config.options && config.options.libraryDirs)
-            OutputListOption(f, "L", config.options.libraryDirs, lineEach, true);
-         if(options && options.libraryDirs)
-            OutputListOption(f, "L", options.libraryDirs, lineEach, true);
-         f.Puts("\n");
-         f.Puts("endif\n");
-         f.Puts("\n");
+         if(forceBitDepth || GetProfile(config))
+         {
+            f.Puts("OFLAGS +=");
+            if(forceBitDepth)
+               f.Puts((!options || !options.buildBitDepth || options.buildBitDepth == bits32) ? " $(FORCE_32_BIT)" : " $(FORCE_64_BIT)");
+            if(GetProfile(config))
+               f.Puts(" -pg");
+            f.Puts("\n");
+            f.Puts("\n");
+         }
+
+         if((config && config.options && config.options.libraryDirs) || (options && options.libraryDirs))
+         {
+            f.Puts("ifndef STATIC_LIBRARY_TARGET\n");
+            f.Puts("OFLAGS +=");
+            if(config && config.options && config.options.libraryDirs)
+               OutputListOption(f, "L", config.options.libraryDirs, lineEach, true);
+            if(options && options.libraryDirs)
+               OutputListOption(f, "L", options.libraryDirs, lineEach, true);
+            f.Puts("\n");
+            f.Puts("endif\n");
+            f.Puts("\n");
+         }
 
          f.Puts("# TARGETS\n");
          f.Puts("\n");