Added staticLink sample; Renamed disguised .bmp Vanilla resources to .png as they...

diff --git a/ear/extract/extract.epj b/ear/extract/extract.epj
index 4a74780..3496dad 100644 (file)
--- a/ear/extract/extract.epj
+++ b/ear/extract/extract.epj
@@ -180,11 +180,11 @@
                   "arrowLeft.png",
                   "arrowRight.png",
                   "arrowUp.png",
-                  "optionBoxDisabledSelected.bmp",
-                  "optionBoxDown.bmp",
-                  "optionBoxSelected.bmp",
-                  "optionBoxSelectedDown.bmp",
-                  "optionBoxUp.bmp"
+                  "optionBoxDisabledSelected.png",
+                  "optionBoxDown.png",
+                  "optionBoxSelected.png",
+                  "optionBoxSelectedDown.png",
+                  "optionBoxUp.png"
                ]
             },
             {

diff --git a/ecere/res/vanilla/ecere/elements/optionBoxDisabledSelected.bmp b/ecere/res/vanilla/ecere/elements/optionBoxDisabledSelected.png
similarity index 100%
rename from ecere/res/vanilla/ecere/elements/optionBoxDisabledSelected.bmp
rename to ecere/res/vanilla/ecere/elements/optionBoxDisabledSelected.png

diff --git a/ecere/res/vanilla/ecere/elements/optionBoxDown.bmp b/ecere/res/vanilla/ecere/elements/optionBoxDown.png
similarity index 100%
rename from ecere/res/vanilla/ecere/elements/optionBoxDown.bmp
rename to ecere/res/vanilla/ecere/elements/optionBoxDown.png

diff --git a/ecere/res/vanilla/ecere/elements/optionBoxSelected.bmp b/ecere/res/vanilla/ecere/elements/optionBoxSelected.png
similarity index 100%
rename from ecere/res/vanilla/ecere/elements/optionBoxSelected.bmp
rename to ecere/res/vanilla/ecere/elements/optionBoxSelected.png

diff --git a/ecere/res/vanilla/ecere/elements/optionBoxSelectedDown.bmp b/ecere/res/vanilla/ecere/elements/optionBoxSelectedDown.png
similarity index 100%
rename from ecere/res/vanilla/ecere/elements/optionBoxSelectedDown.bmp
rename to ecere/res/vanilla/ecere/elements/optionBoxSelectedDown.png

diff --git a/ecere/res/vanilla/ecere/elements/optionBoxUp.bmp b/ecere/res/vanilla/ecere/elements/optionBoxUp.png
similarity index 100%
rename from ecere/res/vanilla/ecere/elements/optionBoxUp.bmp
rename to ecere/res/vanilla/ecere/elements/optionBoxUp.png

diff --git a/samples/eC/staticLink/staticLink.ec b/samples/eC/staticLink/staticLink.ec
new file mode 100644 (file)
index 0000000..8091122
--- /dev/null
+++ b/samples/eC/staticLink/staticLink.ec
@@ -0,0 +1,30 @@
+#ifdef ECERE_STATIC
+import static "ecere"
+#else
+import "ecere"
+#endif
+
+class Form1 : Window
+{
+   text = "Form1";
+   background = activeBorder;
+   borderStyle = sizable;
+   hasMaximize = true;
+   hasMinimize = true;
+   hasClose = true;
+   size = { 640, 480 };
+   nativeDecorations = true;
+
+   Button button1
+   {
+      this, text = "button1", position = { 192, 72 };
+
+      bool NotifyClicked(Button button, int x, int y, Modifiers mods)
+      {
+
+         return true;
+      }
+   };
+}
+
+Form1 form1 { };

diff --git a/samples/eC/staticLink/staticLink.epj b/samples/eC/staticLink/staticLink.epj
new file mode 100644 (file)
index 0000000..ce3e9d6
--- /dev/null
+++ b/samples/eC/staticLink/staticLink.epj
@@ -0,0 +1,142 @@
+{
+   "Version" : 0.2,
+   "ModuleName" : "staticLink",
+   "Options" : {
+      "Warnings" : "All",
+      "TargetType" : "Executable",
+      "TargetFileName" : "staticLink",
+      "Libraries" : [
+         "ecere"
+      ]
+   },
+   "Configurations" : [
+      {
+         "Name" : "Debug",
+         "Options" : {
+            "Debug" : true,
+            "Optimization" : "None",
+            "PreprocessorDefinitions" : [
+               "_DEBUG"
+            ]
+         }
+      },
+      {
+         "Name" : "Release",
+         "Options" : {
+            "Debug" : false,
+            "MemoryGuard" : true,
+            "NoLineNumbers" : true,
+            "Optimization" : "Speed"
+         }
+      },
+      {
+         "Name" : "Static",
+         "Options" : {
+            "NoLineNumbers" : true,
+            "Optimization" : "Size",
+            "PreprocessorDefinitions" : [
+               "ECERE_STATIC"
+            ],
+            "ObjectsDirectory" : "",
+            "Libraries" : [
+               "ecereVanilla"
+            ]
+         },
+         "Platforms" : [
+            {
+               "Name" : "win32",
+               "Options" : {
+                  "Libraries" : [
+                     "kernel32",
+                     "user32",
+                     "gdi32",
+                     "winmm",
+                     "mpr",
+                     "imm32",
+                     "z"
+                  ]
+               }
+            }
+         ]
+      }
+   ],
+   "Files" : [
+      "staticLink.ec"
+   ],
+   "ResourcesPath" : "",
+   "Resources" : [
+      {
+         "Folder" : "ecere",
+         "Files" : [
+            {
+               "Folder" : "actions",
+               "Files" : [
+                  "/sdk/ecere/res/vanilla/ecere/actions/folderNew.png",
+                  "/sdk/ecere/res/vanilla/ecere/actions/goUp.png"
+               ]
+            },
+            {
+               "Folder" : "devices",
+               "Files" : [
+                  "/sdk/ecere/res/vanilla/ecere/devices/computer.png",
+                  "/sdk/ecere/res/vanilla/ecere/devices/driveHardDisk.png",
+                  "/sdk/ecere/res/vanilla/ecere/devices/driveRemovableMedia.png",
+                  "/sdk/ecere/res/vanilla/ecere/devices/mediaFloppy.png",
+                  "/sdk/ecere/res/vanilla/ecere/devices/mediaOptical.png"
+               ]
+            },
+            {
+               "Folder" : "elements",
+               "Files" : [
+                  "/sdk/ecere/res/vanilla/ecere/elements/areaClose.png",
+                  "/sdk/ecere/res/vanilla/ecere/elements/areaMaximize.png",
+                  "/sdk/ecere/res/vanilla/ecere/elements/areaMinimize.png",
+                  "/sdk/ecere/res/vanilla/ecere/elements/areaRestore.png",
+                  "/sdk/ecere/res/vanilla/ecere/elements/arrowDown.png",
+                  "/sdk/ecere/res/vanilla/ecere/elements/arrowLeft.png",
+                  "/sdk/ecere/res/vanilla/ecere/elements/arrowRight.png",
+                  "/sdk/ecere/res/vanilla/ecere/elements/arrowUp.png",
+                  "/sdk/ecere/res/vanilla/ecere/elements/optionBoxDisabledSelected.png",
+                  "/sdk/ecere/res/vanilla/ecere/elements/optionBoxDown.png",
+                  "/sdk/ecere/res/vanilla/ecere/elements/optionBoxSelected.png",
+                  "/sdk/ecere/res/vanilla/ecere/elements/optionBoxSelectedDown.png",
+                  "/sdk/ecere/res/vanilla/ecere/elements/optionBoxUp.png"
+               ]
+            },
+            {
+               "Folder" : "mimeTypes",
+               "Files" : [
+                  "/sdk/ecere/res/vanilla/ecere/mimeTypes/file.png"
+               ]
+            },
+            {
+               "Folder" : "places",
+               "Files" : [
+                  "/sdk/ecere/res/vanilla/ecere/places/driveRemote.png",
+                  "/sdk/ecere/res/vanilla/ecere/places/folder.png",
+                  "/sdk/ecere/res/vanilla/ecere/places/folderRemote.png",
+                  "/sdk/ecere/res/vanilla/ecere/places/networkServer.png",
+                  "/sdk/ecere/res/vanilla/ecere/places/networkWorkgroup.png"
+               ]
+            },
+            {
+               "Folder" : "status",
+               "Files" : [
+                  "/sdk/ecere/res/vanilla/ecere/status/folderOpen.png"
+               ]
+            }
+         ],
+         "Options" : {
+            "ExcludeFromBuild" : true
+         },
+         "Configurations" : [
+            {
+               "Name" : "Static",
+               "Options" : {
+                  "ExcludeFromBuild" : false
+               }
+            }
+         ]
+      }
+   ]
+}
\ No newline at end of file