Ecere Software / sdk / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ecere,ecereCOM: support Emscriptem platform. add new Emscripten interface driver.
[sdk] / ecere / ecere.epj
diff --git a/ecere/ecere.epj b/ecere/ecere.epj
index 6ebebdc..4757285 100644 (file)
--- a/ecere/ecere.epj
+++ b/ecere/ecere.epj
@@ -118,13 +118,13 @@ from wherever you obtained them.
          "Name" : "Win32",
          "Options" : {
             "IncludeDirs" : [
-               "../deps/DirectX-9.0/include",
-               "../deps/jpeg-6b",
+               "../deps/jpeg-9a",
                "../deps/libpng-1.4.0",
                "../deps/libungif-4.1.1/lib",
-               "../deps/zlib",
+               "../deps/zlib-1.2.8",
                "../deps/freetype-2.3.12/include",
-               "../deps/glext"
+               "../deps/glext",
+               "$(OPENSSL_INCLUDE_DIR)"
             ],
             "Libraries" : [
                "dxguid",
@@ -146,11 +146,13 @@ from wherever you obtained them.
                "ssleay32"
             ],
             "LibraryDirs" : [
-               "../deps/zlib/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)",
-               "../deps/jpeg-6b/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)",
-               "../deps/libpng-1.4.0/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)",
+               "../deps/zlib-1.2.8/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)",
+               "../deps/jpeg-9a/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)",
+               "../deps/libpng-1.6.12/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)",
                "../deps/libungif-4.1.1/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)",
-               "../deps/freetype-2.3.12/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)"
+               "../deps/freetype-2.3.12/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)",
+               "$(OPENSSL_BIN_DIR)",
+               "$(OPENSSL_LIB_DIR)"
             ]
          }
       },
@@ -163,7 +165,7 @@ from wherever you obtained them.
                "$(SYSROOT)/usr/X11/include",
                "/usr/X11R6/include/freetype2",
                "/usr/X11R6/include",
-               "../deps/jpeg-6b",
+               "../deps/jpeg-9a",
                "../deps/libpng-1.4.0",
                "../deps/libungif-4.1.1/lib"
             ],
@@ -184,8 +186,7 @@ from wherever you obtained them.
             "LibraryDirs" : [
                "$(SYSROOT)/usr/X11/lib",
                "/usr/X11R6/lib",
-               "../deps/jpeg-6b/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)",
-               "../deps/libpng-1.4.0/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)",
+               "../deps/jpeg-9a/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)",
                "../deps/libungif-4.1.1/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)"
             ]
          }
