ecere/ecere.epj: Added StaticGLES configuration

[sdk] / ecere / ecere.epj

diff --git a/ecere/ecere.epj b/ecere/ecere.epj
index 54efbda..26d474b 100644 (file)
--- a/ecere/ecere.epj
+++ b/ecere/ecere.epj
@@ -118,11 +118,10 @@ from wherever you obtained them.
          "Name" : "Win32",
          "Options" : {
             "IncludeDirs" : [
-               "../deps/DirectX-9.0/include",
-               "../deps/jpeg-6b",
-               "../deps/libpng-1.4.0",
+               "../deps/jpeg-9a",
+               "../deps/libpng-1.6.12",
                "../deps/libungif-4.1.1/lib",
-               "../deps/zlib",
+               "../deps/zlib-1.2.8",
                "../deps/freetype-2.3.12/include",
                "../deps/glext",
                "$(OPENSSL_INCLUDE_DIR)"
@@ -148,7 +147,7 @@ from wherever you obtained them.
             ],
             "LibraryDirs" : [
                "../deps/zlib-1.2.8/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)",
-               "../deps/jpeg-6b/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)",
@@ -166,8 +165,8 @@ from wherever you obtained them.
                "$(SYSROOT)/usr/X11/include",
                "/usr/X11R6/include/freetype2",
                "/usr/X11R6/include",
-               "../deps/jpeg-6b",
-               "../deps/libpng-1.4.0",
+               "../deps/jpeg-9a",
+               "../deps/libpng-1.6.12",
                "../deps/libungif-4.1.1/lib"
             ],
             "Libraries" : [
@@ -187,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.6.8/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)",
+               "../deps/jpeg-9a/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)",
                "../deps/libungif-4.1.1/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)"
             ]
          }
@@ -394,14 +392,16 @@ 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-6b",
+               "../deps/jpeg-9a",
                "../deps/libpng-1.4.0",
                "../deps/libungif-4.1.1/lib",
                "../deps/zlib",
@@ -425,13 +425,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/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" : {
+            "PreprocessorDefinitions" : [
+               "_GLES"
+            ]
+         }
+      },
+      {
+         "Name" : "StaticGLES",
+         "Options" : {
+            "Optimization" : "Speed",
+            "PreprocessorDefinitions" : [
+               "_GLES",
+               "ECERE_STATIC",
+               "ECERE_NOSSL"
+            ],
+            "TargetType" : "StaticLibrary",
+            "TargetFileName" : "ecereStatic",
+            "CompilerOptions" : [
+               "-mmmx",
+               "-msse4"
+            ],
+            "FastMath" : true
+         }
       }
    ],
    "Files" : [
@@ -686,6 +712,12 @@ from wherever you obtained them.
                                        }
                                     }
                                  ]
+                              },
+                              {
+                                 "Name" : "StaticGLES",
+                                 "Options" : {
+                                    "ExcludeFromBuild" : true
+                                 }
                               }
                            ]
                         },
@@ -1299,6 +1331,11 @@ from wherever you obtained them.
                         },
                         {
                            "FileName" : "CocoaOpenGLDisplayDriver.ec",
+                           "Options" : {
+                              "IncludeDirs" : [
+                                 "src/gui/drivers/cocoa"
+                              ]
+                           },
                            "Platforms" : [
                               {
                                  "Name" : "apple",