ecere/gfx/Surface; drivers: Font outline support

[sdk] / ecere / ecere.epj

diff --git a/ecere/ecere.epj b/ecere/ecere.epj
index cf9460c..282dde6 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/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",
                "$(OPENSSL_INCLUDE_DIR)"
@@ -147,9 +146,9 @@ 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)",
                "$(OPENSSL_BIN_DIR)",
@@ -166,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"
             ],
@@ -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.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)"
             ]
          }
@@ -401,7 +399,7 @@ from wherever you obtained them.
                "ECERE_NOSSL"
             ],
             "IncludeDirs" : [
-               "../deps/jpeg-6b",
+               "../deps/jpeg-9a",
                "../deps/libpng-1.4.0",
                "../deps/libungif-4.1.1/lib",
                "../deps/zlib",
@@ -426,7 +424,7 @@ 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/jpeg-9a/obj/release.$(PLATFORM).$(COMPILER)",
                      "../deps/freetype-2.3.12/obj/release.$(PLATFORM).$(COMPILER)"
                   ]
                }
@@ -1299,6 +1297,11 @@ from wherever you obtained them.
                         },
                         {
                            "FileName" : "CocoaOpenGLDisplayDriver.ec",
+                           "Options" : {
+                              "IncludeDirs" : [
+                                 "src/gui/drivers/cocoa"
+                              ]
+                           },
                            "Platforms" : [
                               {
                                  "Name" : "apple",
@@ -1506,6 +1509,26 @@ from wherever you obtained them.
                                  ]
                               }
                            ]
+                        },
+                        {
+                           "FileName" : "edtaa3func.ec",
+                           "Options" : {
+                              "ExcludeFromBuild" : false
+                           },
+                           "Configurations" : [
+                              {
+                                 "Name" : "Vanilla",
+                                 "Options" : {
+                                    "ExcludeFromBuild" : true
+                                 }
+                              },
+                              {
+                                 "Name" : "Bootstrap",
+                                 "Options" : {
+                                    "ExcludeFromBuild" : true
+                                 }
+                              }
+                           ]
                         }
                      ],
                      "Options" : {