tarball; updated makefiles for include dirs order and minor changes.
[sdk] / ecere / Makefile.vanilla
old mode 100644 (file)
new mode 100755 (executable)
index 59497e6..d8b3fa8
 .PHONY: all objdir clean realclean distclean
 
-# CONTENT
+# CORE VARIABLES
 
 MODULE := ecere
 CONFIG := vanilla
+ifndef COMPILER
 COMPILER := default
+endif
+
 TARGET_TYPE = staticlib
 
-OBJ = obj/$(CONFIG).$(PLATFORM)/
+# FLAGS
 
-RES = res/
+ECFLAGS =
+ifndef DEBIAN_PACKAGE
+CFLAGS =
+endif
+CECFLAGS =
+OFLAGS =
+LDFLAGS =
+LIBS =
 
-TARGET = obj/$(CONFIG).$(PLATFORM)/$(LP)ecereVanilla$(A)
+ifdef DEBUG
+NOSTRIP := y
+endif
 
-OBJECTS = $(OBJECTS1) $(OBJECTS2) $(OBJECTS3)
-OBJECTS1 = \
-       $(OBJ)Archive.o \
-       $(OBJ)BufferedFile.o \
-       $(OBJ)Date.o \
-       $(OBJ)DualPipe.o \
-       $(OBJ)EARArchive.o \
-       $(OBJ)File.o \
-       $(OBJ)FileMonitor.o \
-       $(OBJ)GlobalAppSettings.o \
-       $(OBJ)JSON.o \
-       $(OBJ)JSONGlobalSettings.o \
-       $(OBJ)memory.o \
-       $(OBJ)Mutex.o \
-       $(OBJ)Semaphore.o \
-       $(OBJ)System.o \
-       $(OBJ)TempFile.o \
-       $(OBJ)Thread.o \
-       $(OBJ)Time.o \
-       $(OBJ)unicode.o \
-       $(OBJ)units.o \
-       $(OBJ)File.c.o \
-       $(OBJ)DualPipe.c.o \
-       $(OBJ)System.c.o \
-       $(OBJ)i18n.o \
-       $(OBJ)BMPFormat.o \
-       $(if $(WINDOWS),,$(OBJ)harfbuzz-freetype.o) \
-       $(if $(WINDOWS),,$(OBJ)harfbuzz-unicode-tables.o) \
-       $(if $(WINDOWS),,$(OBJ)harfbuzz-unicode.o) \
-       $(if $(WINDOWS),,$(OBJ)harfbuzz-arabic.o) \
-       $(if $(WINDOWS),,$(OBJ)harfbuzz-buffer.o) \
-       $(if $(WINDOWS),,$(OBJ)harfbuzz-gdef.o) \
-       $(if $(WINDOWS),,$(OBJ)harfbuzz-gpos.o) \
-       $(if $(WINDOWS),,$(OBJ)harfbuzz-gsub.o) \
-       $(if $(WINDOWS),,$(OBJ)harfbuzz-hangul.o) \
-       $(if $(WINDOWS),,$(OBJ)harfbuzz-hebrew.o) \
-       $(if $(WINDOWS),,$(OBJ)harfbuzz-indic.o) \
-       $(if $(WINDOWS),,$(OBJ)harfbuzz-khmer.o) \
-       $(if $(WINDOWS),,$(OBJ)harfbuzz-myanmar.o) \
-       $(if $(WINDOWS),,$(OBJ)harfbuzz-open.o)
-OBJECTS2 = \
-       $(if $(WINDOWS),,$(OBJ)harfbuzz-shaper.o) \
-       $(if $(WINDOWS),,$(OBJ)harfbuzz-stream.o) \
-       $(if $(WINDOWS),,$(OBJ)harfbuzz-tibetan.o) \
-       $(if $(WINDOWS),,$(OBJ)harfbuzz-impl.o) \
-       $(if $(WINDOWS),,$(OBJ)harfbuzz-thai.o) \
-       $(if $(WINDOWS),$(OBJ)GDIDisplayDriver.o,) \
-       $(OBJ)lfbBlit.o \
-       $(OBJ)lfbConvert.o \
-       $(OBJ)LFBDisplayDriver.o \
-       $(if $(or $(LINUX),$(OSX)),$(OBJ)NCursesDisplayDriver.o,) \
-       $(if $(LINUX),$(OBJ)XDisplayDriver.o,) \
-       $(OBJ)Bitmap.o \
-       $(OBJ)BitmapResource.o \
-       $(OBJ)Color.o \
-       $(OBJ)Display.o \
-       $(OBJ)DisplaySystem.o \
-       $(OBJ)FontResource.o \
-       $(OBJ)Resource.o \
-       $(OBJ)Surface.o \
-       $(OBJ)Button.o \
-       $(OBJ)CalendarControl.o \
-       $(OBJ)DataBox.o \
-       $(OBJ)DropBox.o \
-       $(OBJ)EditBox.o \
-       $(OBJ)Label.o \
-       $(OBJ)ListBox.o \
-       $(OBJ)Menu.o \
-       $(OBJ)Picture.o \
-       $(OBJ)ProgressBar.o \
-       $(OBJ)ScrollBar.o \
-       $(OBJ)StatusBar.o \
-       $(OBJ)Stacker.o \
-       $(OBJ)PathBox.o \
-       $(OBJ)ToolTip.o \
-       $(OBJ)ColorPicker.o \
-       $(OBJ)FileDialog.o \
-       $(OBJ)FindDialog.o \
-       $(OBJ)GoToDialog.o \
-       $(OBJ)MessageBox.o \
-       $(OBJ)ReplaceDialog.o \
-       $(OBJ)WindowList.o
-OBJECTS3 = \
-       $(if $(or $(LINUX),$(OSX)),$(OBJ)NCursesInterface.o,) \
-       $(if $(WINDOWS),$(OBJ)Win32Interface.o,) \
-       $(if $(or $(LINUX),$(OSX)),$(OBJ)XInterface.o,) \
-       $(OBJ)WindowsSkin.o \
-       $(OBJ)Anchor.o \
-       $(OBJ)ClipBoard.o \
-       $(OBJ)Cursor.o \
-       $(OBJ)FormDesigner.o \
-       $(OBJ)GuiApplication.o \
-       $(OBJ)Interface.o \
-       $(OBJ)Key.o \
-       $(OBJ)Skin.o \
-       $(OBJ)Timer.o \
-       $(OBJ)typeEdit.o \
-       $(OBJ)Window.o \
-       $(OBJ)Array.o \
-       $(OBJ)AVLTree.o \
-       $(OBJ)BuiltInContainer.o \
-       $(OBJ)Container.o \
-       $(OBJ)CustomAVLTree.o \
-       $(OBJ)LinkList.o \
-       $(OBJ)List.o \
-       $(OBJ)Map.o \
-       $(OBJ)BinaryTree.o \
-       $(OBJ)BTNode.o \
-       $(OBJ)dataTypes.o \
-       $(OBJ)instance.o \
-       $(OBJ)String.o \
-       $(OBJ)OldList.o \
-       $(OBJ)instance.c.o \
-       $(OBJ)$(MODULE).main$(O)
+CONSOLE = -mwindows
 
-COBJECTS = $(COBJECTS1) $(COBJECTS2)
-COBJECTS1 = \
-       $(OBJ)Archive.c \
-       $(OBJ)BufferedFile.c \
-       $(OBJ)Date.c \
-       $(OBJ)DualPipe.c \
-       $(OBJ)EARArchive.c \
-       $(OBJ)File.c \
-       $(OBJ)FileMonitor.c \
-       $(OBJ)GlobalAppSettings.c \
-       $(OBJ)JSON.c \
-       $(OBJ)JSONGlobalSettings.c \
-       $(OBJ)memory.c \
-       $(OBJ)Mutex.c \
-       $(OBJ)Semaphore.c \
-       $(OBJ)System.c \
-       $(OBJ)TempFile.c \
-       $(OBJ)Thread.c \
-       $(OBJ)Time.c \
-       $(OBJ)unicode.c \
-       $(OBJ)units.c \
-       $(OBJ)i18n.c \
-       $(OBJ)BMPFormat.c \
-       $(if $(WINDOWS),$(OBJ)GDIDisplayDriver.c,) \
-       $(OBJ)lfbBlit.c \
-       $(OBJ)lfbConvert.c \
-       $(OBJ)LFBDisplayDriver.c \
-       $(if $(or $(LINUX),$(OSX)),$(OBJ)NCursesDisplayDriver.c,) \
-       $(if $(LINUX),$(OBJ)XDisplayDriver.c,) \
-       $(OBJ)Bitmap.c \
-       $(OBJ)BitmapResource.c \
-       $(OBJ)Color.c \
-       $(OBJ)Display.c \
-       $(OBJ)DisplaySystem.c \
-       $(OBJ)FontResource.c \
-       $(OBJ)Resource.c \
-       $(OBJ)Surface.c \
-       $(OBJ)Button.c \
-       $(OBJ)CalendarControl.c \
-       $(OBJ)DataBox.c \
-       $(OBJ)DropBox.c \
-       $(OBJ)EditBox.c \
-       $(OBJ)Label.c \
-       $(OBJ)ListBox.c \
-       $(OBJ)Menu.c \
-       $(OBJ)Picture.c \
-       $(OBJ)ProgressBar.c \
-       $(OBJ)ScrollBar.c \
-       $(OBJ)StatusBar.c
-COBJECTS2 = \
-       $(OBJ)Stacker.c \
-       $(OBJ)PathBox.c \
-       $(OBJ)ToolTip.c \
-       $(OBJ)ColorPicker.c \
-       $(OBJ)FileDialog.c \
-       $(OBJ)FindDialog.c \
-       $(OBJ)GoToDialog.c \
-       $(OBJ)MessageBox.c \
-       $(OBJ)ReplaceDialog.c \
-       $(OBJ)WindowList.c \
-       $(if $(or $(LINUX),$(OSX)),$(OBJ)NCursesInterface.c,) \
-       $(if $(WINDOWS),$(OBJ)Win32Interface.c,) \
-       $(if $(or $(LINUX),$(OSX)),$(OBJ)XInterface.c,) \
-       $(OBJ)WindowsSkin.c \
-       $(OBJ)Anchor.c \
-       $(OBJ)ClipBoard.c \
-       $(OBJ)Cursor.c \
-       $(OBJ)FormDesigner.c \
-       $(OBJ)GuiApplication.c \
-       $(OBJ)Interface.c \
-       $(OBJ)Key.c \
-       $(OBJ)Skin.c \
-       $(OBJ)Timer.c \
-       $(OBJ)typeEdit.c \
-       $(OBJ)Window.c \
-       $(OBJ)Array.c \
-       $(OBJ)AVLTree.c \
-       $(OBJ)BuiltInContainer.c \
-       $(OBJ)Container.c \
-       $(OBJ)CustomAVLTree.c \
-       $(OBJ)LinkList.c \
-       $(OBJ)List.c \
-       $(OBJ)Map.c \
-       $(OBJ)BinaryTree.c \
-       $(OBJ)BTNode.c \
-       $(OBJ)dataTypes.c \
-       $(OBJ)instance.c \
-       $(OBJ)String.c \
-       $(OBJ)OldList.c
+# INCLUDES
 
