deps: Project tweaks to use default obj dir; ecere/dataTypes: Not using android_log_p...

[sdk] / ecere / ecere.epj

diff --git a/ecere/ecere.epj b/ecere/ecere.epj
index 95b1b25..7de582c 100644 (file)
--- a/ecere/ecere.epj
+++ b/ecere/ecere.epj
@@ -3,6 +3,9 @@
    "ModuleName" : "ecere",
    "Options" : {
       "Warnings" : "All",
+      "PreprocessorDefinitions" : [
+         "BUILDING_ECERE_COM"
+      ],
       "IncludeDirs" : [
          "src/gfx/drivers/harfbuzz",
          "/usr/X11R6/include",
@@ -11,8 +14,7 @@
       "DefaultNameSpace" : "ecere",
       "TargetType" : "SharedLibrary",
       "TargetFileName" : "ecere",
-      "TargetDirectory" : "obj/$(CONFIG).$(PLATFORM)",
-      "ObjectsDirectory" : "obj/$(CONFIG).$(PLATFORM)",
+      "TargetDirectory" : "",
       "Libraries" : [
          "jpeg",
          "png",
@@ -291,6 +293,61 @@
                }
             }
          ]
+      },
+      {
+         "Name" : "Installer",
+         "Options" : {
+            "NoLineNumbers" : true,
+            "Optimization" : "Size",
+            "PreprocessorDefinitions" : [
+               "BUILDING_ECERE_COM",
+               "ECERE_STATIC",
+               "ECERE_NO3D",
+               "ECERE_ONEDRIVER",
+               "ECERE_NONET",
+               "ECERE_NODINPUT"
+            ],
+            "TargetType" : "StaticLibrary",
+            "TargetFileName" : "ecereInstaller"
+         }
+      },
+      {
+         "Name" : "Android",
+         "Options" : {
+            "PreprocessorDefinitions" : [
+               "ECERE_NOFONTCONFIG"
+            ],
+            "IncludeDirs" : [
+               "../deps/jpeg-6b",
+               "../deps/libpng-1.4.0",
+               "../deps/libungif-4.1.1/lib",
+               "../deps/zlib",
+               "../deps/freetype-2.3.12/include",
+               "../deps/glext"
+            ]
+         },
+         "Platforms" : [
+            {
+               "Name" : "linux",
+               "Options" : {
+                  "Libraries" : [
+                     "m",
+                     "dl",
+                     "ungif",
+                     "log",
+                     "android",
+                     "EGL",
+                     "GLESv1_CM"
+                  ],
+                  "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/freetype-2.3.12/obj/release.$(PLATFORM).$(COMPILER)"
+                  ]
+               }
+            }
+         ]
       }
    ],
    "Files" : [
@@ -521,6 +578,17 @@
                            "Options" : {
                               "ExcludeFromBuild" : true
                            }
+                        },
+                        {
+                           "Name" : "Installer",
+                           "Platforms" : [
+                              {
+                                 "Name" : "win32",
+                                 "Options" : {
+                                    "ExcludeFromBuild" : true
+                                 }
+                              }
+                           ]
                         }
                      ]
                   },
@@ -552,6 +620,17 @@
                                  "Options" : {
                                     "ExcludeFromBuild" : true
                                  }
+                              },
+                              {
+                                 "Name" : "Installer",
+                                 "Platforms" : [
+                                    {
+                                       "Name" : "win32",
+                                       "Options" : {
+                                          "ExcludeFromBuild" : true
+                                       }
+                                    }
+                                 ]
                               }
                            ]
                         },
@@ -563,6 +642,17 @@
                                  "Options" : {
                                     "ExcludeFromBuild" : true
                                  }
+                              },
+                              {
+                                 "Name" : "Installer",
+                                 "Platforms" : [
+                                    {
+                                       "Name" : "win32",
+                                       "Options" : {
+                                          "ExcludeFromBuild" : true
+                                       }
+                                    }
+                                 ]
                               }
                            ]
                         },
@@ -592,6 +682,17 @@
                                  "Options" : {
                                     "ExcludeFromBuild" : true
                                  }
+                              },
+                              {
+                                 "Name" : "Installer",
+                                 "Platforms" : [
+                                    {
+                                       "Name" : "win32",
+                                       "Options" : {
+                                          "ExcludeFromBuild" : true
+                                       }
+                                    }
+                                 ]
                               }
                            ]
                         }
@@ -698,6 +799,12 @@
                                        }
                                     }
                                  ]
+                              },
+                              {
+                                 "Name" : "Installer",
+                                 "Options" : {
+                                    "ExcludeFromBuild" : true
+                                 }
                               }
                            ]
                         },
