mess

diff --git a/ecere/ecere.epj b/ecere/ecere.epj
index b498748..6388b21 100644 (file)
--- a/ecere/ecere.epj
+++ b/ecere/ecere.epj
@@ -85,10 +85,7 @@ from wherever you obtained them.
          "jpeg",
          "png",
          "z",
-         "freetype",
-         "SDL",
-         "SDL2",
-         "SDL2main"
+         "freetype"
       ]
    },
    "Platforms" : [
@@ -201,7 +198,9 @@ from wherever you obtained them.
          "Options" : {
             "Debug" : true,
             "PreprocessorDefinitions" : [
-               "_DEBUG"
+               "_DEBUG",
+               "NO_TEMPLATE_DRIVER",
+               "NO_SDL_DRIVERS"
             ]
          }
       },
@@ -448,6 +447,28 @@ from wherever you obtained them.
       {
          "Name" : "Emscripten",
          "Options" : {
+            "Warnings" : "None",
+            "NoLineNumbers" : true,
+            "Optimization" : "Size",
+            "PreprocessorDefinitions" : [
+               "BUILDING_ECERE_COM",
+               "ECERE_STATIC",
+               "ECERE_VANILLA",
+               "NOBLENDING"
+            ],
+            "TargetType" : "StaticLibrary",
+            "TargetFileName" : "ecereVanilla",
+            "PostbuildCommands" : [
+               "$(call cpq,$(TARGET),../obj/$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/lib/)"
+            ],
+            "InstallCommands" : [
+               "$(if $(WINDOWS_HOST),$(call cpq,$(TARGET),\"$(DESTSLIBDIR)/\"),install $(INSTALL_FLAGS) $(TARGET) $(DESTSLIBDIR)/$(MODULE)$(A))"
+            ]
+         }
+      },
+      {
+         "Name" : "Emscripten",
+         "Options" : {
             "Debug" : true,
             "PreprocessorDefinitions" : [
                "ECERE_STATIC",
@@ -691,6 +712,12 @@ from wherever you obtained them.
                                  "Options" : {
                                     "ExcludeFromBuild" : false
                                  }
+                              },
+                              {
+                                 "Name" : "Debug",
+                                 "Options" : {
+                                    "ExcludeFromBuild" : false
+                                 }
                               }
                            ]
                         },
@@ -1593,18 +1620,38 @@ from wherever you obtained them.
                               }
                            ]
                         },
-                        "TemplateDisplayDriver.ec",
+                        {
+                           "FileName" : "TemplateDisplayDriver.ec",
+                           "Configurations" : [
+                              {
+                                 "Name" : "Debug",
+                                 "Options" : {
+                                    "ExcludeFromBuild" : false
+                                 }
+                              }
+                           ]
+                        },
                         {
                            "FileName" : "SDLDisplayDriver.ec",
-                           "Options" : {
-                              "ExcludeFromBuild" : false
-                           }
+                           "Configurations" : [
+                              {
+                                 "Name" : "Debug",
+                                 "Options" : {
+                                    "ExcludeFromBuild" : false
+                                 }
+                              }
+                           ]
                         },
                         {
                            "FileName" : "SDL2DisplayDriver.ec",
-                           "Options" : {
-                              "ExcludeFromBuild" : false
-                           }
+                           "Configurations" : [
+                              {
+                                 "Name" : "Debug",
+                                 "Options" : {
+                                    "ExcludeFromBuild" : false
+                                 }
+                              }
+                           ]
                         },
                         {
                            "FileName" : "PepperDisplayDriver.ec",
@@ -1950,7 +1997,17 @@ from wherever you obtained them.
                               }
                            ]
                         },
-                        "TemplateInterface.ec",
+                        {
+                           "FileName" : "TemplateInterface.ec",
+                           "Configurations" : [
+                              {
+                                 "Name" : "Debug",
+                                 "Options" : {
+                                    "ExcludeFromBuild" : false
+                                 }
+                              }
+                           ]
+                        },
                         {
                            "FileName" : "EmscriptenInterface.ec",
                            "Configurations" : [
@@ -1964,15 +2021,25 @@ from wherever you obtained them.
                         },
                         {
                            "FileName" : "SDLInterface.ec",
-                           "Options" : {
-                              "ExcludeFromBuild" : false
-                           }
+                           "Configurations" : [
+                              {
+                                 "Name" : "Debug",
+                                 "Options" : {
+                                    "ExcludeFromBuild" : false
+                                 }
+                              }
+                           ]
                         },
                         {
                            "FileName" : "SDL2Interface.ec",
-                           "Options" : {
-                              "ExcludeFromBuild" : false
-                           }
+                           "Configurations" : [
+                              {
+                                 "Name" : "Debug",
+                                 "Options" : {
+                                    "ExcludeFromBuild" : false
+                                 }
+                              }
+                           ]
                         },
                         {
                            "FileName" : "PepperInterface.ec",

diff --git a/extras/include/dpl.h b/extras/include/dpl.h
index 6895fe7..10ad5c5 100644 (file)
--- a/extras/include/dpl.h
+++ b/extras/include/dpl.h
@@ -4,6 +4,10 @@
 #ifndef        _DPL_H
 #define _DPL_H 1
 
+// source file line number printf (sflnprintf)
+#define sflnprintf(format,...) printf("%s:% 5d: " format, __FILE__, __LINE__, ##__VA_ARGS__)
+#define sflnfprintf(file,format,...) fprintf(file, "%s:% 5d: " format, __FILE__, __LINE__, ##__VA_ARGS__)
+
 // Debug Print Line Format (_dplf)
 #ifdef _DPL_ON
 #define _dplf(...) __dplf(__FILE__, __LINE__, ##__VA_ARGS__)

diff --git a/ide/src/project/ProjectNode.ec b/ide/src/project/ProjectNode.ec
index c81f067..5ec1a39 100644 (file)
--- a/ide/src/project/ProjectNode.ec
+++ b/ide/src/project/ProjectNode.ec
@@ -1704,6 +1704,8 @@ private:
                   GenMakePrintNodeFlagsVariable(this, nodeECFlagsMapping, "ECFLAGS", f);
                   GenMakePrintNodeFlagsVariable(this, nodeCFlagsMapping, "PRJ_CFLAGS", f);
 
+                  /*f.Printf(" %s$(call quote_path,%s%s.%s) -o $(call quote_path,$@)\n",
+                     emAltExt ? "" : "-c ",*/
                   f.Printf(" -c $(call quote_path,%s%s.%s) -o $(call quote_path,$@)\n",
                      modulePath, moduleName, extension);
                   if(ifCount) f.Puts("endif\n");
@@ -1911,6 +1913,9 @@ private:
             GenMakePrintNodeFlagsVariable(this, nodeCFlagsMapping, "PRJ_CFLAGS", f);
             f.Puts(" $(FVISIBILITY)");
 
+            /*f.Printf(" %s$(call quote_path,%s%s.%s) -o $(call quote_path,$@) -symbols $(OBJ)\n",
+               emAltExt ? "" : "-c ",
+               modulePath, moduleName, extension);*/
             f.Printf(" -c $(call quote_path,%s%s.%s) -o $(call quote_path,$@) -symbols $(OBJ)\n",
                modulePath, moduleName, extension);
             if(ifCount) f.Puts("endif\n");