-SYMBOLS = $(SYMBOLS1) $(SYMBOLS2)
-SYMBOLS1 = \
-       $(OBJ)Archive.sym \
-       $(OBJ)BufferedFile.sym \
-       $(OBJ)Date.sym \
-       $(OBJ)DualPipe.sym \
-       $(OBJ)EARArchive.sym \
-       $(OBJ)File.sym \
-       $(OBJ)FileMonitor.sym \
-       $(OBJ)GlobalAppSettings.sym \
-       $(OBJ)JSON.sym \
-       $(OBJ)JSONGlobalSettings.sym \
-       $(OBJ)memory.sym \
-       $(OBJ)Mutex.sym \
-       $(OBJ)Semaphore.sym \
-       $(OBJ)System.sym \
-       $(OBJ)TempFile.sym \
-       $(OBJ)Thread.sym \
-       $(OBJ)Time.sym \
-       $(OBJ)unicode.sym \
-       $(OBJ)units.sym \
-       $(OBJ)i18n.sym \
-       $(OBJ)BMPFormat.sym \
-       $(if $(WINDOWS),$(OBJ)GDIDisplayDriver.sym,) \
-       $(OBJ)lfbBlit.sym \
-       $(OBJ)lfbConvert.sym \
-       $(OBJ)LFBDisplayDriver.sym \
-       $(if $(or $(LINUX),$(OSX)),$(OBJ)NCursesDisplayDriver.sym,) \
-       $(if $(LINUX),$(OBJ)XDisplayDriver.sym,) \
-       $(OBJ)Bitmap.sym \
-       $(OBJ)BitmapResource.sym \
-       $(OBJ)Color.sym \
-       $(OBJ)Display.sym \
-       $(OBJ)DisplaySystem.sym \
-       $(OBJ)FontResource.sym \
-       $(OBJ)Resource.sym \
-       $(OBJ)Surface.sym \
-       $(OBJ)Button.sym \
-       $(OBJ)CalendarControl.sym \
-       $(OBJ)DataBox.sym \
-       $(OBJ)DropBox.sym \
-       $(OBJ)EditBox.sym \
-       $(OBJ)Label.sym \
-       $(OBJ)ListBox.sym \
-       $(OBJ)Menu.sym \
-       $(OBJ)Picture.sym
-SYMBOLS2 = \
-       $(OBJ)ProgressBar.sym \
-       $(OBJ)ScrollBar.sym \
-       $(OBJ)StatusBar.sym \
-       $(OBJ)Stacker.sym \
-       $(OBJ)PathBox.sym \
-       $(OBJ)ToolTip.sym \
-       $(OBJ)ColorPicker.sym \
-       $(OBJ)FileDialog.sym \
-       $(OBJ)FindDialog.sym \
-       $(OBJ)GoToDialog.sym \
-       $(OBJ)MessageBox.sym \
-       $(OBJ)ReplaceDialog.sym \
-       $(OBJ)WindowList.sym \
-       $(if $(or $(LINUX),$(OSX)),$(OBJ)NCursesInterface.sym,) \
-       $(if $(WINDOWS),$(OBJ)Win32Interface.sym,) \
-       $(if $(or $(LINUX),$(OSX)),$(OBJ)XInterface.sym,) \
-       $(OBJ)WindowsSkin.sym \
-       $(OBJ)Anchor.sym \
-       $(OBJ)ClipBoard.sym \
-       $(OBJ)Cursor.sym \
-       $(OBJ)FormDesigner.sym \
-       $(OBJ)GuiApplication.sym \
-       $(OBJ)Interface.sym \
-       $(OBJ)Key.sym \
-       $(OBJ)Skin.sym \
-       $(OBJ)Timer.sym \
-       $(OBJ)typeEdit.sym \
-       $(OBJ)Window.sym \
-       $(OBJ)Array.sym \
-       $(OBJ)AVLTree.sym \
-       $(OBJ)BuiltInContainer.sym \
-       $(OBJ)Container.sym \
-       $(OBJ)CustomAVLTree.sym \
-       $(OBJ)LinkList.sym \
-       $(OBJ)List.sym \
-       $(OBJ)Map.sym \
-       $(OBJ)BinaryTree.sym \
-       $(OBJ)BTNode.sym \
-       $(OBJ)dataTypes.sym \
-       $(OBJ)instance.sym \
-       $(OBJ)String.sym \
-       $(OBJ)OldList.sym
+_CF_DIR = ../
 
-IMPORTS = $(IMPORTS1) $(IMPORTS2)
-IMPORTS1 = \
-       $(OBJ)Archive.imp \
-       $(OBJ)BufferedFile.imp \
-       $(OBJ)Date.imp \
-       $(OBJ)DualPipe.imp \
-       $(OBJ)EARArchive.imp \
-       $(OBJ)File.imp \
-       $(OBJ)FileMonitor.imp \
-       $(OBJ)GlobalAppSettings.imp \
-       $(OBJ)JSON.imp \
-       $(OBJ)JSONGlobalSettings.imp \
-       $(OBJ)memory.imp \
-       $(OBJ)Mutex.imp \
-       $(OBJ)Semaphore.imp \
-       $(OBJ)System.imp \
-       $(OBJ)TempFile.imp \
-       $(OBJ)Thread.imp \
-       $(OBJ)Time.imp \
-       $(OBJ)unicode.imp \
-       $(OBJ)units.imp \
-       $(OBJ)i18n.imp \
-       $(OBJ)BMPFormat.imp \
-       $(if $(WINDOWS),$(OBJ)GDIDisplayDriver.imp,) \
-       $(OBJ)lfbBlit.imp \
-       $(OBJ)lfbConvert.imp \
-       $(OBJ)LFBDisplayDriver.imp \
-       $(if $(or $(LINUX),$(OSX)),$(OBJ)NCursesDisplayDriver.imp,) \
-       $(if $(LINUX),$(OBJ)XDisplayDriver.imp,) \
-       $(OBJ)Bitmap.imp \
-       $(OBJ)BitmapResource.imp \
-       $(OBJ)Color.imp \
-       $(OBJ)Display.imp \
-       $(OBJ)DisplaySystem.imp \
-       $(OBJ)FontResource.imp \
-       $(OBJ)Resource.imp \
-       $(OBJ)Surface.imp \
-       $(OBJ)Button.imp \
-       $(OBJ)CalendarControl.imp \
-       $(OBJ)DataBox.imp \
-       $(OBJ)DropBox.imp \
-       $(OBJ)EditBox.imp \
-       $(OBJ)Label.imp \
-       $(OBJ)ListBox.imp \
-       $(OBJ)Menu.imp \
-       $(OBJ)Picture.imp
-IMPORTS2 = \
-       $(OBJ)ProgressBar.imp \
-       $(OBJ)ScrollBar.imp \
-       $(OBJ)StatusBar.imp \
-       $(OBJ)Stacker.imp \
-       $(OBJ)PathBox.imp \
-       $(OBJ)ToolTip.imp \
-       $(OBJ)ColorPicker.imp \
-       $(OBJ)FileDialog.imp \
-       $(OBJ)FindDialog.imp \
-       $(OBJ)GoToDialog.imp \
-       $(OBJ)MessageBox.imp \
-       $(OBJ)ReplaceDialog.imp \
-       $(OBJ)WindowList.imp \
-       $(if $(or $(LINUX),$(OSX)),$(OBJ)NCursesInterface.imp,) \
-       $(if $(WINDOWS),$(OBJ)Win32Interface.imp,) \
-       $(if $(or $(LINUX),$(OSX)),$(OBJ)XInterface.imp,) \
-       $(OBJ)WindowsSkin.imp \
-       $(OBJ)Anchor.imp \
-       $(OBJ)ClipBoard.imp \
-       $(OBJ)Cursor.imp \
-       $(OBJ)FormDesigner.imp \
-       $(OBJ)GuiApplication.imp \
-       $(OBJ)Interface.imp \
-       $(OBJ)Key.imp \
-       $(OBJ)Skin.imp \
-       $(OBJ)Timer.imp \
-       $(OBJ)typeEdit.imp \
-       $(OBJ)Window.imp \
-       $(OBJ)Array.imp \
-       $(OBJ)AVLTree.imp \
-       $(OBJ)BuiltInContainer.imp \
-       $(OBJ)Container.imp \
-       $(OBJ)CustomAVLTree.imp \
-       $(OBJ)LinkList.imp \
-       $(OBJ)List.imp \
-       $(OBJ)Map.imp \
-       $(OBJ)BinaryTree.imp \
-       $(OBJ)BTNode.imp \
-       $(OBJ)dataTypes.imp \
-       $(OBJ)instance.imp \
-       $(OBJ)String.imp \
-       $(OBJ)OldList.imp
-
-SOURCES = $(SOURCES1) $(SOURCES2) $(SOURCES3)
-SOURCES1 = \
+include $(_CF_DIR)crossplatform.mk
+include $(_CF_DIR)include.mk
+
+# CUSTOM TOOLCHAIN / COMPILER CONFIG
+
+ECP := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecp$(E))
+ECC := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecc$(E))
+ECS := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecs$(E))
+EAR := $(call psep,../obj/$(PLATFORM)/bin/ear)
+
+# END OF CUSTOM TOOLCHAIN / COMPILER CONFIG
+
+# POST-INCLUDES VARIABLES
+
+OBJ = obj/$(CONFIG).$(PLATFORM)/
+
+RES = res/
+
+TARGET = obj/$(CONFIG).$(PLATFORM)/$(LP)ecereVanilla$(A)
+
+_ECSOURCES = $(_ECSOURCES1) $(_ECSOURCES2)
+_ECSOURCES1 = \
        src/sys/Archive.ec \
        src/sys/BufferedFile.ec \
        src/sys/Date.ec \
