ecere/gfx/OpenGLDispalyDriver: Fixed setting initial projection matrix; Emscripten...

[sdk] / ecere / ecere.epj

diff --git a/ecere/ecere.epj b/ecere/ecere.epj
index 4f18b2c..19e0b31 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)"
             ]
          }
@@ -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,34 @@ 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"
+            ]
+         }
+      },
+      {
+         "Name" : "Emscripten",
+         "Options" : {
+            "Debug" : true,
+            "PreprocessorDefinitions" : [
+               "ECERE_STATIC",
+               "NOBLENDING"
+            ],
+            "TargetType" : "StaticLibrary",
+            "TargetFileName" : "ecereStatic"
+         }
       }
    ],
    "Files" : [
@@ -686,6 +707,12 @@ from wherever you obtained them.
                                        }
                                     }
                                  ]
+                              },
+                              {
+                                 "Name" : "Emscripten",
+                                 "Options" : {
+                                    "ExcludeFromBuild" : true
+                                 }
                               }
                            ]
                         },
@@ -708,6 +735,12 @@ from wherever you obtained them.
                                        }
                                     }
                                  ]
+                              },
+                              {
+                                 "Name" : "Emscripten",
+                                 "Options" : {
+                                    "ExcludeFromBuild" : true
+                                 }
                               }
                            ]
                         },
@@ -722,7 +755,17 @@ from wherever you obtained them.
                               }
                            ]
                         },
-                        "PNGFormat.ec",
+                        {
+                           "FileName" : "PNGFormat.ec",
+                           "Configurations" : [
+                              {
+                                 "Name" : "Emscripten",
+                                 "Options" : {
+                                    "ExcludeFromBuild" : true
+                                 }
+                              }
+                           ]
+                        },
                         {
                            "FileName" : "RGBFormat.ec",
                            "Configurations" : [
@@ -748,6 +791,12 @@ from wherever you obtained them.
                                        }
                                     }
                                  ]
+                              },
+                              {
+                                 "Name" : "Emscripten",
+                                 "Options" : {
+                                    "ExcludeFromBuild" : true
+                                 }
                               }
                            ]
                         }
@@ -1299,6 +1348,11 @@ from wherever you obtained them.
                         },
                         {
                            "FileName" : "CocoaOpenGLDisplayDriver.ec",
+                           "Options" : {
+                              "IncludeDirs" : [
+                                 "src/gui/drivers/cocoa"
+                              ]
+                           },
                            "Platforms" : [
                               {
                                  "Name" : "apple",
@@ -1485,6 +1539,12 @@ from wherever you obtained them.
                                        "Options" : {
                                           "ExcludeFromBuild" : true
                                        }
+                                    },
+                                    {
+                                       "Name" : "apple",
+                                       "Options" : {
+                                          "ExcludeFromBuild" : true
+                                       }
                                     }
                                  ]
                               },
@@ -1500,6 +1560,26 @@ from wherever you obtained them.
                                  ]
                               }
                            ]
+                        },
+                        {
+                           "FileName" : "edtaa3func.ec",
+                           "Options" : {
+                              "ExcludeFromBuild" : false
+                           },
+                           "Configurations" : [
+                              {
+                                 "Name" : "Vanilla",
+                                 "Options" : {
+                                    "ExcludeFromBuild" : true
+                                 }
+                              },
+                              {
+                                 "Name" : "Bootstrap",
+                                 "Options" : {
+                                    "ExcludeFromBuild" : true
+                                 }
+                              }
+                           ]
                         }
                      ],
                      "Options" : {
@@ -1833,6 +1913,17 @@ from wherever you obtained them.
                                  }
                               }
                            ]
+                        },
+                        {
+                           "FileName" : "EmscriptenInterface.ec",
+                           "Configurations" : [
+                              {
+                                 "Name" : "Emscripten",
+                                 "Options" : {
+                                    "ExcludeFromBuild" : false
+                                 }
+                              }
+                           ]
                         }
                      ],
                      "Options" : {
@@ -2028,6 +2119,12 @@ from wherever you obtained them.
                            }
                         }
                      ]
+                  },
+                  {
+                     "Name" : "Emscripten",
+                     "Options" : {
+                        "ExcludeFromBuild" : true
+                     }
                   }
                ]
             },