@@ -755,6 +862,17 @@
                                        }
                                     }
                                  ]
+                              },
+                              {
+                                 "Name" : "Installer",
+                                 "Platforms" : [
+                                    {
+                                       "Name" : "win32",
+                                       "Options" : {
+                                          "ExcludeFromBuild" : true
+                                       }
+                                    }
+                                 ]
                               }
                            ]
                         },
@@ -812,6 +930,17 @@
                                        }
                                     }
                                  ]
+                              },
+                              {
+                                 "Name" : "Installer",
+                                 "Platforms" : [
+                                    {
+                                       "Name" : "win32",
+                                       "Options" : {
+                                          "ExcludeFromBuild" : true
+                                       }
+                                    }
+                                 ]
                               }
                            ]
                         },
@@ -869,6 +998,17 @@
                                        }
                                     }
                                  ]
+                              },
+                              {
+                                 "Name" : "Installer",
+                                 "Platforms" : [
+                                    {
+                                       "Name" : "win32",
+                                       "Options" : {
+                                          "ExcludeFromBuild" : true
+                                       }
+                                    }
+                                 ]
                               }
                            ]
                         },
@@ -1022,6 +1162,12 @@
                                  "Options" : {
                                     "ExcludeFromBuild" : true
                                  }
+                              },
+                              {
+                                 "Name" : "Installer",
+                                 "Options" : {
+                                    "ExcludeFromBuild" : true
+                                 }
                               }
                            ]
                         },
@@ -1079,6 +1225,17 @@
                                        }
                                     }
                                  ]
+                              },
+                              {
+                                 "Name" : "Installer",
+                                 "Platforms" : [
+                                    {
+                                       "Name" : "win32",
+                                       "Options" : {
+                                          "ExcludeFromBuild" : true
+                                       }
+                                    }
+                                 ]
                               }
                            ]
                         },
@@ -1155,6 +1312,17 @@
                                        }
                                     }
                                  ]
+                              },
+                              {
+                                 "Name" : "Installer",
+                                 "Platforms" : [
+                                    {
+                                       "Name" : "win32",
+                                       "Options" : {
+                                          "ExcludeFromBuild" : true
+                                       }
+                                    }
+                                 ]
                               }
                            ]
                         },
@@ -1201,6 +1369,17 @@
                                        }
                                     }
                                  ]
+                              },
+                              {
+                                 "Name" : "Installer",
+                                 "Platforms" : [
+                                    {
+                                       "Name" : "win32",
+                                       "Options" : {
+                                          "ExcludeFromBuild" : true
+                                       }
+                                    }
+                                 ]
                               }
                            ]
                         },
@@ -1454,6 +1633,17 @@
                                        }
                                     }
                                  ]
+                              },
+                              {
+                                 "Name" : "Installer",
+                                 "Platforms" : [
+                                    {
+                                       "Name" : "win32",
+                                       "Options" : {
+                                          "ExcludeFromBuild" : true
+                                       }
+                                    }
+                                 ]
                               }
                            ]
                         },
@@ -1523,6 +1713,17 @@
                                  "Options" : {
                                     "ExcludeFromBuild" : true
                                  }
+                              },
+                              {
+                                 "Name" : "Installer",
+                                 "Platforms" : [
+                                    {
+                                       "Name" : "win32",
+                                       "Options" : {
+                                          "ExcludeFromBuild" : true
+                                       }
+                                    }
+                                 ]
                               }
                            ]
                         },
@@ -1552,6 +1753,17 @@
                            "Options" : {
                               "ExcludeFromBuild" : true
                            }
+                        },
+                        {
+                           "Name" : "Installer",
+                           "Platforms" : [
+                              {
+                                 "Name" : "win32",
+                                 "Options" : {
+                                    "ExcludeFromBuild" : true
+                                 }
+                              }
+                           ]
                         }
                      ]
                   },
@@ -1625,6 +1837,17 @@
                      "Options" : {
                         "ExcludeFromBuild" : true
                      }
+                  },
+                  {
+                     "Name" : "Installer",
+                     "Platforms" : [
+                        {
+                           "Name" : "win32",
+                           "Options" : {
+                              "ExcludeFromBuild" : true
+                           }
+                        }
+                     ]
                   }
                ]
             },
@@ -1724,7 +1947,10 @@
             "listAdd.png",
             "listRemove.png",
             "viewRefresh.png",
-            "windowNew.png"
+            "windowNew.png",
+            "clean.png",
+            "docSave.png",
+            "docNew.png"
          ]
       },
       {