@@ -419,37 +72,16 @@ SOURCES1 = \
        src/sys/Time.ec \
        src/sys/unicode.ec \
        src/sys/units.ec \
-       src/sys/File.c \
-       src/sys/DualPipe.c \
-       src/sys/System.c \
        src/sys/i18n.ec \
+       src/sys/Condition.ec \
        src/gfx/bitmaps/BMPFormat.ec \
-       $(if $(WINDOWS),,src/gfx/drivers/harfbuzz/unicode/harfbuzz-freetype.c) \
-       $(if $(WINDOWS),,src/gfx/drivers/harfbuzz/unicode/harfbuzz-unicode-tables.c) \
-       $(if $(WINDOWS),,src/gfx/drivers/harfbuzz/unicode/harfbuzz-unicode.c) \
-       $(if $(WINDOWS),,src/gfx/drivers/harfbuzz/harfbuzz-arabic.c) \
-       $(if $(WINDOWS),,src/gfx/drivers/harfbuzz/harfbuzz-buffer.c) \
-       $(if $(WINDOWS),,src/gfx/drivers/harfbuzz/harfbuzz-gdef.c) \
-       $(if $(WINDOWS),,src/gfx/drivers/harfbuzz/harfbuzz-gpos.c) \
-       $(if $(WINDOWS),,src/gfx/drivers/harfbuzz/harfbuzz-gsub.c) \
-       $(if $(WINDOWS),,src/gfx/drivers/harfbuzz/harfbuzz-hangul.c) \
-       $(if $(WINDOWS),,src/gfx/drivers/harfbuzz/harfbuzz-hebrew.c) \
-       $(if $(WINDOWS),,src/gfx/drivers/harfbuzz/harfbuzz-indic.c) \
-       $(if $(WINDOWS),,src/gfx/drivers/harfbuzz/harfbuzz-khmer.c) \
-       $(if $(WINDOWS),,src/gfx/drivers/harfbuzz/harfbuzz-myanmar.c) \
-       $(if $(WINDOWS),,src/gfx/drivers/harfbuzz/harfbuzz-open.c) \
-       $(if $(WINDOWS),,src/gfx/drivers/harfbuzz/harfbuzz-shaper.c)
-SOURCES2 = \
-       $(if $(WINDOWS),,src/gfx/drivers/harfbuzz/harfbuzz-stream.c) \
-       $(if $(WINDOWS),,src/gfx/drivers/harfbuzz/harfbuzz-tibetan.c) \
-       $(if $(WINDOWS),,src/gfx/drivers/harfbuzz/harfbuzz-impl.c) \
-       $(if $(WINDOWS),,src/gfx/drivers/harfbuzz/harfbuzz-thai.c) \
-       $(if $(WINDOWS),src/gfx/drivers/GDIDisplayDriver.ec,) \
+       $(if $(WINDOWS_TARGET),src/gfx/drivers/GDIDisplayDriver.ec,) \
        src/gfx/drivers/lfbBlit.ec \
        src/gfx/drivers/lfbConvert.ec \
        src/gfx/drivers/LFBDisplayDriver.ec \
-       $(if $(or $(LINUX),$(OSX)),src/gfx/drivers/NCursesDisplayDriver.ec,) \
-       $(if $(LINUX),src/gfx/drivers/XDisplayDriver.ec,) \
+       $(if $(or $(LINUX_TARGET),$(OSX_TARGET)),src/gfx/drivers/NCursesDisplayDriver.ec,) \
+       $(if $(OSX_TARGET),src/gfx/drivers/CocoaOpenGLDisplayDriver.ec,) \
+       $(if $(LINUX_TARGET),src/gfx/drivers/XDisplayDriver.ec,) \
        src/gfx/Bitmap.ec \
        src/gfx/BitmapResource.ec \
        src/gfx/Color.ec \
@@ -472,7 +104,9 @@ SOURCES2 = \
        src/gui/controls/StatusBar.ec \
        src/gui/controls/Stacker.ec \
        src/gui/controls/PathBox.ec \
-       src/gui/controls/ToolTip.ec \
+       src/gui/controls/ToolTip.ec
+_ECSOURCES2 = \
+       src/gui/controls/SelectorBar.ec \
        src/gui/dialogs/ColorPicker.ec \
        src/gui/dialogs/FileDialog.ec \
        src/gui/dialogs/FindDialog.ec \
@@ -480,10 +114,11 @@ SOURCES2 = \
        src/gui/dialogs/MessageBox.ec \
        src/gui/dialogs/ReplaceDialog.ec \
        src/gui/dialogs/WindowList.ec \
-       $(if $(or $(LINUX),$(OSX)),src/gui/drivers/NCursesInterface.ec,)
-SOURCES3 = \
-       $(if $(WINDOWS),src/gui/drivers/Win32Interface.ec,) \
-       $(if $(or $(LINUX),$(OSX)),src/gui/drivers/XInterface.ec,) \
+       $(if $(OSX_TARGET),src/gui/drivers/cocoa/CocoaDispatch.ec,) \
+       $(if $(OSX_TARGET),src/gui/drivers/cocoa/CocoaInterface.ec,) \
+       $(if $(or $(LINUX_TARGET),$(OSX_TARGET)),src/gui/drivers/NCursesInterface.ec,) \
+       $(if $(WINDOWS_TARGET),src/gui/drivers/Win32Interface.ec,) \
+       $(if $(or $(LINUX_TARGET),$(OSX_TARGET)),src/gui/drivers/XInterface.ec,) \
        src/gui/skins/WindowsSkin.ec \
        src/gui/Anchor.ec \
        src/gui/ClipBoard.ec \
@@ -509,7 +144,90 @@ SOURCES3 = \
        src/com/dataTypes.ec \
        src/com/instance.ec \
        src/com/String.ec \
