X-Git-Url: https://ecere.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ecere%2Fecere.epj;h=8424c2dd75bc1635519cb89fcb29e2304c781308;hb=4253bad98fe37022d4cdc7add372f544312b7622;hp=80160e042f73212edad2fc00adfa5287d9e4c4e3;hpb=be03774c30019909f06f154f149afa4b2db50f00;p=sdk

diff --git a/ecere/ecere.epj b/ecere/ecere.epj
index 80160e0..8424c2d 100644
--- a/ecere/ecere.epj
+++ b/ecere/ecere.epj
@@ -2,8 +2,8 @@
    "Version" : 0.2,
    "ModuleName" : "ecere",
    "ModuleVersion" : "0.44",
-   "Description" : "The allmighty Ecere Runtime library.",
-   "License" : "Ecere SDK v0.44 - www.ecere.com
+   "Description" : "Ecere Runtime library",
+   "License" : "The Ecere SDK v0.44.14 - http://ecere.org
 
 The Ecere SDK is Free Open Source Software. It is provided with NO WARRANTY
 expressed or implied to the extent permitted by law.
@@ -19,13 +19,15 @@ commercially, along with the supporting Ecere runtime library(ies):
       - Data Access System
    * libEDASQLite.so / EDASQLite.dll
       - SQLite driver for EDA
+   * libEcereAudio.so / EcereAudio.dll
+      - Audio output library (using ALSA / DirectSound)
 
 The Ecere SDK is distributed under the New BSD license:
 
 ================================================================================
 
-   Copyright (c) 1996-2012, Jerome Jacovella-St-Louis
-   Copyright (c) 2005-2012, Ecere Corporation
+   Copyright (c) 1996-2016, Jerome Jacovella-St-Louis
+   Copyright (c) 2005-2016, Ecere Corporation
 
    All rights reserved.
 
@@ -53,19 +55,31 @@ The Ecere SDK is distributed under the New BSD license:
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-===============================================================================
+================================================================================
 
 This software makes use of other software components whose licenses may also
 apply, which are found in their respective source directories (most under
 deps/).
 
-Among them: zlib, libpng, libjpeg, giflib, harfbuzz, freetype, tango icons
+Among them: zlib, libPNG, libJPEG, giflib or libungif, HarfBuzz, FreeType,
+   Tango icons
+
+For EDA: SQLite (EDASQLite), libffi
+
+On Windows, applications built statically with the MinGW-w64 runtime should
+include the MinGW-w64 runtime license in their application.
+   See ecere-sdk/extras/res/licenses/MinGW-w64.LICENSE or
+       Program Files/Ecere SDK/tdm/licenses/COPYING.MinGW-w64-runtime.txt
+
+The Ecere IDE also communicates with GCC for compiling
+(MinGW/MinGW-w64 on Windows), GDB for debugging, and UPX for optionally
+compressing executables.
 
-The IDE also communicates with GCC for compiling (MinGW on Windows), GDB for
-debugging, and UPX for optionally compressing executables. Each of these have
-their own license which can be found in their respective documentation folder
-if distributed along with the SDK (in the case of the Windows version) or
-from wherever you obtained them.
+Each of these have their own license, which can be found from wherever you
+obtained them or under:
+   Program Files/Ecere SDK/tdm/licenses/  and
+   Program Files/Ecere SDK/upx/doc/
+if distributed with the Ecere SDK Windows installer.
 ",
    "Options" : {
       "Warnings" : "All",
@@ -392,11 +406,13 @@ from wherever you obtained them.
       {
          "Name" : "Android",
          "Options" : {
+            "Debug" : true,
             "Optimization" : "Speed",
             "PreprocessorDefinitions" : [
                "ECERE_NOFONTCONFIG",
                "HIGH_DPI",
-               "ECERE_NOSSL"
+               "ECERE_NOSSL",
+               "_GLES"
             ],
             "IncludeDirs" : [
                "../deps/jpeg-9a",
@@ -423,13 +439,39 @@ 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/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" : {
+            "PreprocessorDefinitions" : [
+               "_GLES"
+            ]
+         }
+      },
+      {
+         "Name" : "StaticGLES",
+         "Options" : {
+            "Optimization" : "Speed",
+            "PreprocessorDefinitions" : [
+               "_GLES",
+               "ECERE_STATIC",
+               "ECERE_NOSSL"
+            ],
+            "TargetType" : "StaticLibrary",
+            "TargetFileName" : "ecereStatic",
+            "CompilerOptions" : [
+               "-mmmx",
+               "-msse4"
+            ],
+            "FastMath" : true
+         }
       }
    ],
    "Files" : [
@@ -684,6 +726,12 @@ from wherever you obtained them.
                                        }
                                     }
                                  ]
+                              },
+                              {
+                                 "Name" : "StaticGLES",
+                                 "Options" : {
+                                    "ExcludeFromBuild" : true
+                                 }
                               }
                            ]
                         },