ecere: Further tweaks for Emscripten

diff --git a/ecere/ecere.epj b/ecere/ecere.epj
index 5e763f2..18e27ab 100644 (file)
--- a/ecere/ecere.epj
+++ b/ecere/ecere.epj
@@ -287,8 +287,8 @@ if distributed with the Ecere SDK Windows installer.
          "Options" : {
             "Optimization" : "Size",
             "PreprocessorDefinitions" : [
-               "BUILDING_ECERE_COM",
-               "ECERE_STATIC"
+               "ECERE_STATIC",
+               "ECERE_NOSSL"
             ],
             "TargetType" : "StaticLibrary",
             "TargetFileName" : "ecereStatic",
@@ -484,13 +484,14 @@ if distributed with the Ecere SDK Windows installer.
       {
          "Name" : "Emscripten",
          "Options" : {
-            "Debug" : true,
+            "Optimization" : "Speed",
             "PreprocessorDefinitions" : [
                "ECERE_STATIC",
                "NOBLENDING"
             ],
             "TargetType" : "StaticLibrary",
-            "TargetFileName" : "ecereStatic"
+            "TargetFileName" : "ecereStatic",
+            "FastMath" : true
          }
       }
    ],
@@ -2535,12 +2536,6 @@ if distributed with the Ecere SDK Windows installer.
                            }
                         }
                      ]
-                  },
-                  {
-                     "Name" : "Emscripten",
-                     "Options" : {
-                        "ExcludeFromBuild" : true
-                     }
                   }
                ]
             },

diff --git a/ecere/src/com/instance.ec b/ecere/src/com/instance.ec
index 097b732..db2b5d2 100644 (file)
--- a/ecere/src/com/instance.ec
+++ b/ecere/src/com/instance.ec
@@ -2814,7 +2814,8 @@ public dllexport Class eSystem_RegisterClass(ClassType type, const char * name,
                !strcmp(name, "LineStyle") ||
                !strcmp(name, "FillStyle") ||
                !strcmp(name, "FontObject") ||
-               !strcmp(name, "SymbolStyle"))
+               !strcmp(name, "FontObject") ||
+               !strcmp(name, "ecere::sys::Thread"))
             {
                _class.offset = force32Bits ? 24 : 12;
             }

diff --git a/ecere/src/net/dcom.ec b/ecere/src/net/dcom.ec
index a2b4366..5110a66 100644 (file)
--- a/ecere/src/net/dcom.ec
+++ b/ecere/src/net/dcom.ec
@@ -40,7 +40,7 @@ typedef struct in_addr IN_ADDR;
 import "network"
 import "List"
 
-#if !defined(__EMSCRIPTEN__)
+#if 1 //!defined(__EMSCRIPTEN__)
 
 // SERVER
 

diff --git a/ecere/src/sys/Condition.ec b/ecere/src/sys/Condition.ec
index 23a6c8c..208ac4b 100644 (file)
--- a/ecere/src/sys/Condition.ec
+++ b/ecere/src/sys/Condition.ec
@@ -1,9 +1,9 @@
 #if defined(BUILDING_ECERE_COM)
-#if !defined(__EMSCRIPTEN__)
+//#if !defined(__EMSCRIPTEN__)
 import "Semaphore"
-#else
-import "ecere"
-#endif
+//#else
+//import "ecere"
+//#endif
 #else
 import "ecere"
 #endif

diff --git a/ecere/src/sys/System.ec b/ecere/src/sys/System.ec
index 67b2e82..6d27861 100644 (file)
--- a/ecere/src/sys/System.ec
+++ b/ecere/src/sys/System.ec
@@ -66,12 +66,12 @@ private:
 #if !defined(ECERE_BOOTSTRAP)
 import "units"
 import "Time"
-#if !defined(__EMSCRIPTEN__)
+//#if !defined(__EMSCRIPTEN__)
 import "Mutex"
 import "Semaphore"
 import "FileMonitor"
 import "Thread"
-#endif
+//#endif
 import "Archive"
 import "EARArchive"
 import "Date"