-       src/com/OldList.ec \
+       src/com/OldList.ec
+
+ECSOURCES = $(call shwspace,$(_ECSOURCES))
+ECSOURCES1 = $(call shwspace,$(_ECSOURCES1))
+ECSOURCES2 = $(call shwspace,$(_ECSOURCES2))
+
+COBJECTS = $(COBJECTS1) $(COBJECTS2)
+COBJECTS1 = $(call shwspace,$(addprefix $(OBJ),$(patsubst %.ec,%$(C),$(notdir $(_ECSOURCES1)))))
+COBJECTS2 = $(call shwspace,$(addprefix $(OBJ),$(patsubst %.ec,%$(C),$(notdir $(_ECSOURCES2)))))
+
+SYMBOLS = $(SYMBOLS1) $(SYMBOLS2)
+SYMBOLS1 = $(call shwspace,$(addprefix $(OBJ),$(patsubst %.ec,%$(S),$(notdir $(_ECSOURCES1)))))
+SYMBOLS2 = $(call shwspace,$(addprefix $(OBJ),$(patsubst %.ec,%$(S),$(notdir $(_ECSOURCES2)))))
+
+IMPORTS = $(IMPORTS1) $(IMPORTS2)
+IMPORTS1 = $(call shwspace,$(addprefix $(OBJ),$(patsubst %.ec,%$(I),$(notdir $(_ECSOURCES1)))))
+IMPORTS2 = $(call shwspace,$(addprefix $(OBJ),$(patsubst %.ec,%$(I),$(notdir $(_ECSOURCES2)))))
+
+ECOBJECTS = $(ECOBJECTS1) $(ECOBJECTS2)
+ECOBJECTS1 = $(call shwspace,$(addprefix $(OBJ),$(patsubst %.ec,%$(O),$(notdir $(_ECSOURCES1)))))
+ECOBJECTS2 = $(call shwspace,$(addprefix $(OBJ),$(patsubst %.ec,%$(O),$(notdir $(_ECSOURCES2)))))
+
+BOWLS = $(BOWLS1) $(BOWLS2)
+BOWLS1 = $(call shwspace,$(addprefix $(OBJ),$(patsubst %.ec,%$(B),$(notdir $(_ECSOURCES1)))))
+BOWLS2 = $(call shwspace,$(addprefix $(OBJ),$(patsubst %.ec,%$(B),$(notdir $(_ECSOURCES2)))))
+
+_OBJECTS = $(_OBJECTS1) $(_OBJECTS2)
+_OBJECTS1 = \
+       $(OBJ)File.c.o \
+       $(OBJ)DualPipe.c.o \
+       $(OBJ)System.c.o \
+       $(if $(WINDOWS_TARGET),,$(OBJ)harfbuzz-freetype.o) \
+       $(if $(WINDOWS_TARGET),,$(OBJ)harfbuzz-unicode-tables.o) \
+       $(if $(WINDOWS_TARGET),,$(OBJ)harfbuzz-unicode.o) \
+       $(if $(WINDOWS_TARGET),,$(OBJ)harfbuzz-arabic.o) \
+       $(if $(WINDOWS_TARGET),,$(OBJ)harfbuzz-buffer.o) \
+       $(if $(WINDOWS_TARGET),,$(OBJ)harfbuzz-gdef.o) \
+       $(if $(WINDOWS_TARGET),,$(OBJ)harfbuzz-gpos.o) \
+       $(if $(WINDOWS_TARGET),,$(OBJ)harfbuzz-gsub.o) \
+       $(if $(WINDOWS_TARGET),,$(OBJ)harfbuzz-hangul.o) \
+       $(if $(WINDOWS_TARGET),,$(OBJ)harfbuzz-hebrew.o) \
+       $(if $(WINDOWS_TARGET),,$(OBJ)harfbuzz-indic.o) \
+       $(if $(WINDOWS_TARGET),,$(OBJ)harfbuzz-khmer.o) \
+       $(if $(WINDOWS_TARGET),,$(OBJ)harfbuzz-myanmar.o) \
+       $(if $(WINDOWS_TARGET),,$(OBJ)harfbuzz-open.o) \
+       $(if $(WINDOWS_TARGET),,$(OBJ)harfbuzz-shaper.o) \
+       $(if $(WINDOWS_TARGET),,$(OBJ)harfbuzz-stream.o) \
+       $(if $(WINDOWS_TARGET),,$(OBJ)harfbuzz-tibetan.o)
+_OBJECTS2 = \
+       $(if $(WINDOWS_TARGET),,$(OBJ)harfbuzz-impl.o) \
+       $(if $(WINDOWS_TARGET),,$(OBJ)harfbuzz-thai.o) \
+       $(if $(OSX_TARGET),$(OBJ)CocoaEcereBridge.o,) \
+       $(if $(OSX_TARGET),$(OBJ)EcereView.o,) \
+       $(OBJ)instance.c.o
+
+OBJECTS = $(_OBJECTS) $(ECOBJECTS) $(OBJ)$(MODULE).main$(O)
+
+SOURCES = $(ECSOURCES) $(SOURCES1) $(SOURCES2)
+SOURCES1 = \
+       src/sys/File.c \
+       src/sys/DualPipe.c \
+       src/sys/System.c \
+       $(if $(WINDOWS_TARGET),,src/gfx/drivers/harfbuzz/unicode/harfbuzz-freetype.c) \
+       $(if $(WINDOWS_TARGET),,src/gfx/drivers/harfbuzz/unicode/harfbuzz-unicode-tables.c) \
+       $(if $(WINDOWS_TARGET),,src/gfx/drivers/harfbuzz/unicode/harfbuzz-unicode.c) \
+       $(if $(WINDOWS_TARGET),,src/gfx/drivers/harfbuzz/harfbuzz-arabic.c) \
+       $(if $(WINDOWS_TARGET),,src/gfx/drivers/harfbuzz/harfbuzz-buffer.c) \
+       $(if $(WINDOWS_TARGET),,src/gfx/drivers/harfbuzz/harfbuzz-gdef.c) \
+       $(if $(WINDOWS_TARGET),,src/gfx/drivers/harfbuzz/harfbuzz-gpos.c) \
+       $(if $(WINDOWS_TARGET),,src/gfx/drivers/harfbuzz/harfbuzz-gsub.c) \
+       $(if $(WINDOWS_TARGET),,src/gfx/drivers/harfbuzz/harfbuzz-hangul.c) \
+       $(if $(WINDOWS_TARGET),,src/gfx/drivers/harfbuzz/harfbuzz-hebrew.c) \
+       $(if $(WINDOWS_TARGET),,src/gfx/drivers/harfbuzz/harfbuzz-indic.c) \
+       $(if $(WINDOWS_TARGET),,src/gfx/drivers/harfbuzz/harfbuzz-khmer.c) \
+       $(if $(WINDOWS_TARGET),,src/gfx/drivers/harfbuzz/harfbuzz-myanmar.c) \
+       $(if $(WINDOWS_TARGET),,src/gfx/drivers/harfbuzz/harfbuzz-open.c) \
+       $(if $(WINDOWS_TARGET),,src/gfx/drivers/harfbuzz/harfbuzz-shaper.c) \
+       $(if $(WINDOWS_TARGET),,src/gfx/drivers/harfbuzz/harfbuzz-stream.c) \
+       $(if $(WINDOWS_TARGET),,src/gfx/drivers/harfbuzz/harfbuzz-tibetan.c) \
+       $(if $(WINDOWS_TARGET),,src/gfx/drivers/harfbuzz/harfbuzz-impl.c) \
+       $(if $(WINDOWS_TARGET),,src/gfx/drivers/harfbuzz/harfbuzz-thai.c) \
+       $(if $(OSX_TARGET),src/gui/drivers/cocoa/CocoaEcereBridge.m,) \
+       $(if $(OSX_TARGET),src/gui/drivers/cocoa/EcereView.m,)
+SOURCES2 = \
        src/com/instance.c
 
 RESOURCES = $(RESOURCES1) $(RESOURCES2) $(RESOURCES3)
@@ -525,6 +243,9 @@ RESOURCES1 = \
        $(RES)actions/listRemove.png \
        $(RES)actions/viewRefresh.png \
        $(RES)actions/windowNew.png \
+       $(RES)actions/clean.png \
+       $(RES)actions/docSave.png \
+       $(RES)actions/docNew.png \
        $(RES)constructs/class.png \
        $(RES)constructs/data.png \
        $(RES)constructs/dataPrivate.png \
@@ -560,10 +281,10 @@ RESOURCES1 = \
        $(RES)cursors/sizeEastWest.png \
        $(RES)cursors/sizeNortEastSouthWest.png \
        $(RES)cursors/sizeNorthSouth.png \
-       $(RES)cursors/sizeNortWestSouthEast.png \
-       $(RES)devices/computer.png \
-       $(RES)devices/driveHardDisk.png
+       $(RES)cursors/sizeNortWestSouthEast.png
 RESOURCES2 = \
+       $(RES)devices/computer.png \
+       $(RES)devices/driveHardDisk.png \
        $(RES)devices/driveRemovableMedia.png \
        $(RES)devices/mediaFloppy.png \
        $(RES)devices/mediaOptical.png \
@@ -603,10 +324,10 @@ RESOURCES2 = \
        $(RES)mimeTypes/textEcereProject.png \
        $(RES)mimeTypes/textEcereSource.png \
        $(RES)mimeTypes/textEcereWorkspace.png \
-       $(RES)mimeTypes/textHyperTextMarkup.png \
-       $(RES)mimeTypes/brokenFile.png \
-       $(RES)places/driveRemote.png
+       $(RES)mimeTypes/textHyperTextMarkup.png
 RESOURCES3 = \
+       $(RES)mimeTypes/brokenFile.png \
+       $(RES)places/driveRemote.png \
        $(RES)places/folder.png \
        $(RES)places/folderRemote.png \
        $(RES)places/networkServer.png \
@@ -614,75 +335,140 @@ RESOURCES3 = \
        $(RES)places/brokenFolder.png \
        $(RES)status/audioVolumeHigh.png \
        $(RES)status/folderOpen.png \
-       $(RES)unicode/derivedGeneralCategoryStripped.txt
-
-# CROSS-PLATFORM MAGIC
-
-include ../include.mk
-
-# TOOLCHAIN
-
-ECP := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecp$(E))
-ECC := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecc$(E))
-ECS := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecs$(E))
-EAR := $(call psep,../obj/$(PLATFORM)/bin/ear)
-
-# FLAGS
-
-CFLAGS = -fmessage-length=0 -Os -m32 $(FPIC) -w \
-        -DBUILDING_ECERE_COM -DECERE_STATIC -DECERE_VANILLA -DNOBLENDING \
-        -Isrc/gfx/drivers/harfbuzz
-
-CECFLAGS =
+       $(RES)unicode/derivedGeneralCategoryStripped.txt \
+       locale/zh_CN/LC_MESSAGES/ecere.mo \
+       locale/es_ES/LC_MESSAGES/ecere.mo
+
+LIBS += $(SHAREDLIB) $(EXECUTABLE) $(LINKOPT)
+
+ifndef STATIC_LIBRARY_TARGET
+LIBS += \
+       $(call _L,jpeg) \
+       $(call _L,png) \
+       $(call _L,z) \
+       $(call _L,freetype)
+endif
 
-ECFLAGS = -nolinenumbers -defaultns ecere
+CFLAGS += \
+        $(if $(DEBIAN_PACKAGE),$(CPPFLAGS),) $(if $(DEBUG), -D_DEBUG,) \
+        $(if $(WINDOWS_TARGET), \
+                        -I../deps/DirectX-9.0/include \
+                        -I../deps/jpeg-6b \
+                        -I../deps/libpng-1.4.0 \
+                        -I../deps/libungif-4.1.1/lib \
+                        -I../deps/zlib \
+                        -I../deps/freetype-2.3.12/include \
+                        -I../deps/glext,) \
+        $(if $(LINUX_TARGET), \
+                        -I/usr/include/freetype2 \
+                        -I../deps/libungif-4.1.1/lib,) \
+        $(if $(OSX_TARGET), \
+                        -I/usr/include/freetype2 \
+                        -I/usr/X11R6/include/freetype2 \
+                        -I/usr/X11R6/include \
+                        -I../deps/jpeg-6b \
+                        -I../deps/libpng-1.4.0 \
+                        -I../deps/libungif-4.1.1/lib,) \
+        $(if $(DEBUG), -g, -Os) $(FORCE_32_BIT) $(FPIC) -w \
+                        -DBUILDING_ECERE_COM \
+                        -DECERE_STATIC \
+                        -DECERE_VANILLA \
+                        -DNOBLENDING \
+                        -Isrc/gfx/drivers/harfbuzz \
+                        -I/usr/X11R6/include \
+                        -I/usr/X11R6/include/freetype2
+
+CUSTOM1_CFLAGS = \
+                        -DECERE_COM_MODULE \
+        $(CFLAGS)
+
+
+ECFLAGS += \
+        -nolinenumbers -defaultns ecere
 
-LIBS = $(SHAREDLIB) $(EXECUTABLE) $(LINKOPT)
 
-UPXFLAGS = -9 -q
+# PLATFORM-SPECIFIC OPTIONS
 
-# HARD CODED PLATFORM-SPECIFIC OPTIONS
-ifdef LINUX
-OFLAGS += -Wl,--no-undefined
+ifdef WINDOWS_TARGET
+
+ifndef STATIC_LIBRARY_TARGET
+OFLAGS += \
+        -L../deps/zlib/obj/release.$(PLATFORM) \
+        -L../deps/jpeg-6b/obj/release.$(PLATFORM) \
+        -L../deps/libpng-1.4.0/obj/release.$(PLATFORM) \
+        -L../deps/libungif-4.1.1/obj/release.$(PLATFORM) \
+        -L../deps/freetype-2.3.12/obj/release.$(PLATFORM)
+LIBS += \
+       $(call _L,dxguid) \
+       $(call _L,ddraw) \
+       $(call _L,dinput) \
+       $(call _L,winmm) \
+       $(call _L,opengl32) \
+       $(call _L,ws2_32) \
+       $(call _L,kernel32) \
+       $(call _L,user32) \
+       $(call _L,gdi32) \
+       $(call _L,mpr) \
+       $(call _L,advapi32) \
+       $(call _L,shell32) \
+       $(call _L,winspool) \
+       $(call _L,imm32) \
+       $(call _L,ungif)
 endif
 