@@ -197,10 +198,8 @@ from wherever you obtained them.
          "Options" : {
             "Debug" : true,
             "PreprocessorDefinitions" : [
-               "_DEBUG",
-               "BUILDING_ECERE_COM"
-            ],
-            "FastMath" : false
+               "_DEBUG"
+            ]
          }
       },
       {
@@ -208,20 +207,17 @@ from wherever you obtained them.
          "Options" : {
             "Debug" : true,
             "MemoryGuard" : true,
-            "Optimization" : "None",
             "PreprocessorDefinitions" : [
                "BUILDING_ECERE_COM",
                "_DEBUG",
                "MEMINFO",
                "REDZONE=32"
-            ],
-            "FastMath" : false
+            ]
          }
       },
       {
          "Name" : "MemoryGuardRelease",
          "Options" : {
-            "Debug" : false,
             "MemoryGuard" : true,
             "Optimization" : "Speed",
             "PreprocessorDefinitions" : [
@@ -250,13 +246,9 @@ from wherever you obtained them.
       {
          "Name" : "Release",
          "Options" : {
-            "Warnings" : "None",
-            "Debug" : false,
+            "Warnings" : "All",
             "NoLineNumbers" : true,
             "Optimization" : "Speed",
-            "PreprocessorDefinitions" : [
-               "BUILDING_ECERE_COM"
-            ],
             "FastMath" : true,
             "PostbuildCommands" : [
                "$(call mkdirq,../$(SODESTDIR))",
@@ -272,7 +264,6 @@ from wherever you obtained them.
       {
          "Name" : "Static",
          "Options" : {
-            "Debug" : false,
             "Optimization" : "Size",
             "PreprocessorDefinitions" : [
                "BUILDING_ECERE_COM",
@@ -286,20 +277,17 @@ from wherever you obtained them.
                "z",
                "freetype"
             ],
-            "Compress" : true,
-            "FastMath" : false
+            "Compress" : true
          }
       },
       {
          "Name" : "Tight",
          "Options" : {
-            "Debug" : false,
             "Optimization" : "Size",
             "PreprocessorDefinitions" : [
                "BUILDING_ECERE_COM"
             ],
-            "Compress" : true,
-            "FastMath" : false
+            "Compress" : true
          }
       },
       {
@@ -315,8 +303,7 @@ from wherever you obtained them.
                "ECERE_NOSSL"
             ],
             "TargetType" : "StaticLibrary",
-            "TargetFileName" : "ecerePACS",
-            "FastMath" : false
+            "TargetFileName" : "ecerePACS"
          }
       },
       {
@@ -335,15 +322,13 @@ from wherever you obtained them.
             "TargetFileName" : "ecereBootstrap",
             "Libraries" : [
 
-            ],
-            "FastMath" : false
+            ]
          }
       },
       {
          "Name" : "Vanilla",
          "Options" : {
             "Warnings" : "None",
-            "Debug" : false,
             "NoLineNumbers" : true,
             "Optimization" : "Size",
             "PreprocessorDefinitions" : [
@@ -354,7 +339,6 @@ from wherever you obtained them.
             ],
             "TargetType" : "StaticLibrary",
             "TargetFileName" : "ecereVanilla",
-            "FastMath" : false,
             "PostbuildCommands" : [
                "$(call cpq,$(TARGET),../obj/$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/lib/)"
             ],
@@ -373,8 +357,7 @@ from wherever you obtained them.
                "ECERE_NOSSL"
             ],
             "TargetType" : "StaticLibrary",
-            "TargetFileName" : "ecereWSMS",
-            "FastMath" : false
+            "TargetFileName" : "ecereWSMS"
          },
          "Platforms" : [
             {
@@ -403,21 +386,22 @@ from wherever you obtained them.
                "ECERE_NODINPUT"
             ],
             "TargetType" : "StaticLibrary",
-            "TargetFileName" : "ecereInstaller",
-            "FastMath" : false
+            "TargetFileName" : "ecereInstaller"
          }
       },
       {
          "Name" : "Android",
          "Options" : {
+            "Debug" : true,
             "Optimization" : "Speed",
             "PreprocessorDefinitions" : [
                "ECERE_NOFONTCONFIG",
                "HIGH_DPI",
-               "ECERE_NOSSL"
+               "ECERE_NOSSL",
+               "_GLES"
             ],
             "IncludeDirs" : [
-               "../deps/jpeg-6b",
+               "../deps/jpeg-9a",
                "../deps/libpng-1.4.0",
                "../deps/libungif-4.1.1/lib",
                "../deps/zlib",
@@ -441,13 +425,22 @@ from wherever you obtained them.
                   ],
                   "LibraryDirs" : [
                      "../deps/libungif-4.1.1/obj/release.$(PLATFORM).$(COMPILER)",
-                     "../deps/libpng-1.4.0/obj/release.$(PLATFORM).$(COMPILER)",
-                     "../deps/jpeg-6b/obj/release.$(PLATFORM).$(COMPILER)",
+                     "../deps/libpng-1.6.12/obj/release.$(PLATFORM).$(COMPILER)",
+                     "../deps/jpeg-9a/obj/release.$(PLATFORM).$(COMPILER)",
                      "../deps/freetype-2.3.12/obj/release.$(PLATFORM).$(COMPILER)"
                   ]
                }
             }
          ]
