deps: zlib-1.2.3 -> 1.2.8; libpng-1.4.0 -> 1.6.12

[sdk] / ecere / ecere.epj

diff --git a/ecere/ecere.epj b/ecere/ecere.epj
index a72a413..54efbda 100644 (file)
--- a/ecere/ecere.epj
+++ b/ecere/ecere.epj
@@ -124,7 +124,8 @@ from wherever you obtained them.
                "../deps/libungif-4.1.1/lib",
                "../deps/zlib",
                "../deps/freetype-2.3.12/include",
-               "../deps/glext"
+               "../deps/glext",
+               "$(OPENSSL_INCLUDE_DIR)"
             ],
             "Libraries" : [
                "dxguid",
@@ -146,11 +147,13 @@ from wherever you obtained them.
                "ssleay32"
             ],
             "LibraryDirs" : [
-               "../deps/zlib/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)",
+               "../deps/zlib-1.2.8/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)",
                "../deps/jpeg-6b/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)",
-               "../deps/libpng-1.4.0/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)"
             ]
          }
       },
@@ -185,7 +188,7 @@ from wherever you obtained them.
                "$(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/libpng-1.6.8/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)",
                "../deps/libungif-4.1.1/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)"
             ]
          }
@@ -197,10 +200,8 @@ from wherever you obtained them.
          "Options" : {
             "Debug" : true,
             "PreprocessorDefinitions" : [
-               "_DEBUG",
-               "BUILDING_ECERE_COM"
-            ],
-            "FastMath" : false
+               "_DEBUG"
+            ]
          }
       },
       {
@@ -208,20 +209,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 +248,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 +266,6 @@ from wherever you obtained them.
       {
          "Name" : "Static",
          "Options" : {
-            "Debug" : false,
             "Optimization" : "Size",
             "PreprocessorDefinitions" : [
                "BUILDING_ECERE_COM",
@@ -286,20 +279,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 +305,7 @@ from wherever you obtained them.
                "ECERE_NOSSL"
             ],
             "TargetType" : "StaticLibrary",
-            "TargetFileName" : "ecerePACS",
-            "FastMath" : false
+            "TargetFileName" : "ecerePACS"
          }
       },
       {
@@ -335,15 +324,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 +341,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 +359,7 @@ from wherever you obtained them.
                "ECERE_NOSSL"
             ],
             "TargetType" : "StaticLibrary",
-            "TargetFileName" : "ecereWSMS",
-            "FastMath" : false
+            "TargetFileName" : "ecereWSMS"
          },
          "Platforms" : [
             {
@@ -403,8 +388,7 @@ from wherever you obtained them.
                "ECERE_NODINPUT"
             ],
             "TargetType" : "StaticLibrary",
-            "TargetFileName" : "ecereInstaller",
-            "FastMath" : false
+            "TargetFileName" : "ecereInstaller"
          }
       },
       {
@@ -1501,6 +1485,12 @@ from wherever you obtained them.
                                        "Options" : {
                                           "ExcludeFromBuild" : true
                                        }
+                                    },
+                                    {
+                                       "Name" : "apple",
+                                       "Options" : {
+                                          "ExcludeFromBuild" : true
+                                       }
                                     }
                                  ]
                               },
@@ -2011,6 +2001,12 @@ from wherever you obtained them.
                            "Options" : {
                               "ExcludeFromBuild" : true
                            }
+                        },
+                        {
+                           "Name" : "Installer",
+                           "Options" : {
+                              "ExcludeFromBuild" : true
+                           }
                         }
                      ]
                   }
@@ -2382,83 +2378,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" : [
             {