-ifdef OSX
-OFLAGS += -framework cocoa -framework OpenGL
+else
+ifdef LINUX_TARGET
+
+ifndef STATIC_LIBRARY_TARGET
+OFLAGS += \
+        -L../deps/libungif-4.1.1/obj/release.$(PLATFORM) \
+        -L/usr/X11R6/lib
+LIBS += \
+       $(call _L,ncurses) \
+       $(call _L,pthread) \
+       $(call _L,m) \
+       $(call _L,dl) \
+       $(call _L,fontconfig) \
+       $(call _L,ungif) \
+       $(call _L,X11) \
+       $(call _L,Xext) \
+       $(call _L,Xrender) \
+       $(call _L,GL)
 endif
 
-# PLATFORM-SPECIFIC OPTIONS
-
-ifdef WINDOWS
-
-CFLAGS += \
-        -I../deps/DirectX-9.0/include \
-        -I../deps/jpeg-6b \
-        -I../deps/libpng-1.4.0 \
-        -I../deps/libungif-4.1.1/lib \
-        -I../deps/zlib \
-        -I../deps/freetype-2.3.12/include \
-        -I../deps/glext
-
 else
-ifdef LINUX
+ifdef OSX_TARGET
+
+ifndef STATIC_LIBRARY_TARGET
+OFLAGS += \
+        -L/usr/X11R6/lib \
+        -L../deps/jpeg-6b/obj/release.$(PLATFORM) \
+        -L../deps/libpng-1.4.0/obj/release.$(PLATFORM) \
+        -L../deps/libungif-4.1.1/obj/release.$(PLATFORM)
+LIBS += \
+       $(call _L,curses) \
+       $(call _L,pthread) \
+       $(call _L,m) \
+       $(call _L,dl) \
+       $(call _L,fontconfig) \
+       $(call _L,ungif) \
+       $(call _L,X11) \
+       $(call _L,Xext) \
+       $(call _L,Xrender) \
+       $(call _L,GL)
+endif
 
-CFLAGS += \
-        -I/usr/include/freetype2 \
-        -I../deps/libungif-4.1.1/lib
+endif
+endif
+endif
 
-else
-ifdef OSX
 
-CFLAGS += \
-        -I/usr/include/freetype2 \
-        -I/usr/X11R6/include/freetype2 \
-        -I/usr/X11R6/include \
-        -I../deps/jpeg-6b \
-        -I../deps/libpng-1.4.0 \
-        -I../deps/libungif-4.1.1/lib
 
-endif
-endif
+CECFLAGS += -cpp $(_CPP)
+
+ifndef STATIC_LIBRARY_TARGET
+OFLAGS += $(FORCE_32_BIT)
+OFLAGS += $(LDFLAGS)
 endif
 
 # TARGETS
@@ -702,7 +488,33 @@ $(OBJ)$(MODULE).main.c: $(OBJ)$(MODULE).main.ec
 $(SYMBOLS): | objdir
 $(OBJECTS): | objdir
 $(TARGET): $(SOURCES) $(RESOURCES) $(SYMBOLS) $(OBJECTS) | objdir
+ifndef STATIC_LIBRARY_TARGET
+       $(CC) $(OFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) $(INSTALLNAME)
+ifndef NOSTRIP
+       $(STRIP) $(STRIPOPT) $(TARGET)
+endif
+       $(EAR) $(EARFLAGS) $(TARGET) $(RES)actions/editFind.png $(RES)actions/folderNew.png $(RES)actions/goDown.png $(RES)actions/goHome.png $(RES)actions/goNext.png $(RES)actions/goPrevious.png $(RES)actions/goUp.png $(RES)actions/listAdd.png $(RES)actions/listRemove.png $(RES)actions/viewRefresh.png "actions"
+       $(EAR) $(EARFLAGS) $(TARGET) $(RES)actions/windowNew.png $(RES)actions/clean.png $(RES)actions/docSave.png $(RES)actions/docNew.png "actions"
+       $(EAR) $(EARFLAGS) $(TARGET) $(RES)constructs/class.png $(RES)constructs/data.png $(RES)constructs/dataPrivate.png $(RES)constructs/dataType.png $(RES)constructs/enum.png $(RES)constructs/enumValue.png $(RES)constructs/event.png $(RES)constructs/library.png $(RES)constructs/method.png $(RES)constructs/methodPrivate.png "constructs"
+       $(EAR) $(EARFLAGS) $(TARGET) $(RES)constructs/namespace.png $(RES)constructs/property.png $(RES)constructs/propertyPrivate.png "constructs"
+       $(EAR) $(EARFLAGS) $(TARGET) $(RES)controls/button.png $(RES)controls/calendar.png $(RES)controls/checkBox.png $(RES)controls/dataBox.png $(RES)controls/dropBox.png $(RES)controls/editBox.png $(RES)controls/groupBox.png $(RES)controls/label.png $(RES)controls/listBox.png $(RES)controls/menu.png "controls"
+       $(EAR) $(EARFLAGS) $(TARGET) $(RES)controls/optionBox.png $(RES)controls/progressBar.png $(RES)controls/scrollBarHorizontal.png $(RES)controls/scrollBarVertical.png $(RES)controls/statusBar.png "controls"
+       $(EAR) $(EARFLAGS) $(TARGET) $(RES)cursors/arrow.png $(RES)cursors/cross.png $(RES)cursors/iBeam.png $(RES)cursors/move.png $(RES)cursors/sizeEastWest.png $(RES)cursors/sizeNortEastSouthWest.png $(RES)cursors/sizeNorthSouth.png $(RES)cursors/sizeNortWestSouthEast.png "cursors"
+       $(EAR) $(EARFLAGS) $(TARGET) $(RES)devices/computer.png $(RES)devices/driveHardDisk.png $(RES)devices/driveRemovableMedia.png $(RES)devices/mediaFloppy.png $(RES)devices/mediaOptical.png "devices"
+       $(EAR) $(EARFLAGS) $(TARGET) $(RES)elements/areaClose.png $(RES)elements/areaMaximize.png $(RES)elements/areaMinimize.png $(RES)elements/areaRestore.png $(RES)elements/arrowDown.png $(RES)elements/arrowLeft.png $(RES)elements/arrowRight.png $(RES)elements/arrowUp.png $(RES)elements/checkBoxChecked.png $(RES)elements/checkBoxDisabled.png "elements"
+       $(EAR) $(EARFLAGS) $(TARGET) $(RES)elements/checkBoxDisabledChecked.png $(RES)elements/checkBox.png $(RES)elements/optionBoxDisabled.png $(RES)elements/optionBoxDisabledSelected.png $(RES)elements/optionBoxDown.png $(RES)elements/optionBoxSelectedDown.png $(RES)elements/optionBoxSelectedUp.png $(RES)elements/optionBoxUp.png $(RES)elements/orderAscending.png $(RES)elements/orderCategorized.png "elements"
+       $(EAR) $(EARFLAGS) $(TARGET) $(RES)elements/orderDescending.png "elements"
+       $(EAR) $(EARFLAGS) $(TARGET) $(RES)emblems/unreadable.png "emblems"
+       $(EAR) $(EARFLAGS) $(TARGET) $(RES)mimeTypes/file.png $(RES)mimeTypes/image.png $(RES)mimeTypes/package.png $(RES)mimeTypes/packageOpticalDisc.png $(RES)mimeTypes/packageSoftware.png $(RES)mimeTypes/text.png $(RES)mimeTypes/textCHeader.png $(RES)mimeTypes/textCSource.png $(RES)mimeTypes/textC++Header.png $(RES)mimeTypes/textC++Source.png "mimeTypes"
+       $(EAR) $(EARFLAGS) $(TARGET) $(RES)mimeTypes/textEcereHeader.png $(RES)mimeTypes/textEcereProject.png $(RES)mimeTypes/textEcereSource.png $(RES)mimeTypes/textEcereWorkspace.png $(RES)mimeTypes/textHyperTextMarkup.png $(RES)mimeTypes/brokenFile.png "mimeTypes"
+       $(EAR) $(EARFLAGS) $(TARGET) $(RES)places/driveRemote.png $(RES)places/folder.png $(RES)places/folderRemote.png $(RES)places/networkServer.png $(RES)places/networkWorkgroup.png $(RES)places/brokenFolder.png "places"
+       $(EAR) $(EARFLAGS) $(TARGET) $(RES)status/audioVolumeHigh.png $(RES)status/folderOpen.png "status"
+       $(EAR) $(EARFLAGS) $(TARGET) $(RES)unicode/derivedGeneralCategoryStripped.txt "unicode"
+       $(EAR) $(EARFLAGS) $(TARGET) locale/zh_CN/LC_MESSAGES/ecere.mo "locale/zh_CN/LC_MESSAGES"
+       $(EAR) $(EARFLAGS) $(TARGET) locale/es_ES/LC_MESSAGES/ecere.mo "locale/es_ES/LC_MESSAGES"
+else
        $(AR) rcs $(TARGET) $(OBJECTS) $(LIBS)
+endif
        $(call cpq,$(TARGET),../obj/$(PLATFORM)/lib/)
 
 # SYMBOL RULES
@@ -741,7 +553,7 @@ $(OBJ)memory.sym: src/sys/memory.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/sys/memory.ec -o $(OBJ)memory.sym
 
 $(OBJ)Mutex.sym: src/sys/Mutex.ec
-       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/sys/Mutex.ec -o $(OBJ)Mutex.sym
+       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) -c src/sys/Mutex.ec -o $(OBJ)Mutex.sym
 
 $(OBJ)Semaphore.sym: src/sys/Semaphore.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/sys/Semaphore.ec -o $(OBJ)Semaphore.sym
@@ -765,14 +577,21 @@ $(OBJ)units.sym: src/sys/units.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/sys/units.ec -o $(OBJ)units.sym
 
 $(OBJ)i18n.sym: src/sys/i18n.ec
