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

diff --git a/deps/freetype-2.3.12/freetype.epj b/deps/freetype-2.3.12/freetype.epj
index 150e57f..b8bfc48 100644 (file)
--- a/deps/freetype-2.3.12/freetype.epj
+++ b/deps/freetype-2.3.12/freetype.epj
@@ -30,8 +30,7 @@
          "Name" : "Release",
          "Options" : {
             "Warnings" : "None",
-            "Optimization" : "None",
-            "TargetDirectory" : "obj"
+            "Optimization" : "None"
          }
       }
    ],
@@ -200,4 +199,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/deps/jpeg-6b/jpeg.epj b/deps/jpeg-6b/jpeg.epj
index 4fabb68..be87c01 100644 (file)
--- a/deps/jpeg-6b/jpeg.epj
+++ b/deps/jpeg-6b/jpeg.epj
@@ -1,12 +1,9 @@
 {
    "Version" : 0.2,
    "ModuleName" : "libjpeg",
-   "License" : "",
    "Options" : {
       "TargetType" : "StaticLibrary",
-      "TargetFileName" : "jpeg",
-      "TargetDirectory" : "obj/$(CONFIG).$(PLATFORM)",
-      "ObjectsDirectory" : "obj/$(CONFIG).$(PLATFORM)"
+      "TargetFileName" : "jpeg"
    },
    "Configurations" : [
       {
@@ -101,4 +98,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/deps/libpng-1.4.0/png.epj b/deps/libpng-1.4.0/png.epj
index 5639368..de8b43c 100644 (file)
--- a/deps/libpng-1.4.0/png.epj
+++ b/deps/libpng-1.4.0/png.epj
@@ -7,9 +7,7 @@
          "../zlib"
       ],
       "TargetType" : "StaticLibrary",
-      "TargetFileName" : "png",
-      "TargetDirectory" : "obj/$(CONFIG).$(PLATFORM)",
-      "ObjectsDirectory" : "obj/$(CONFIG).$(PLATFORM)"
+      "TargetFileName" : "png"
    },
    "Configurations" : [
       {
@@ -64,4 +62,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/deps/libungif-4.1.1/libungif.epj b/deps/libungif-4.1.1/libungif.epj
index c98890c..71108ab 100644 (file)
--- a/deps/libungif-4.1.1/libungif.epj
+++ b/deps/libungif-4.1.1/libungif.epj
@@ -5,9 +5,7 @@
       "Debug" : false,
       "Optimization" : "None",
       "TargetType" : "StaticLibrary",
-      "TargetFileName" : "ungif",
-      "TargetDirectory" : "obj/$(CONFIG).$(PLATFORM)",
-      "ObjectsDirectory" : "obj/$(CONFIG).$(PLATFORM)"
+      "TargetFileName" : "ungif"
    },
    "Configurations" : [
       {
@@ -47,4 +45,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/deps/zlib/zlib.epj b/deps/zlib/zlib.epj
index f64bda3..d92b473 100644 (file)
--- a/deps/zlib/zlib.epj
+++ b/deps/zlib/zlib.epj
@@ -5,9 +5,7 @@
       "Debug" : false,
       "Optimization" : "None",
       "TargetType" : "StaticLibrary",
-      "TargetFileName" : "z",
-      "TargetDirectory" : "obj/$(CONFIG).$(PLATFORM)",
-      "ObjectsDirectory" : "obj/$(CONFIG).$(PLATFORM)"
+      "TargetFileName" : "z"
    },
    "Configurations" : [
       {
@@ -59,4 +57,4 @@
    "Resources" : [
 
    ]
-}
\ No newline at end of file
+}

diff --git a/ecere/ecere.epj b/ecere/ecere.epj
index 7966a5f..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",
@@ -308,6 +310,44 @@
             "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" : [

diff --git a/ecere/locale/ecere.pot b/ecere/locale/ecere.pot
index 3e8b764..cd7e69e 100644 (file)
--- a/ecere/locale/ecere.pot
+++ b/ecere/locale/ecere.pot
@@ -189,7 +189,7 @@ msgstr "Control contains other controls. Delete control and children?"
 msgid "Copy\tCtrl+C"
 msgstr "Copy\tCtrl+C"
 
-#: ./src/sys/System.ec:111
+#: ./src/sys/System.ec:113
 msgid "Couldn't write to file"
 msgstr "Couldn't write to file"
 
@@ -286,11 +286,11 @@ msgstr "Document"
 msgid "Down"
 msgstr "Down"
 
-#: ./src/gui/GuiApplication.ec:96
+#: ./src/gui/GuiApplication.ec:99
 msgid "Driver/Mode switch failed"
 msgstr "Driver/Mode switch failed"
 
-#: ./src/gui/GuiApplication.ec:192
+#: ./src/gui/GuiApplication.ec:195
 msgid "ECERE Application"
 msgstr "ECERE Application"
 
@@ -302,7 +302,7 @@ msgstr "Edit"
 msgid "Entire Computer"
 msgstr "Entire Computer"
 
-#: ./src/gui/GuiApplication.ec:1250
+#: ./src/gui/GuiApplication.ec:1260
 msgid "Error falling back to previous video mode.\n"
 msgstr "Error falling back to previous video mode.\n"
 
@@ -311,7 +311,7 @@ msgstr "Error falling back to previous video mode.\n"
 msgid "Error writing file"
 msgstr "Error writing file"
 
-#: ./src/sys/File.ec:309
+#: ./src/sys/File.ec:311
 msgid "Exp"
 msgstr "Exp"
 
@@ -337,7 +337,7 @@ msgstr "File Already Exists"
 msgid "File Name:"
 msgstr "File Name:"
 
-#: ./src/sys/System.ec:109
+#: ./src/sys/System.ec:111
 msgid "File not found"
 msgstr "File not found"
 
@@ -394,11 +394,11 @@ msgstr "Go To Line..."
 msgid "Go To...\tCtrl+G"
 msgstr "Go To...\tCtrl+G"
 
-#: ./src/gui/GuiApplication.ec:92
+#: ./src/gui/GuiApplication.ec:95
 msgid "Graphics driver not supported by any user interface system"
 msgstr "Graphics driver not supported by any user interface system"
 
-#: ./src/sys/System.ec:107
+#: ./src/sys/System.ec:109
 msgid "Identic string identifier already exists"
 msgstr "Identic string identifier already exists"
 
@@ -410,11 +410,11 @@ msgstr "Image"
 msgid "Image Files (*.jpg, *.jpeg, *.bmp, *.pcx, *.png, *.gif)"
 msgstr "Image Files (*.jpg, *.jpeg, *.bmp, *.pcx, *.png, *.gif)"
 
-#: ./src/sys/File.ec:285
+#: ./src/sys/File.ec:287
 msgid "Imp"
 msgstr "Imp"
 
-#: ./src/sys/System.ec:106
+#: ./src/sys/System.ec:108
 msgid "Inexistant string identifier specified"
 msgstr "Inexistant string identifier specified"
 
@@ -499,7 +499,7 @@ msgctxt "ShortMonthNames"
 msgid "May"
 msgstr "May"
 
-#: ./src/sys/System.ec:105
+#: ./src/sys/System.ec:107
 msgid "Memory allocation failed"
 msgstr "Memory allocation failed"
 
@@ -537,8 +537,8 @@ msgstr "New Directory"
 msgid "No"
 msgstr "No"
 
-#: ./src/sys/System.ec:104
-#: ./src/gui/GuiApplication.ec:91
+#: ./src/sys/System.ec:106
+#: ./src/gui/GuiApplication.ec:94
 msgid "No error"
 msgstr "No error"
 
@@ -692,7 +692,7 @@ msgstr "Select All\tCtrl+A"
 msgid "Select Color"
 msgstr "Select Color"
 
-#: ./src/sys/File.ec:203
+#: ./src/sys/File.ec:205
 msgid "Select File"
 msgstr "Select File"
 
@@ -733,7 +733,7 @@ msgstr "Sep"
 msgid "September"
 msgstr "September"
 
-#: ./src/sys/System.ec:108
+#: ./src/sys/System.ec:110
 msgid "Shared library loading failed"
 msgstr "Shared library loading failed"
 
@@ -851,11 +851,11 @@ msgstr "Whole word only"
 msgid "Window Style"
 msgstr "Window Style"
 
-#: ./src/gui/GuiApplication.ec:93
+#: ./src/gui/GuiApplication.ec:96
 msgid "Window creation failed"
 msgstr "Window creation failed"
 
-#: ./src/gui/GuiApplication.ec:94
+#: ./src/gui/GuiApplication.ec:97
 msgid "Window graphics loading failed"
 msgstr "Window graphics loading failed"
 
@@ -868,29 +868,29 @@ msgstr "Windows"
 msgid "Yes"
 msgstr "Yes"
 
-#: ./src/sys/System.ec:347
+#: ./src/sys/System.ec:349
 msgid "\n\nWould you like to view the error log?"
 msgstr "\n\nWould you like to view the error log?"
 
 #: ./src/sys/Date.ec:121
-#: ./src/sys/Time.ec:781
+#: ./src/sys/Time.ec:783
 msgid "now"
 msgstr "now"
 
 #: ./src/sys/Date.ec:120
-#: ./src/sys/Time.ec:780
+#: ./src/sys/Time.ec:782
 msgid "today"
 msgstr "today"
 
 #: ./src/sys/Date.ec:122
 #: ./src/sys/Date.ec:126
-#: ./src/sys/Time.ec:783
+#: ./src/sys/Time.ec:785
 msgid "tomorrow"
 msgstr "tomorrow"
 
 #: ./src/sys/Date.ec:123
 #: ./src/sys/Date.ec:131
-#: ./src/sys/Time.ec:790
+#: ./src/sys/Time.ec:792
 msgid "yesterday"
 msgstr "yesterday"
 

diff --git a/ecere/src/com/dataTypes.ec b/ecere/src/com/dataTypes.ec
index a3b336a..aff44d7 100644 (file)
--- a/ecere/src/com/dataTypes.ec
+++ b/ecere/src/com/dataTypes.ec
@@ -1914,7 +1914,7 @@ public void PrintLn(typed_object object, ...)
    va_start(args, object);
    PrintStdArgsToBuffer(buffer, sizeof(buffer), object, args);
    va_end(args);
-#if defined(__ANDROID__)
+#if defined(__ANDROID__) && !defined(ECERE_NOFILE)
    LOGI("%s", buffer);
 #else
    puts(buffer);