+      },
+      {
+         "Name" : "GLES",
+         "Options" : {
+            "Debug" : true,
+            "PreprocessorDefinitions" : [
+               "_GLES"
+            ]
+         }
       }
    ],
    "Files" : [
@@ -1315,6 +1308,11 @@ from wherever you obtained them.
                         },
                         {
                            "FileName" : "CocoaOpenGLDisplayDriver.ec",
+                           "Options" : {
+                              "IncludeDirs" : [
+                                 "src/gui/drivers/cocoa"
+                              ]
+                           },
                            "Platforms" : [
                               {
                                  "Name" : "apple",
@@ -1501,6 +1499,12 @@ from wherever you obtained them.
                                        "Options" : {
                                           "ExcludeFromBuild" : true
                                        }
+                                    },
+                                    {
+                                       "Name" : "apple",
+                                       "Options" : {
+                                          "ExcludeFromBuild" : true
+                                       }
                                     }
                                  ]
                               },
@@ -1516,6 +1520,26 @@ from wherever you obtained them.
                                  ]
                               }
                            ]
+                        },
+                        {
+                           "FileName" : "edtaa3func.ec",
+                           "Options" : {
+                              "ExcludeFromBuild" : false
+                           },
+                           "Configurations" : [
+                              {
+                                 "Name" : "Vanilla",
+                                 "Options" : {
+                                    "ExcludeFromBuild" : true
+                                 }
+                              },
+                              {
+                                 "Name" : "Bootstrap",
+                                 "Options" : {
+                                    "ExcludeFromBuild" : true
+                                 }
+                              }
+                           ]
                         }
                      ],
                      "Options" : {
@@ -1849,6 +1873,12 @@ from wherever you obtained them.
                                  }
                               }
                            ]
+                        },
+                        {
+                           "FileName" : "EmscriptenInterface.ec",
+                           "Options" : {
+                              "ExcludeFromBuild" : false
+                           }
                         }
                      ],
                      "Options" : {
@@ -2388,83 +2418,13 @@ from wherever you obtained them.
       {
          "Folder" : "locale",
          "Files" : [
-            {
-               "Folder" : "zh_CN",
-               "Files" : [
-                  {
-                     "Folder" : "LC_MESSAGES",
-                     "Files" : [
-                        "locale/zh_CN/LC_MESSAGES/ecere.mo"
-                     ]
-                  }
-               ]
-            },
-            {
-               "Folder" : "es_ES",
-               "Files" : [
-                  {
-                     "Folder" : "LC_MESSAGES",
-                     "Files" : [
-                        "locale/es_ES/LC_MESSAGES/ecere.mo"
-                     ]
-                  }
-               ]
-            },
-            {
-               "Folder" : "hu_HU",
-               "Files" : [
-                  {
-                     "Folder" : "LC_MESSAGES",
-                     "Files" : [
-                        "locale/hu_HU/LC_MESSAGES/ecere.mo"
-                     ]
-                  }
-               ]
-            },
-            {
-               "Folder" : "mr_MR",
-               "Files" : [
-                  {
-                     "Folder" : "LC_MESSAGES",
-                     "Files" : [
-                        "locale/mr_MR/LC_MESSAGES/ecere.mo"
-                     ]
-                  }
-               ]
-            },
-            {
-               "Folder" : "nl_NL",
-               "Files" : [
-                  {
-                     "Folder" : "LC_MESSAGES",
-                     "Files" : [
-                        "locale/nl_NL/LC_MESSAGES/ecere.mo"
-                     ]
-                  }
-               ]
-            },
-            {
-               "Folder" : "pt_BR",
-               "Files" : [
-                  {
-                     "Folder" : "LC_MESSAGES",
-                     "Files" : [
-                        "locale/pt_BR/LC_MESSAGES/ecere.mo"
-                     ]
-                  }
-               ]
-            },
-            {
-               "Folder" : "ru_RU",
-               "Files" : [
-                  {
-                     "Folder" : "LC_MESSAGES",
-                     "Files" : [
-                        "locale/ru_RU/LC_MESSAGES/ecere.mo"
-                     ]
-                  }
-               ]
-            }
+            "locale/es.mo",
+            "locale/hu.mo",
+            "locale/mr.mo",
+            "locale/nl.mo",
+            "locale/pt_BR.mo",
+            "locale/ru.mo",
+            "locale/zh_CN.mo"
          ],
          "Configurations" : [
             {
The Ecere SDK