-       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/sys/i18n.ec -o $(OBJ)i18n.sym
+       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) -c src/sys/i18n.ec -o $(OBJ)i18n.sym
+
+$(OBJ)Condition.sym: src/sys/Condition.ec
+       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/sys/Condition.ec -o $(OBJ)Condition.sym
 
 $(OBJ)BMPFormat.sym: src/gfx/bitmaps/BMPFormat.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gfx/bitmaps/BMPFormat.ec -o $(OBJ)BMPFormat.sym
 
+ifdef WINDOWS_TARGET
+
 $(OBJ)GDIDisplayDriver.sym: src/gfx/drivers/GDIDisplayDriver.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gfx/drivers/GDIDisplayDriver.ec -o $(OBJ)GDIDisplayDriver.sym
 
+endif
+
 $(OBJ)lfbBlit.sym: src/gfx/drivers/lfbBlit.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gfx/drivers/lfbBlit.ec -o $(OBJ)lfbBlit.sym
 
@@ -782,12 +601,27 @@ $(OBJ)lfbConvert.sym: src/gfx/drivers/lfbConvert.ec
 $(OBJ)LFBDisplayDriver.sym: src/gfx/drivers/LFBDisplayDriver.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gfx/drivers/LFBDisplayDriver.ec -o $(OBJ)LFBDisplayDriver.sym
 
+ifdef LINUX_TARGET
+
 $(OBJ)NCursesDisplayDriver.sym: src/gfx/drivers/NCursesDisplayDriver.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gfx/drivers/NCursesDisplayDriver.ec -o $(OBJ)NCursesDisplayDriver.sym
 
+endif
+
+ifdef OSX_TARGET
+
+$(OBJ)CocoaOpenGLDisplayDriver.sym: src/gfx/drivers/CocoaOpenGLDisplayDriver.ec
+       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gfx/drivers/CocoaOpenGLDisplayDriver.ec -o $(OBJ)CocoaOpenGLDisplayDriver.sym
+
+endif
+
+ifdef LINUX_TARGET
+
 $(OBJ)XDisplayDriver.sym: src/gfx/drivers/XDisplayDriver.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gfx/drivers/XDisplayDriver.ec -o $(OBJ)XDisplayDriver.sym
 
+endif
+
 $(OBJ)Bitmap.sym: src/gfx/Bitmap.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gfx/Bitmap.ec -o $(OBJ)Bitmap.sym
 
@@ -857,6 +691,9 @@ $(OBJ)PathBox.sym: src/gui/controls/PathBox.ec
 $(OBJ)ToolTip.sym: src/gui/controls/ToolTip.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gui/controls/ToolTip.ec -o $(OBJ)ToolTip.sym
 
+$(OBJ)SelectorBar.sym: src/gui/controls/SelectorBar.ec
+       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gui/controls/SelectorBar.ec -o $(OBJ)SelectorBar.sym
+
 $(OBJ)ColorPicker.sym: src/gui/dialogs/ColorPicker.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gui/dialogs/ColorPicker.ec -o $(OBJ)ColorPicker.sym
 
@@ -878,15 +715,37 @@ $(OBJ)ReplaceDialog.sym: src/gui/dialogs/ReplaceDialog.ec
 $(OBJ)WindowList.sym: src/gui/dialogs/WindowList.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gui/dialogs/WindowList.ec -o $(OBJ)WindowList.sym
 
+ifdef OSX_TARGET
+
+$(OBJ)CocoaDispatch.sym: src/gui/drivers/cocoa/CocoaDispatch.ec
+       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gui/drivers/cocoa/CocoaDispatch.ec -o $(OBJ)CocoaDispatch.sym
+
+$(OBJ)CocoaInterface.sym: src/gui/drivers/cocoa/CocoaInterface.ec
+       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gui/drivers/cocoa/CocoaInterface.ec -o $(OBJ)CocoaInterface.sym
+
+endif
+
+ifdef LINUX_TARGET
+
 $(OBJ)NCursesInterface.sym: src/gui/drivers/NCursesInterface.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gui/drivers/NCursesInterface.ec -o $(OBJ)NCursesInterface.sym
 
+endif
+
+ifdef WINDOWS_TARGET
+
 $(OBJ)Win32Interface.sym: src/gui/drivers/Win32Interface.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gui/drivers/Win32Interface.ec -o $(OBJ)Win32Interface.sym
 
+endif
+
+ifdef LINUX_TARGET
+
 $(OBJ)XInterface.sym: src/gui/drivers/XInterface.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gui/drivers/XInterface.ec -o $(OBJ)XInterface.sym
 
+endif
+
 $(OBJ)WindowsSkin.sym: src/gui/skins/WindowsSkin.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gui/skins/WindowsSkin.ec -o $(OBJ)WindowsSkin.sym
 
@@ -924,46 +783,46 @@ $(OBJ)Window.sym: src/gui/Window.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gui/Window.ec -o $(OBJ)Window.sym
 
 $(OBJ)Array.sym: src/com/containers/Array.ec
-       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/com/containers/Array.ec -o $(OBJ)Array.sym
+       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) -c src/com/containers/Array.ec -o $(OBJ)Array.sym
 
 $(OBJ)AVLTree.sym: src/com/containers/AVLTree.ec
-       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/com/containers/AVLTree.ec -o $(OBJ)AVLTree.sym
+       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) -c src/com/containers/AVLTree.ec -o $(OBJ)AVLTree.sym
 
 $(OBJ)BuiltInContainer.sym: src/com/containers/BuiltInContainer.ec
-       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/com/containers/BuiltInContainer.ec -o $(OBJ)BuiltInContainer.sym
+       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) -c src/com/containers/BuiltInContainer.ec -o $(OBJ)BuiltInContainer.sym
 
 $(OBJ)Container.sym: src/com/containers/Container.ec
-       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/com/containers/Container.ec -o $(OBJ)Container.sym
+       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) -c src/com/containers/Container.ec -o $(OBJ)Container.sym
 
 $(OBJ)CustomAVLTree.sym: src/com/containers/CustomAVLTree.ec
-       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/com/containers/CustomAVLTree.ec -o $(OBJ)CustomAVLTree.sym
+       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) -c src/com/containers/CustomAVLTree.ec -o $(OBJ)CustomAVLTree.sym
 
 $(OBJ)LinkList.sym: src/com/containers/LinkList.ec
-       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/com/containers/LinkList.ec -o $(OBJ)LinkList.sym
+       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) -c src/com/containers/LinkList.ec -o $(OBJ)LinkList.sym
 
 $(OBJ)List.sym: src/com/containers/List.ec
-       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/com/containers/List.ec -o $(OBJ)List.sym
+       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) -c src/com/containers/List.ec -o $(OBJ)List.sym
 
 $(OBJ)Map.sym: src/com/containers/Map.ec
-       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/com/containers/Map.ec -o $(OBJ)Map.sym
+       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) -c src/com/containers/Map.ec -o $(OBJ)Map.sym
 
 $(OBJ)BinaryTree.sym: src/com/BinaryTree.ec
-       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/com/BinaryTree.ec -o $(OBJ)BinaryTree.sym
+       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) -c src/com/BinaryTree.ec -o $(OBJ)BinaryTree.sym
 
 $(OBJ)BTNode.sym: src/com/BTNode.ec
-       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/com/BTNode.ec -o $(OBJ)BTNode.sym
+       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) -c src/com/BTNode.ec -o $(OBJ)BTNode.sym
 
 $(OBJ)dataTypes.sym: src/com/dataTypes.ec
-       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/com/dataTypes.ec -o $(OBJ)dataTypes.sym
+       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) -c src/com/dataTypes.ec -o $(OBJ)dataTypes.sym
 
 $(OBJ)instance.sym: src/com/instance.ec
-       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/com/instance.ec -o $(OBJ)instance.sym
+       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) -c src/com/instance.ec -o $(OBJ)instance.sym
 
 $(OBJ)String.sym: src/com/String.ec
-       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/com/String.ec -o $(OBJ)String.sym
+       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) -c src/com/String.ec -o $(OBJ)String.sym
 
 $(OBJ)OldList.sym: src/com/OldList.ec
-       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/com/OldList.ec -o $(OBJ)OldList.sym
+       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) -c src/com/OldList.ec -o $(OBJ)OldList.sym
 
 # C OBJECT RULES
 
@@ -1001,7 +860,7 @@ $(OBJ)memory.c: src/sys/memory.ec $(OBJ)memory.sym | $(SYMBOLS)
        $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/sys/memory.ec -o $(OBJ)memory.c -symbols $(OBJ)
 
 $(OBJ)Mutex.c: src/sys/Mutex.ec $(OBJ)Mutex.sym | $(SYMBOLS)
-       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/sys/Mutex.ec -o $(OBJ)Mutex.c -symbols $(OBJ)
+       $(ECC) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c src/sys/Mutex.ec -o $(OBJ)Mutex.c -symbols $(OBJ)
 
 $(OBJ)Semaphore.c: src/sys/Semaphore.ec $(OBJ)Semaphore.sym | $(SYMBOLS)
        $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/sys/Semaphore.ec -o $(OBJ)Semaphore.c -symbols $(OBJ)
@@ -1025,14 +884,21 @@ $(OBJ)units.c: src/sys/units.ec $(OBJ)units.sym | $(SYMBOLS)
        $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/sys/units.ec -o $(OBJ)units.c -symbols $(OBJ)
 
 $(OBJ)i18n.c: src/sys/i18n.ec $(OBJ)i18n.sym | $(SYMBOLS)
-       $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/sys/i18n.ec -o $(OBJ)i18n.c -symbols $(OBJ)
+       $(ECC) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c src/sys/i18n.ec -o $(OBJ)i18n.c -symbols $(OBJ)
+
+$(OBJ)Condition.c: src/sys/Condition.ec $(OBJ)Condition.sym | $(SYMBOLS)
+       $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/sys/Condition.ec -o $(OBJ)Condition.c -symbols $(OBJ)
 
 $(OBJ)BMPFormat.c: src/gfx/bitmaps/BMPFormat.ec $(OBJ)BMPFormat.sym | $(SYMBOLS)
        $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/gfx/bitmaps/BMPFormat.ec -o $(OBJ)BMPFormat.c -symbols $(OBJ)
 
+ifdef WINDOWS_TARGET
+
 $(OBJ)GDIDisplayDriver.c: src/gfx/drivers/GDIDisplayDriver.ec $(OBJ)GDIDisplayDriver.sym | $(SYMBOLS)
        $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/gfx/drivers/GDIDisplayDriver.ec -o $(OBJ)GDIDisplayDriver.c -symbols $(OBJ)
 
+endif
+
 $(OBJ)lfbBlit.c: src/gfx/drivers/lfbBlit.ec $(OBJ)lfbBlit.sym | $(SYMBOLS)
        $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/gfx/drivers/lfbBlit.ec -o $(OBJ)lfbBlit.c -symbols $(OBJ)
 
@@ -1042,12 +908,27 @@ $(OBJ)lfbConvert.c: src/gfx/drivers/lfbConvert.ec $(OBJ)lfbConvert.sym | $(SYMBO
 $(OBJ)LFBDisplayDriver.c: src/gfx/drivers/LFBDisplayDriver.ec $(OBJ)LFBDisplayDriver.sym | $(SYMBOLS)
        $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/gfx/drivers/LFBDisplayDriver.ec -o $(OBJ)LFBDisplayDriver.c -symbols $(OBJ)
 
+ifdef LINUX_TARGET
+
 $(OBJ)NCursesDisplayDriver.c: src/gfx/drivers/NCursesDisplayDriver.ec $(OBJ)NCursesDisplayDriver.sym | $(SYMBOLS)
        $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/gfx/drivers/NCursesDisplayDriver.ec -o $(OBJ)NCursesDisplayDriver.c -symbols $(OBJ)
 
+endif
+
+ifdef OSX_TARGET
+
+$(OBJ)CocoaOpenGLDisplayDriver.c: src/gfx/drivers/CocoaOpenGLDisplayDriver.ec $(OBJ)CocoaOpenGLDisplayDriver.sym | $(SYMBOLS)
+       $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/gfx/drivers/CocoaOpenGLDisplayDriver.ec -o $(OBJ)CocoaOpenGLDisplayDriver.c -symbols $(OBJ)
+
+endif
+
+ifdef LINUX_TARGET
+
 $(OBJ)XDisplayDriver.c: src/gfx/drivers/XDisplayDriver.ec $(OBJ)XDisplayDriver.sym | $(SYMBOLS)
        $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/gfx/drivers/XDisplayDriver.ec -o $(OBJ)XDisplayDriver.c -symbols $(OBJ)
 
+endif
+
 $(OBJ)Bitmap.c: src/gfx/Bitmap.ec $(OBJ)Bitmap.sym | $(SYMBOLS)
        $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/gfx/Bitmap.ec -o $(OBJ)Bitmap.c -symbols $(OBJ)
 
@@ -1117,6 +998,9 @@ $(OBJ)PathBox.c: src/gui/controls/PathBox.ec $(OBJ)PathBox.sym | $(SYMBOLS)
 $(OBJ)ToolTip.c: src/gui/controls/ToolTip.ec $(OBJ)ToolTip.sym | $(SYMBOLS)
        $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/gui/controls/ToolTip.ec -o $(OBJ)ToolTip.c -symbols $(OBJ)
 
+$(OBJ)SelectorBar.c: src/gui/controls/SelectorBar.ec $(OBJ)SelectorBar.sym | $(SYMBOLS)
+       $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/gui/controls/SelectorBar.ec -o $(OBJ)SelectorBar.c -symbols $(OBJ)
+
 $(OBJ)ColorPicker.c: src/gui/dialogs/ColorPicker.ec $(OBJ)ColorPicker.sym | $(SYMBOLS)
        $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/gui/dialogs/ColorPicker.ec -o $(OBJ)ColorPicker.c -symbols $(OBJ)
 
@@ -1138,15 +1022,37 @@ $(OBJ)ReplaceDialog.c: src/gui/dialogs/ReplaceDialog.ec $(OBJ)ReplaceDialog.sym
 $(OBJ)WindowList.c: src/gui/dialogs/WindowList.ec $(OBJ)WindowList.sym | $(SYMBOLS)
        $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/gui/dialogs/WindowList.ec -o $(OBJ)WindowList.c -symbols $(OBJ)
 
+ifdef OSX_TARGET
+
+$(OBJ)CocoaDispatch.c: src/gui/drivers/cocoa/CocoaDispatch.ec $(OBJ)CocoaDispatch.sym | $(SYMBOLS)
+       $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/gui/drivers/cocoa/CocoaDispatch.ec -o $(OBJ)CocoaDispatch.c -symbols $(OBJ)
+
+$(OBJ)CocoaInterface.c: src/gui/drivers/cocoa/CocoaInterface.ec $(OBJ)CocoaInterface.sym | $(SYMBOLS)
+       $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/gui/drivers/cocoa/CocoaInterface.ec -o $(OBJ)CocoaInterface.c -symbols $(OBJ)
+
+endif
+
+ifdef LINUX_TARGET
+
 $(OBJ)NCursesInterface.c: src/gui/drivers/NCursesInterface.ec $(OBJ)NCursesInterface.sym | $(SYMBOLS)
        $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/gui/drivers/NCursesInterface.ec -o $(OBJ)NCursesInterface.c -symbols $(OBJ)
 
+endif
+
+ifdef WINDOWS_TARGET
+
 $(OBJ)Win32Interface.c: src/gui/drivers/Win32Interface.ec $(OBJ)Win32Interface.sym | $(SYMBOLS)
        $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/gui/drivers/Win32Interface.ec -o $(OBJ)Win32Interface.c -symbols $(OBJ)
 
+endif
+
+ifdef LINUX_TARGET
+
 $(OBJ)XInterface.c: src/gui/drivers/XInterface.ec $(OBJ)XInterface.sym | $(SYMBOLS)
        $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/gui/drivers/XInterface.ec -o $(OBJ)XInterface.c -symbols $(OBJ)
 
+endif
+
 $(OBJ)WindowsSkin.c: src/gui/skins/WindowsSkin.ec $(OBJ)WindowsSkin.sym | $(SYMBOLS)
        $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/gui/skins/WindowsSkin.ec -o $(OBJ)WindowsSkin.c -symbols $(OBJ)
 
@@ -1184,46 +1090,46 @@ $(OBJ)Window.c: src/gui/Window.ec $(OBJ)Window.sym | $(SYMBOLS)
        $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/gui/Window.ec -o $(OBJ)Window.c -symbols $(OBJ)
 
 $(OBJ)Array.c: src/com/containers/Array.ec $(OBJ)Array.sym | $(SYMBOLS)
-       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/com/containers/Array.ec -o $(OBJ)Array.c -symbols $(OBJ)
+       $(ECC) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c src/com/containers/Array.ec -o $(OBJ)Array.c -symbols $(OBJ)
 
 $(OBJ)AVLTree.c: src/com/containers/AVLTree.ec $(OBJ)AVLTree.sym | $(SYMBOLS)
-       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/com/containers/AVLTree.ec -o $(OBJ)AVLTree.c -symbols $(OBJ)
+       $(ECC) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c src/com/containers/AVLTree.ec -o $(OBJ)AVLTree.c -symbols $(OBJ)
 
 $(OBJ)BuiltInContainer.c: src/com/containers/BuiltInContainer.ec $(OBJ)BuiltInContainer.sym | $(SYMBOLS)
-       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/com/containers/BuiltInContainer.ec -o $(OBJ)BuiltInContainer.c -symbols $(OBJ)
+       $(ECC) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c src/com/containers/BuiltInContainer.ec -o $(OBJ)BuiltInContainer.c -symbols $(OBJ)
 
 $(OBJ)Container.c: src/com/containers/Container.ec $(OBJ)Container.sym | $(SYMBOLS)
-       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/com/containers/Container.ec -o $(OBJ)Container.c -symbols $(OBJ)
+       $(ECC) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c src/com/containers/Container.ec -o $(OBJ)Container.c -symbols $(OBJ)
 
 $(OBJ)CustomAVLTree.c: src/com/containers/CustomAVLTree.ec $(OBJ)CustomAVLTree.sym | $(SYMBOLS)
-       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/com/containers/CustomAVLTree.ec -o $(OBJ)CustomAVLTree.c -symbols $(OBJ)
+       $(ECC) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c src/com/containers/CustomAVLTree.ec -o $(OBJ)CustomAVLTree.c -symbols $(OBJ)
 
 $(OBJ)LinkList.c: src/com/containers/LinkList.ec $(OBJ)LinkList.sym | $(SYMBOLS)
-       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/com/containers/LinkList.ec -o $(OBJ)LinkList.c -symbols $(OBJ)
+       $(ECC) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c src/com/containers/LinkList.ec -o $(OBJ)LinkList.c -symbols $(OBJ)
 
 $(OBJ)List.c: src/com/containers/List.ec $(OBJ)List.sym | $(SYMBOLS)
-       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/com/containers/List.ec -o $(OBJ)List.c -symbols $(OBJ)
+       $(ECC) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c src/com/containers/List.ec -o $(OBJ)List.c -symbols $(OBJ)
 
 $(OBJ)Map.c: src/com/containers/Map.ec $(OBJ)Map.sym | $(SYMBOLS)
-       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/com/containers/Map.ec -o $(OBJ)Map.c -symbols $(OBJ)
+       $(ECC) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c src/com/containers/Map.ec -o $(OBJ)Map.c -symbols $(OBJ)
 
 $(OBJ)BinaryTree.c: src/com/BinaryTree.ec $(OBJ)BinaryTree.sym | $(SYMBOLS)
-       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/com/BinaryTree.ec -o $(OBJ)BinaryTree.c -symbols $(OBJ)
+       $(ECC) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c src/com/BinaryTree.ec -o $(OBJ)BinaryTree.c -symbols $(OBJ)
 
 $(OBJ)BTNode.c: src/com/BTNode.ec $(OBJ)BTNode.sym | $(SYMBOLS)
-       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/com/BTNode.ec -o $(OBJ)BTNode.c -symbols $(OBJ)
+       $(ECC) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c src/com/BTNode.ec -o $(OBJ)BTNode.c -symbols $(OBJ)
 
 $(OBJ)dataTypes.c: src/com/dataTypes.ec $(OBJ)dataTypes.sym | $(SYMBOLS)
-       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/com/dataTypes.ec -o $(OBJ)dataTypes.c -symbols $(OBJ)
+       $(ECC) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c src/com/dataTypes.ec -o $(OBJ)dataTypes.c -symbols $(OBJ)
 
 $(OBJ)instance.c: src/com/instance.ec $(OBJ)instance.sym | $(SYMBOLS)
-       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/com/instance.ec -o $(OBJ)instance.c -symbols $(OBJ)
+       $(ECC) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c src/com/instance.ec -o $(OBJ)instance.c -symbols $(OBJ)
 
 $(OBJ)String.c: src/com/String.ec $(OBJ)String.sym | $(SYMBOLS)
-       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/com/String.ec -o $(OBJ)String.c -symbols $(OBJ)
+       $(ECC) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c src/com/String.ec -o $(OBJ)String.c -symbols $(OBJ)
 
 $(OBJ)OldList.c: src/com/OldList.ec $(OBJ)OldList.sym | $(SYMBOLS)
-       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/com/OldList.ec -o $(OBJ)OldList.c -symbols $(OBJ)
+       $(ECC) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c src/com/OldList.ec -o $(OBJ)OldList.c -symbols $(OBJ)
 
 # OBJECT RULES
 
@@ -1261,7 +1167,7 @@ $(OBJ)memory.o: $(OBJ)memory.c
        $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)memory.c -o $(OBJ)memory.o
 
 $(OBJ)Mutex.o: $(OBJ)Mutex.c
-       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)Mutex.c -o $(OBJ)Mutex.o
+       $(CC) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c $(OBJ)Mutex.c -o $(OBJ)Mutex.o
 
 $(OBJ)Semaphore.o: $(OBJ)Semaphore.c
        $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)Semaphore.c -o $(OBJ)Semaphore.o
@@ -1294,7 +1200,10 @@ $(OBJ)System.c.o: src/sys/System.c
        $(CC) $(CFLAGS) -c src/sys/System.c -o $(OBJ)System.c.o
 
 $(OBJ)i18n.o: $(OBJ)i18n.c
-       $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)i18n.c -o $(OBJ)i18n.o
+       $(CC) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c $(OBJ)i18n.c -o $(OBJ)i18n.o
+
+$(OBJ)Condition.o: $(OBJ)Condition.c
+       $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)Condition.c -o $(OBJ)Condition.o
 
 $(OBJ)BMPFormat.o: $(OBJ)BMPFormat.c
        $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)BMPFormat.c -o $(OBJ)BMPFormat.o
@@ -1371,6 +1280,9 @@ $(OBJ)LFBDisplayDriver.o: $(OBJ)LFBDisplayDriver.c
 $(OBJ)NCursesDisplayDriver.o: $(OBJ)NCursesDisplayDriver.c
        $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)NCursesDisplayDriver.c -o $(OBJ)NCursesDisplayDriver.o
 
+$(OBJ)CocoaOpenGLDisplayDriver.o: $(OBJ)CocoaOpenGLDisplayDriver.c
+       $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)CocoaOpenGLDisplayDriver.c -o $(OBJ)CocoaOpenGLDisplayDriver.o
+
 $(OBJ)XDisplayDriver.o: $(OBJ)XDisplayDriver.c
        $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)XDisplayDriver.c -o $(OBJ)XDisplayDriver.o
 
@@ -1443,6 +1355,9 @@ $(OBJ)PathBox.o: $(OBJ)PathBox.c
 $(OBJ)ToolTip.o: $(OBJ)ToolTip.c
        $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)ToolTip.c -o $(OBJ)ToolTip.o
 
+$(OBJ)SelectorBar.o: $(OBJ)SelectorBar.c
+       $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)SelectorBar.c -o $(OBJ)SelectorBar.o
+
 $(OBJ)ColorPicker.o: $(OBJ)ColorPicker.c
        $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)ColorPicker.c -o $(OBJ)ColorPicker.o
 
@@ -1464,6 +1379,22 @@ $(OBJ)ReplaceDialog.o: $(OBJ)ReplaceDialog.c
 $(OBJ)WindowList.o: $(OBJ)WindowList.c
        $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)WindowList.c -o $(OBJ)WindowList.o
 
+ifdef OSX_TARGET
+
+$(OBJ)CocoaDispatch.o: $(OBJ)CocoaDispatch.c
+       $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)CocoaDispatch.c -o $(OBJ)CocoaDispatch.o
+
+$(OBJ)CocoaEcereBridge.o: src/gui/drivers/cocoa/CocoaEcereBridge.m
+       $(CC) $(CFLAGS) -c src/gui/drivers/cocoa/CocoaEcereBridge.m -o $(OBJ)CocoaEcereBridge.o
+
+$(OBJ)CocoaInterface.o: $(OBJ)CocoaInterface.c
+       $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)CocoaInterface.c -o $(OBJ)CocoaInterface.o
+
+$(OBJ)EcereView.o: src/gui/drivers/cocoa/EcereView.m
+       $(CC) $(CFLAGS) -c src/gui/drivers/cocoa/EcereView.m -o $(OBJ)EcereView.o
+
+endif
+
 $(OBJ)NCursesInterface.o: $(OBJ)NCursesInterface.c
        $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)NCursesInterface.c -o $(OBJ)NCursesInterface.o
 
@@ -1510,66 +1441,69 @@ $(OBJ)Window.o: $(OBJ)Window.c
        $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)Window.c -o $(OBJ)Window.o
 
 $(OBJ)Array.o: $(OBJ)Array.c
-       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)Array.c -o $(OBJ)Array.o
+       $(CC) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c $(OBJ)Array.c -o $(OBJ)Array.o
 
 $(OBJ)AVLTree.o: $(OBJ)AVLTree.c
-       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)AVLTree.c -o $(OBJ)AVLTree.o
+       $(CC) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c $(OBJ)AVLTree.c -o $(OBJ)AVLTree.o
 
 $(OBJ)BuiltInContainer.o: $(OBJ)BuiltInContainer.c
-       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)BuiltInContainer.c -o $(OBJ)BuiltInContainer.o
+       $(CC) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c $(OBJ)BuiltInContainer.c -o $(OBJ)BuiltInContainer.o
 
 $(OBJ)Container.o: $(OBJ)Container.c
-       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)Container.c -o $(OBJ)Container.o
+       $(CC) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c $(OBJ)Container.c -o $(OBJ)Container.o
 
 $(OBJ)CustomAVLTree.o: $(OBJ)CustomAVLTree.c
-       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)CustomAVLTree.c -o $(OBJ)CustomAVLTree.o
+       $(CC) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c $(OBJ)CustomAVLTree.c -o $(OBJ)CustomAVLTree.o
 
 $(OBJ)LinkList.o: $(OBJ)LinkList.c
-       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)LinkList.c -o $(OBJ)LinkList.o
+       $(CC) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c $(OBJ)LinkList.c -o $(OBJ)LinkList.o
 
 $(OBJ)List.o: $(OBJ)List.c
-       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)List.c -o $(OBJ)List.o
+       $(CC) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c $(OBJ)List.c -o $(OBJ)List.o
 
 $(OBJ)Map.o: $(OBJ)Map.c
-       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)Map.c -o $(OBJ)Map.o
+       $(CC) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c $(OBJ)Map.c -o $(OBJ)Map.o
 
 $(OBJ)BinaryTree.o: $(OBJ)BinaryTree.c
-       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)BinaryTree.c -o $(OBJ)BinaryTree.o
+       $(CC) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c $(OBJ)BinaryTree.c -o $(OBJ)BinaryTree.o
 
 $(OBJ)BTNode.o: $(OBJ)BTNode.c
-       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)BTNode.c -o $(OBJ)BTNode.o
+       $(CC) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c $(OBJ)BTNode.c -o $(OBJ)BTNode.o
 
 $(OBJ)dataTypes.o: $(OBJ)dataTypes.c
-       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)dataTypes.c -o $(OBJ)dataTypes.o
+       $(CC) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c $(OBJ)dataTypes.c -o $(OBJ)dataTypes.o
 
 $(OBJ)instance.o: $(OBJ)instance.c
-       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)instance.c -o $(OBJ)instance.o
+       $(CC) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c $(OBJ)instance.c -o $(OBJ)instance.o
 
 $(OBJ)String.o: $(OBJ)String.c
-       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)String.c -o $(OBJ)String.o
+       $(CC) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c $(OBJ)String.c -o $(OBJ)String.o
 
 $(OBJ)OldList.o: $(OBJ)OldList.c
-       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)OldList.c -o $(OBJ)OldList.o
+       $(CC) $(CUSTOM1_CFLAGS) $(FVISIBILITY) -c $(OBJ)OldList.c -o $(OBJ)OldList.o
 
 $(OBJ)instance.c.o: src/com/instance.c
-       $(CC) -DECERE_COM_MODULE $(CFLAGS) -c src/com/instance.c -o $(OBJ)instance.c.o
+       $(CC) $(CUSTOM1_CFLAGS) -c src/com/instance.c -o $(OBJ)instance.c.o
 
 $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
        $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(OBJ)$(MODULE).main$(O)
 
 clean: objdir
-       $(call rmq,$(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S) $(TARGET))
-       $(call rmq,$(OBJECTS1))
-       $(call rmq,$(OBJECTS2))
-       $(call rmq,$(OBJECTS3))
+       $(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S) $(TARGET))
+       $(call rmq,$(_OBJECTS1))
+       $(call rmq,$(_OBJECTS2))
+       $(call rmq,$(ECOBJECTS1))
+       $(call rmq,$(ECOBJECTS2))
        $(call rmq,$(COBJECTS1))
        $(call rmq,$(COBJECTS2))
+       $(call rmq,$(BOWLS1))
+       $(call rmq,$(BOWLS2))
        $(call rmq,$(IMPORTS1))
        $(call rmq,$(IMPORTS2))
        $(call rmq,$(SYMBOLS1))
        $(call rmq,$(SYMBOLS2))
 
-realclean:
+realclean: clean
        $(call rmrq,$(OBJ))
 
 distclean: