buildsystem,ide,epj2make; sorted out platform variables and uses. now using HOST_PLAT...
[sdk] / ecere / Makefile.vanilla
index dc75443..4b1811b 100644 (file)
@@ -14,167 +14,643 @@ RES = res/
 TARGET = obj/$(CONFIG).$(PLATFORM)/$(LP)ecereVanilla$(A)
 
 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)BMPFormat.o $(OBJ)harfbuzz-arabic.o $(OBJ)harfbuzz-buffer.o \
-       $(OBJ)harfbuzz-gdef.o $(OBJ)harfbuzz-global.o $(OBJ)harfbuzz-gpos.o $(OBJ)harfbuzz-gsub.o \
-       $(OBJ)harfbuzz-hangul.o $(OBJ)harfbuzz-hebrew.o $(OBJ)harfbuzz-indic.o $(OBJ)harfbuzz-khmer.o \
-       $(OBJ)harfbuzz-myanmar.o $(OBJ)harfbuzz-open.o $(OBJ)harfbuzz-shaper.o $(OBJ)harfbuzz-stream.o \
-       $(OBJ)harfbuzz-tibetan.o $(if $(WINDOWS),$(OBJ)GDIDisplayDriver.o,) $(OBJ)lfbBlit.o $(OBJ)lfbConvert.o \
-       $(OBJ)LFBDisplayDriver.o $(if $(LINUX),$(OBJ)XDisplayDriver.o,) $(OBJ)Bitmap.o $(OBJ)BitmapResource.o \
-       $(OBJ)Color.o
-OBJECTS2 = $(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)ColorPicker.o $(OBJ)FileDialog.o \
-       $(OBJ)FindDialog.o $(OBJ)GoToDialog.o $(OBJ)MessageBox.o $(OBJ)ReplaceDialog.o $(OBJ)WindowList.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)Desktop3D.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
-OBJECTS3 = $(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)
+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_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)
+OBJECTS2 = \
+       $(if $(WINDOWS_TARGET),,$(OBJ)harfbuzz-shaper.o) \
+       $(if $(WINDOWS_TARGET),,$(OBJ)harfbuzz-stream.o) \
+       $(if $(WINDOWS_TARGET),,$(OBJ)harfbuzz-tibetan.o) \
+       $(if $(WINDOWS_TARGET),,$(OBJ)harfbuzz-impl.o) \
+       $(if $(WINDOWS_TARGET),,$(OBJ)harfbuzz-thai.o) \
+       $(if $(WINDOWS_TARGET),$(OBJ)GDIDisplayDriver.o,) \
+       $(OBJ)lfbBlit.o \
+       $(OBJ)lfbConvert.o \
+       $(OBJ)LFBDisplayDriver.o \
+       $(if $(or $(LINUX_TARGET),$(OSX_TARGET)),$(OBJ)NCursesDisplayDriver.o,) \
+       $(if $(OSX_TARGET),$(OBJ)CocoaOpenGLDisplayDriver.o,) \
+       $(if $(LINUX_TARGET),$(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)SelectorBar.o \
+       $(OBJ)ColorPicker.o \
+       $(OBJ)FileDialog.o \
+       $(OBJ)FindDialog.o \
+       $(OBJ)GoToDialog.o
+OBJECTS3 = \
+       $(OBJ)MessageBox.o \
+       $(OBJ)ReplaceDialog.o \
+       $(OBJ)WindowList.o \
+       $(if $(OSX_TARGET),$(OBJ)CocoaDispatch.o,) \
+       $(if $(OSX_TARGET),$(OBJ)CocoaEcereBridge.o,) \
+       $(if $(OSX_TARGET),$(OBJ)CocoaInterface.o,) \
+       $(if $(OSX_TARGET),$(OBJ)EcereView.o,) \
+       $(if $(or $(LINUX_TARGET),$(OSX_TARGET)),$(OBJ)NCursesInterface.o,) \
+       $(if $(WINDOWS_TARGET),$(OBJ)Win32Interface.o,) \
+       $(if $(or $(LINUX_TARGET),$(OSX_TARGET)),$(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)
 
 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)BMPFormat.c \
-       $(if $(WINDOWS),$(OBJ)GDIDisplayDriver.c,) $(OBJ)lfbBlit.c $(OBJ)lfbConvert.c $(OBJ)LFBDisplayDriver.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 \
-       $(OBJ)Stacker.c $(OBJ)ColorPicker.c $(OBJ)FileDialog.c
-COBJECTS2 = $(OBJ)FindDialog.c $(OBJ)GoToDialog.c $(OBJ)MessageBox.c $(OBJ)ReplaceDialog.c \
-       $(OBJ)WindowList.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)Desktop3D.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
-
-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)BMPFormat.sym \
-       $(if $(WINDOWS),$(OBJ)GDIDisplayDriver.sym,) $(OBJ)lfbBlit.sym $(OBJ)lfbConvert.sym $(OBJ)LFBDisplayDriver.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 $(OBJ)ProgressBar.sym $(OBJ)ScrollBar.sym \
-       $(OBJ)StatusBar.sym $(OBJ)Stacker.sym
-SYMBOLS2 = $(OBJ)ColorPicker.sym $(OBJ)FileDialog.sym $(OBJ)FindDialog.sym \
-       $(OBJ)GoToDialog.sym $(OBJ)MessageBox.sym $(OBJ)ReplaceDialog.sym $(OBJ)WindowList.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)Desktop3D.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
-
-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)BMPFormat.imp \
-       $(if $(WINDOWS),$(OBJ)GDIDisplayDriver.imp,) $(OBJ)lfbBlit.imp $(OBJ)lfbConvert.imp $(OBJ)LFBDisplayDriver.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 $(OBJ)ProgressBar.imp $(OBJ)ScrollBar.imp \
-       $(OBJ)StatusBar.imp $(OBJ)Stacker.imp
-IMPORTS2 = $(OBJ)ColorPicker.imp $(OBJ)FileDialog.imp $(OBJ)FindDialog.imp \
-       $(OBJ)GoToDialog.imp $(OBJ)MessageBox.imp $(OBJ)ReplaceDialog.imp $(OBJ)WindowList.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)Desktop3D.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)
-SOURCES1 = src/sys/Archive.ec src/sys/BufferedFile.ec src/sys/Date.ec src/sys/DualPipe.ec \
-       src/sys/EARArchive.ec src/sys/File.ec src/sys/FileMonitor.ec src/sys/GlobalAppSettings.ec \
-       src/sys/JSON.ec src/sys/JSONGlobalSettings.ec src/sys/memory.ec src/sys/Mutex.ec \
-       src/sys/Semaphore.ec src/sys/System.ec src/sys/TempFile.ec src/sys/Thread.ec 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/gfx/bitmaps/BMPFormat.ec src/gfx/drivers/harfbuzz/harfbuzz-arabic.c \
-       src/gfx/drivers/harfbuzz/harfbuzz-buffer.c src/gfx/drivers/harfbuzz/harfbuzz-gdef.c \
-       src/gfx/drivers/harfbuzz/harfbuzz-global.c src/gfx/drivers/harfbuzz/harfbuzz-gpos.c \
-       src/gfx/drivers/harfbuzz/harfbuzz-gsub.c src/gfx/drivers/harfbuzz/harfbuzz-hangul.c \
-       src/gfx/drivers/harfbuzz/harfbuzz-hebrew.c src/gfx/drivers/harfbuzz/harfbuzz-indic.c \
-       src/gfx/drivers/harfbuzz/harfbuzz-khmer.c src/gfx/drivers/harfbuzz/harfbuzz-myanmar.c \
-       src/gfx/drivers/harfbuzz/harfbuzz-open.c src/gfx/drivers/harfbuzz/harfbuzz-shaper.c \
-       src/gfx/drivers/harfbuzz/harfbuzz-stream.c src/gfx/drivers/harfbuzz/harfbuzz-tibetan.c \
-       $(if $(WINDOWS),src/gfx/drivers/GDIDisplayDriver.ec,) src/gfx/drivers/lfbBlit.ec src/gfx/drivers/lfbConvert.ec \
-       src/gfx/drivers/LFBDisplayDriver.ec $(if $(LINUX),src/gfx/drivers/XDisplayDriver.ec,) src/gfx/Bitmap.ec \
-       src/gfx/BitmapResource.ec src/gfx/Color.ec src/gfx/Display.ec src/gfx/DisplaySystem.ec \
-       src/gfx/FontResource.ec
-SOURCES2 = src/gfx/Resource.ec src/gfx/Surface.ec src/gui/controls/Button.ec \
-       src/gui/controls/CalendarControl.ec src/gui/controls/DataBox.ec src/gui/controls/DropBox.ec \
-       src/gui/controls/EditBox.ec src/gui/controls/Label.ec src/gui/controls/ListBox.ec \
-       src/gui/controls/Menu.ec src/gui/controls/Picture.ec src/gui/controls/ProgressBar.ec \
-       src/gui/controls/ScrollBar.ec src/gui/controls/StatusBar.ec src/gui/controls/Stacker.ec \
-       src/gui/dialogs/ColorPicker.ec src/gui/dialogs/FileDialog.ec src/gui/dialogs/FindDialog.ec \
-       src/gui/dialogs/GoToDialog.ec src/gui/dialogs/MessageBox.ec src/gui/dialogs/ReplaceDialog.ec \
-       src/gui/dialogs/WindowList.ec $(if $(WINDOWS),src/gui/drivers/Win32Interface.ec,) \
-       $(if $(or $(LINUX),$(OSX)),src/gui/drivers/XInterface.ec,) src/gui/skins/WindowsSkin.ec src/gui/Anchor.ec src/gui/ClipBoard.ec \
-       src/gui/Cursor.ec src/gui/Desktop3D.ec src/gui/FormDesigner.ec src/gui/GuiApplication.ec \
-       src/gui/Interface.ec src/gui/Key.ec src/gui/Skin.ec src/gui/Timer.ec src/gui/typeEdit.ec \
-       src/gui/Window.ec src/com/containers/Array.ec src/com/containers/AVLTree.ec \
-       src/com/containers/BuiltInContainer.ec src/com/containers/Container.ec src/com/containers/CustomAVLTree.ec \
-       src/com/containers/LinkList.ec src/com/containers/List.ec src/com/containers/Map.ec src/com/BinaryTree.ec \
-       src/com/BTNode.ec src/com/dataTypes.ec src/com/instance.ec src/com/String.ec src/com/OldList.ec \
+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_TARGET),$(OBJ)GDIDisplayDriver.c,) \
+       $(OBJ)lfbBlit.c \
+       $(OBJ)lfbConvert.c \
+       $(OBJ)LFBDisplayDriver.c \
+       $(if $(or $(LINUX_TARGET),$(OSX_TARGET)),$(OBJ)NCursesDisplayDriver.c,) \
+       $(if $(OSX_TARGET),$(OBJ)CocoaOpenGLDisplayDriver.c,) \
+       $(if $(LINUX_TARGET),$(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
+COBJECTS2 = \
+       $(OBJ)ScrollBar.c \
+       $(OBJ)StatusBar.c \
+       $(OBJ)Stacker.c \
+       $(OBJ)PathBox.c \
+       $(OBJ)ToolTip.c \
+       $(OBJ)SelectorBar.c \
+       $(OBJ)ColorPicker.c \
+       $(OBJ)FileDialog.c \
+       $(OBJ)FindDialog.c \
+       $(OBJ)GoToDialog.c \
+       $(OBJ)MessageBox.c \
+       $(OBJ)ReplaceDialog.c \
+       $(OBJ)WindowList.c \
+       $(if $(OSX_TARGET),$(OBJ)CocoaDispatch.c,) \
+       $(if $(OSX_TARGET),$(OBJ)CocoaInterface.c,) \
+       $(if $(or $(LINUX_TARGET),$(OSX_TARGET)),$(OBJ)NCursesInterface.c,) \
+       $(if $(WINDOWS_TARGET),$(OBJ)Win32Interface.c,) \
+       $(if $(or $(LINUX_TARGET),$(OSX_TARGET)),$(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
+
+SYMBOLS = $(SYMBOLS1) $(SYMBOLS2) $(SYMBOLS3)
+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_TARGET),$(OBJ)GDIDisplayDriver.sym,) \
+       $(OBJ)lfbBlit.sym \
+       $(OBJ)lfbConvert.sym \
+       $(OBJ)LFBDisplayDriver.sym \
+       $(if $(or $(LINUX_TARGET),$(OSX_TARGET)),$(OBJ)NCursesDisplayDriver.sym,) \
+       $(if $(OSX_TARGET),$(OBJ)CocoaOpenGLDisplayDriver.sym,) \
+       $(if $(LINUX_TARGET),$(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
+SYMBOLS2 = \
+       $(OBJ)Picture.sym \
+       $(OBJ)ProgressBar.sym \
+       $(OBJ)ScrollBar.sym \
+       $(OBJ)StatusBar.sym \
+       $(OBJ)Stacker.sym \
+       $(OBJ)PathBox.sym \
+       $(OBJ)ToolTip.sym \
+       $(OBJ)SelectorBar.sym \
+       $(OBJ)ColorPicker.sym \
+       $(OBJ)FileDialog.sym \
+       $(OBJ)FindDialog.sym \
+       $(OBJ)GoToDialog.sym \
+       $(OBJ)MessageBox.sym \
+       $(OBJ)ReplaceDialog.sym \
+       $(OBJ)WindowList.sym \
+       $(if $(OSX_TARGET),$(OBJ)CocoaDispatch.sym,) \
+       $(if $(OSX_TARGET),$(OBJ)CocoaInterface.sym,) \
+       $(if $(or $(LINUX_TARGET),$(OSX_TARGET)),$(OBJ)NCursesInterface.sym,) \
+       $(if $(WINDOWS_TARGET),$(OBJ)Win32Interface.sym,) \
+       $(if $(or $(LINUX_TARGET),$(OSX_TARGET)),$(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
+SYMBOLS3 = \
+       $(OBJ)dataTypes.sym \
+       $(OBJ)instance.sym \
+       $(OBJ)String.sym \
+       $(OBJ)OldList.sym
+
+IMPORTS = $(IMPORTS1) $(IMPORTS2) $(IMPORTS3)
+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_TARGET),$(OBJ)GDIDisplayDriver.imp,) \
+       $(OBJ)lfbBlit.imp \
+       $(OBJ)lfbConvert.imp \
+       $(OBJ)LFBDisplayDriver.imp \
+       $(if $(or $(LINUX_TARGET),$(OSX_TARGET)),$(OBJ)NCursesDisplayDriver.imp,) \
+       $(if $(OSX_TARGET),$(OBJ)CocoaOpenGLDisplayDriver.imp,) \
+       $(if $(LINUX_TARGET),$(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
+IMPORTS2 = \
+       $(OBJ)Picture.imp \
+       $(OBJ)ProgressBar.imp \
+       $(OBJ)ScrollBar.imp \
+       $(OBJ)StatusBar.imp \
+       $(OBJ)Stacker.imp \
+       $(OBJ)PathBox.imp \
+       $(OBJ)ToolTip.imp \
+       $(OBJ)SelectorBar.imp \
+       $(OBJ)ColorPicker.imp \
+       $(OBJ)FileDialog.imp \
+       $(OBJ)FindDialog.imp \
+       $(OBJ)GoToDialog.imp \
+       $(OBJ)MessageBox.imp \
+       $(OBJ)ReplaceDialog.imp \
+       $(OBJ)WindowList.imp \
+       $(if $(OSX_TARGET),$(OBJ)CocoaDispatch.imp,) \
+       $(if $(OSX_TARGET),$(OBJ)CocoaInterface.imp,) \
+       $(if $(or $(LINUX_TARGET),$(OSX_TARGET)),$(OBJ)NCursesInterface.imp,) \
+       $(if $(WINDOWS_TARGET),$(OBJ)Win32Interface.imp,) \
+       $(if $(or $(LINUX_TARGET),$(OSX_TARGET)),$(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
+IMPORTS3 = \
+       $(OBJ)dataTypes.imp \
+       $(OBJ)instance.imp \
+       $(OBJ)String.imp \
+       $(OBJ)OldList.imp
+
+SOURCES = $(SOURCES1) $(SOURCES2) $(SOURCES3)
+SOURCES1 = \
+       src/sys/Archive.ec \
+       src/sys/BufferedFile.ec \
+       src/sys/Date.ec \
+       src/sys/DualPipe.ec \
+       src/sys/EARArchive.ec \
+       src/sys/File.ec \
+       src/sys/FileMonitor.ec \
+       src/sys/GlobalAppSettings.ec \
+       src/sys/JSON.ec \
+       src/sys/JSONGlobalSettings.ec \
+       src/sys/memory.ec \
+       src/sys/Mutex.ec \
+       src/sys/Semaphore.ec \
+       src/sys/System.ec \
+       src/sys/TempFile.ec \
+       src/sys/Thread.ec \
+       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/gfx/bitmaps/BMPFormat.ec \
+       $(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)
+SOURCES2 = \
+       $(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 $(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_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 \
+       src/gfx/Display.ec \
+       src/gfx/DisplaySystem.ec \
+       src/gfx/FontResource.ec \
+       src/gfx/Resource.ec \
+       src/gfx/Surface.ec \
+       src/gui/controls/Button.ec \
+       src/gui/controls/CalendarControl.ec \
+       src/gui/controls/DataBox.ec \
+       src/gui/controls/DropBox.ec \
+       src/gui/controls/EditBox.ec \
+       src/gui/controls/Label.ec \
+       src/gui/controls/ListBox.ec \
+       src/gui/controls/Menu.ec \
+       src/gui/controls/Picture.ec \
+       src/gui/controls/ProgressBar.ec \
+       src/gui/controls/ScrollBar.ec \
+       src/gui/controls/StatusBar.ec \
+       src/gui/controls/Stacker.ec \
+       src/gui/controls/PathBox.ec \
+       src/gui/controls/ToolTip.ec \
+       src/gui/controls/SelectorBar.ec \
+       src/gui/dialogs/ColorPicker.ec \
+       src/gui/dialogs/FileDialog.ec \
+       src/gui/dialogs/FindDialog.ec \
+       src/gui/dialogs/GoToDialog.ec \
+       src/gui/dialogs/MessageBox.ec \
+       src/gui/dialogs/ReplaceDialog.ec
+SOURCES3 = \
+       src/gui/dialogs/WindowList.ec \
+       $(if $(OSX_TARGET),src/gui/drivers/cocoa/CocoaDispatch.ec,) \
+       $(if $(OSX_TARGET),src/gui/drivers/cocoa/CocoaEcereBridge.m,) \
+       $(if $(OSX_TARGET),src/gui/drivers/cocoa/CocoaInterface.ec,) \
+       $(if $(OSX_TARGET),src/gui/drivers/cocoa/EcereView.m,) \
+       $(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 \
+       src/gui/Cursor.ec \
+       src/gui/FormDesigner.ec \
+       src/gui/GuiApplication.ec \
+       src/gui/Interface.ec \
+       src/gui/Key.ec \
+       src/gui/Skin.ec \
+       src/gui/Timer.ec \
+       src/gui/typeEdit.ec \
+       src/gui/Window.ec \
+       src/com/containers/Array.ec \
+       src/com/containers/AVLTree.ec \
+       src/com/containers/BuiltInContainer.ec \
+       src/com/containers/Container.ec \
+       src/com/containers/CustomAVLTree.ec \
+       src/com/containers/LinkList.ec \
+       src/com/containers/List.ec \
+       src/com/containers/Map.ec \
+       src/com/BinaryTree.ec \
+       src/com/BTNode.ec \
+       src/com/dataTypes.ec \
+       src/com/instance.ec \
+       src/com/String.ec \
+       src/com/OldList.ec \
        src/com/instance.c
 
 RESOURCES = $(RESOURCES1) $(RESOURCES2) $(RESOURCES3)
-RESOURCES1 = $(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 $(RES)actions/windowNew.png $(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 \
-       $(RES)constructs/namespace.png $(RES)constructs/property.png $(RES)constructs/propertyPrivate.png \
-       $(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 \
-       $(RES)controls/optionBox.png $(RES)controls/progressBar.png $(RES)controls/scrollBarHorizontal.png \
-       $(RES)controls/scrollBarVertical.png $(RES)controls/statusBar.png $(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 \
-       $(RES)devices/computer.png $(RES)devices/driveHardDisk.png
-RESOURCES2 = $(RES)devices/driveRemovableMedia.png $(RES)devices/mediaFloppy.png \
-       $(RES)devices/mediaOptical.png $(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 \
-       $(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 $(RES)elements/orderDescending.png $(RES)emblems/unreadable.png \
-       $(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 $(RES)mimeTypes/textEcereHeader.png $(RES)mimeTypes/textEcereProject.png \
-       $(RES)mimeTypes/textEcereSource.png $(RES)mimeTypes/textEcereWorkspace.png \
-       $(RES)mimeTypes/textHyperTextMarkup.png $(RES)mimeTypes/brokenFile.png $(RES)places/driveRemote.png
-RESOURCES3 = $(RES)places/folder.png $(RES)places/folderRemote.png \
-       $(RES)places/networkServer.png $(RES)places/networkWorkgroup.png $(RES)places/brokenFolder.png \
-       $(RES)status/audioVolumeHigh.png $(RES)status/folderOpen.png $(RES)unicode/derivedGeneralCategoryStripped.txt
+RESOURCES1 = \
+       $(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 \
+       $(RES)actions/windowNew.png \
+       $(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 \
+       $(RES)constructs/namespace.png \
+       $(RES)constructs/property.png \
+       $(RES)constructs/propertyPrivate.png \
+       $(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 \
+       $(RES)controls/optionBox.png \
+       $(RES)controls/progressBar.png \
+       $(RES)controls/scrollBarHorizontal.png \
+       $(RES)controls/scrollBarVertical.png \
+       $(RES)controls/statusBar.png \
+       $(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 \
+       $(RES)devices/computer.png \
+       $(RES)devices/driveHardDisk.png
+RESOURCES2 = \
+       $(RES)devices/driveRemovableMedia.png \
+       $(RES)devices/mediaFloppy.png \
+       $(RES)devices/mediaOptical.png \
+       $(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 \
+       $(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 \
+       $(RES)elements/orderDescending.png \
+       $(RES)emblems/unreadable.png \
+       $(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 \
+       $(RES)mimeTypes/textEcereHeader.png \
+       $(RES)mimeTypes/textEcereProject.png \
+       $(RES)mimeTypes/textEcereSource.png \
+       $(RES)mimeTypes/textEcereWorkspace.png \
+       $(RES)mimeTypes/textHyperTextMarkup.png \
+       $(RES)mimeTypes/brokenFile.png \
+       $(RES)places/driveRemote.png
+RESOURCES3 = \
+       $(RES)places/folder.png \
+       $(RES)places/folderRemote.png \
+       $(RES)places/networkServer.png \
+       $(RES)places/networkWorkgroup.png \
+       $(RES)places/brokenFolder.png \
+       $(RES)status/audioVolumeHigh.png \
+       $(RES)status/folderOpen.png \
+       $(RES)unicode/derivedGeneralCategoryStripped.txt \
+       locale/zh_CN/LC_MESSAGES/ecere.mo
+
+ifndef DEBIAN_PACKAGE
+CFLAGS =
+endif
+OFLAGS =
 
 # CROSS-PLATFORM MAGIC
 
+include ../crossplatform.mk
 include ../include.mk
 
 # TOOLCHAIN
@@ -186,7 +662,7 @@ EAR := $(call psep,../obj/$(PLATFORM)/bin/ear)
 
 # FLAGS
 
-CFLAGS = -fmessage-length=0 -Os -m32 $(FPIC) -w \
+CFLAGS += -fmessage-length=0 -Os -m32 $(FPIC) -w \
         -DBUILDING_ECERE_COM -DECERE_STATIC -DECERE_VANILLA -DNOBLENDING \
         -Isrc/gfx/drivers/harfbuzz
 
@@ -199,13 +675,17 @@ LIBS = $(SHAREDLIB) $(EXECUTABLE) $(LINKOPT)
 UPXFLAGS = -9 -q
 
 # HARD CODED PLATFORM-SPECIFIC OPTIONS
-ifdef LINUX
+ifdef LINUX_TARGET
 OFLAGS += -Wl,--no-undefined
 endif
 
+ifdef OSX_TARGET
+OFLAGS += -framework cocoa -framework OpenGL
+endif
+
 # PLATFORM-SPECIFIC OPTIONS
 
-ifdef WINDOWS
+ifdef WINDOWS_TARGET
 
 CFLAGS += \
         -I../deps/DirectX-9.0/include \
@@ -213,17 +693,18 @@ CFLAGS += \
         -I../deps/libpng-1.4.0 \
         -I../deps/libungif-4.1.1/lib \
         -I../deps/zlib \
-        -I../deps/freetype-2.3.5/include
+        -I../deps/freetype-2.3.12/include \
+        -I../deps/glext
 
 else
-ifdef LINUX
+ifdef LINUX_TARGET
 
 CFLAGS += \
         -I/usr/include/freetype2 \
         -I../deps/libungif-4.1.1/lib
 
 else
-ifdef OSX
+ifdef OSX_TARGET
 
 CFLAGS += \
         -I/usr/include/freetype2 \
@@ -293,7 +774,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) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -DECERE_COM_MODULE -c src/sys/Mutex.ec -o $(OBJ)Mutex.sym
+       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(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
@@ -316,6 +797,9 @@ $(OBJ)unicode.sym: src/sys/unicode.ec
 $(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) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/sys/i18n.ec -o $(OBJ)i18n.sym
+
 $(OBJ)BMPFormat.sym: src/gfx/bitmaps/BMPFormat.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gfx/bitmaps/BMPFormat.ec -o $(OBJ)BMPFormat.sym
 
@@ -331,6 +815,12 @@ $(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
 
+$(OBJ)NCursesDisplayDriver.sym: src/gfx/drivers/NCursesDisplayDriver.ec
+       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gfx/drivers/NCursesDisplayDriver.ec -o $(OBJ)NCursesDisplayDriver.sym
+
+$(OBJ)CocoaOpenGLDisplayDriver.sym: src/gfx/drivers/CocoaOpenGLDisplayDriver.ec
+       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gfx/drivers/CocoaOpenGLDisplayDriver.ec -o $(OBJ)CocoaOpenGLDisplayDriver.sym
+
 $(OBJ)XDisplayDriver.sym: src/gfx/drivers/XDisplayDriver.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gfx/drivers/XDisplayDriver.ec -o $(OBJ)XDisplayDriver.sym
 
@@ -397,6 +887,15 @@ $(OBJ)StatusBar.sym: src/gui/controls/StatusBar.ec
 $(OBJ)Stacker.sym: src/gui/controls/Stacker.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gui/controls/Stacker.ec -o $(OBJ)Stacker.sym
 
+$(OBJ)PathBox.sym: src/gui/controls/PathBox.ec
+       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gui/controls/PathBox.ec -o $(OBJ)PathBox.sym
+
+$(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
 
@@ -418,6 +917,15 @@ $(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
 
+$(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
+
+$(OBJ)NCursesInterface.sym: src/gui/drivers/NCursesInterface.ec
+       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gui/drivers/NCursesInterface.ec -o $(OBJ)NCursesInterface.sym
+
 $(OBJ)Win32Interface.sym: src/gui/drivers/Win32Interface.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gui/drivers/Win32Interface.ec -o $(OBJ)Win32Interface.sym
 
@@ -436,9 +944,6 @@ $(OBJ)ClipBoard.sym: src/gui/ClipBoard.ec
 $(OBJ)Cursor.sym: src/gui/Cursor.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gui/Cursor.ec -o $(OBJ)Cursor.sym
 
-$(OBJ)Desktop3D.sym: src/gui/Desktop3D.ec
-       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gui/Desktop3D.ec -o $(OBJ)Desktop3D.sym
-
 $(OBJ)FormDesigner.sym: src/gui/FormDesigner.ec
        $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/gui/FormDesigner.ec -o $(OBJ)FormDesigner.sym
 
@@ -464,46 +969,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) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -DECERE_COM_MODULE -c src/com/containers/Array.ec -o $(OBJ)Array.sym
+       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/com/containers/Array.ec -o $(OBJ)Array.sym
 
 $(OBJ)AVLTree.sym: src/com/containers/AVLTree.ec
-       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -DECERE_COM_MODULE -c src/com/containers/AVLTree.ec -o $(OBJ)AVLTree.sym
+       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/com/containers/AVLTree.ec -o $(OBJ)AVLTree.sym
 
 $(OBJ)BuiltInContainer.sym: src/com/containers/BuiltInContainer.ec
-       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -DECERE_COM_MODULE -c src/com/containers/BuiltInContainer.ec -o $(OBJ)BuiltInContainer.sym
+       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/com/containers/BuiltInContainer.ec -o $(OBJ)BuiltInContainer.sym
 
 $(OBJ)Container.sym: src/com/containers/Container.ec
-       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -DECERE_COM_MODULE -c src/com/containers/Container.ec -o $(OBJ)Container.sym
+       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/com/containers/Container.ec -o $(OBJ)Container.sym
 
 $(OBJ)CustomAVLTree.sym: src/com/containers/CustomAVLTree.ec
-       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -DECERE_COM_MODULE -c src/com/containers/CustomAVLTree.ec -o $(OBJ)CustomAVLTree.sym
+       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/com/containers/CustomAVLTree.ec -o $(OBJ)CustomAVLTree.sym
 
 $(OBJ)LinkList.sym: src/com/containers/LinkList.ec
-       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -DECERE_COM_MODULE -c src/com/containers/LinkList.ec -o $(OBJ)LinkList.sym
+       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/com/containers/LinkList.ec -o $(OBJ)LinkList.sym
 
 $(OBJ)List.sym: src/com/containers/List.ec
-       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -DECERE_COM_MODULE -c src/com/containers/List.ec -o $(OBJ)List.sym
+       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/com/containers/List.ec -o $(OBJ)List.sym
 
 $(OBJ)Map.sym: src/com/containers/Map.ec
-       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -DECERE_COM_MODULE -c src/com/containers/Map.ec -o $(OBJ)Map.sym
+       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/com/containers/Map.ec -o $(OBJ)Map.sym
 
 $(OBJ)BinaryTree.sym: src/com/BinaryTree.ec
-       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -DECERE_COM_MODULE -c src/com/BinaryTree.ec -o $(OBJ)BinaryTree.sym
+       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/com/BinaryTree.ec -o $(OBJ)BinaryTree.sym
 
 $(OBJ)BTNode.sym: src/com/BTNode.ec
-       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -DECERE_COM_MODULE -c src/com/BTNode.ec -o $(OBJ)BTNode.sym
+       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/com/BTNode.ec -o $(OBJ)BTNode.sym
 
 $(OBJ)dataTypes.sym: src/com/dataTypes.ec
-       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -DECERE_COM_MODULE -c src/com/dataTypes.ec -o $(OBJ)dataTypes.sym
+       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/com/dataTypes.ec -o $(OBJ)dataTypes.sym
 
 $(OBJ)instance.sym: src/com/instance.ec
-       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -DECERE_COM_MODULE -c src/com/instance.ec -o $(OBJ)instance.sym
+       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/com/instance.ec -o $(OBJ)instance.sym
 
 $(OBJ)String.sym: src/com/String.ec
-       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -DECERE_COM_MODULE -c src/com/String.ec -o $(OBJ)String.sym
+       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/com/String.ec -o $(OBJ)String.sym
 
 $(OBJ)OldList.sym: src/com/OldList.ec
-       $(ECP) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -DECERE_COM_MODULE -c src/com/OldList.ec -o $(OBJ)OldList.sym
+       $(ECP) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) -c src/com/OldList.ec -o $(OBJ)OldList.sym
 
 # C OBJECT RULES
 
@@ -541,7 +1046,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) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -DECERE_COM_MODULE -c src/sys/Mutex.ec -o $(OBJ)Mutex.c -symbols $(OBJ)
+       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(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)
@@ -564,6 +1069,9 @@ $(OBJ)unicode.c: src/sys/unicode.ec $(OBJ)unicode.sym | $(SYMBOLS)
 $(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) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/sys/i18n.ec -o $(OBJ)i18n.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)
 
@@ -579,6 +1087,12 @@ $(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)
 
+$(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)
+
+$(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)
+
 $(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)
 
@@ -645,6 +1159,15 @@ $(OBJ)StatusBar.c: src/gui/controls/StatusBar.ec $(OBJ)StatusBar.sym | $(SYMBOLS
 $(OBJ)Stacker.c: src/gui/controls/Stacker.ec $(OBJ)Stacker.sym | $(SYMBOLS)
        $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/gui/controls/Stacker.ec -o $(OBJ)Stacker.c -symbols $(OBJ)
 
+$(OBJ)PathBox.c: src/gui/controls/PathBox.ec $(OBJ)PathBox.sym | $(SYMBOLS)
+       $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/gui/controls/PathBox.ec -o $(OBJ)PathBox.c -symbols $(OBJ)
+
+$(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)
 
@@ -666,6 +1189,15 @@ $(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)
 
+$(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)
+
+$(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)
+
 $(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)
 
@@ -684,9 +1216,6 @@ $(OBJ)ClipBoard.c: src/gui/ClipBoard.ec $(OBJ)ClipBoard.sym | $(SYMBOLS)
 $(OBJ)Cursor.c: src/gui/Cursor.ec $(OBJ)Cursor.sym | $(SYMBOLS)
        $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/gui/Cursor.ec -o $(OBJ)Cursor.c -symbols $(OBJ)
 
-$(OBJ)Desktop3D.c: src/gui/Desktop3D.ec $(OBJ)Desktop3D.sym | $(SYMBOLS)
-       $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/gui/Desktop3D.ec -o $(OBJ)Desktop3D.c -symbols $(OBJ)
-
 $(OBJ)FormDesigner.c: src/gui/FormDesigner.ec $(OBJ)FormDesigner.sym | $(SYMBOLS)
        $(ECC) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/gui/FormDesigner.ec -o $(OBJ)FormDesigner.c -symbols $(OBJ)
 
@@ -712,46 +1241,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) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -DECERE_COM_MODULE -c src/com/containers/Array.ec -o $(OBJ)Array.c -symbols $(OBJ)
+       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(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) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -DECERE_COM_MODULE -c src/com/containers/AVLTree.ec -o $(OBJ)AVLTree.c -symbols $(OBJ)
+       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(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) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -DECERE_COM_MODULE -c src/com/containers/BuiltInContainer.ec -o $(OBJ)BuiltInContainer.c -symbols $(OBJ)
+       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(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) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -DECERE_COM_MODULE -c src/com/containers/Container.ec -o $(OBJ)Container.c -symbols $(OBJ)
+       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(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) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -DECERE_COM_MODULE -c src/com/containers/CustomAVLTree.ec -o $(OBJ)CustomAVLTree.c -symbols $(OBJ)
+       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(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) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -DECERE_COM_MODULE -c src/com/containers/LinkList.ec -o $(OBJ)LinkList.c -symbols $(OBJ)
+       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(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) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -DECERE_COM_MODULE -c src/com/containers/List.ec -o $(OBJ)List.c -symbols $(OBJ)
+       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(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) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -DECERE_COM_MODULE -c src/com/containers/Map.ec -o $(OBJ)Map.c -symbols $(OBJ)
+       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(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) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -DECERE_COM_MODULE -c src/com/BinaryTree.ec -o $(OBJ)BinaryTree.c -symbols $(OBJ)
+       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(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) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -DECERE_COM_MODULE -c src/com/BTNode.ec -o $(OBJ)BTNode.c -symbols $(OBJ)
+       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(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) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -DECERE_COM_MODULE -c src/com/dataTypes.ec -o $(OBJ)dataTypes.c -symbols $(OBJ)
+       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(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) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -DECERE_COM_MODULE -c src/com/instance.ec -o $(OBJ)instance.c -symbols $(OBJ)
+       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(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) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -DECERE_COM_MODULE -c src/com/String.ec -o $(OBJ)String.c -symbols $(OBJ)
+       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(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) $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -DECERE_COM_MODULE -c src/com/OldList.ec -o $(OBJ)OldList.c -symbols $(OBJ)
+       $(ECC) -DECERE_COM_MODULE $(CECFLAGS) $(ECFLAGS) $(CFLAGS) $(FVISIBILITY) -c src/com/OldList.ec -o $(OBJ)OldList.c -symbols $(OBJ)
 
 # OBJECT RULES
 
@@ -789,7 +1318,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) $(CFLAGS) -DECERE_COM_MODULE $(FVISIBILITY) -c $(OBJ)Mutex.c -o $(OBJ)Mutex.o
+       $(CC) -DECERE_COM_MODULE $(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
@@ -821,9 +1350,21 @@ $(OBJ)DualPipe.c.o: src/sys/DualPipe.c
 $(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) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)i18n.c -o $(OBJ)i18n.o
+
 $(OBJ)BMPFormat.o: $(OBJ)BMPFormat.c
        $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)BMPFormat.c -o $(OBJ)BMPFormat.o
 
+$(OBJ)harfbuzz-freetype.o: src/gfx/drivers/harfbuzz/unicode/harfbuzz-freetype.c
+       $(CC) $(CFLAGS) -c src/gfx/drivers/harfbuzz/unicode/harfbuzz-freetype.c -o $(OBJ)harfbuzz-freetype.o
+
+$(OBJ)harfbuzz-unicode-tables.o: src/gfx/drivers/harfbuzz/unicode/harfbuzz-unicode-tables.c
+       $(CC) $(CFLAGS) -c src/gfx/drivers/harfbuzz/unicode/harfbuzz-unicode-tables.c -o $(OBJ)harfbuzz-unicode-tables.o
+
+$(OBJ)harfbuzz-unicode.o: src/gfx/drivers/harfbuzz/unicode/harfbuzz-unicode.c
+       $(CC) $(CFLAGS) -c src/gfx/drivers/harfbuzz/unicode/harfbuzz-unicode.c -o $(OBJ)harfbuzz-unicode.o
+
 $(OBJ)harfbuzz-arabic.o: src/gfx/drivers/harfbuzz/harfbuzz-arabic.c
        $(CC) $(CFLAGS) -c src/gfx/drivers/harfbuzz/harfbuzz-arabic.c -o $(OBJ)harfbuzz-arabic.o
 
@@ -833,9 +1374,6 @@ $(OBJ)harfbuzz-buffer.o: src/gfx/drivers/harfbuzz/harfbuzz-buffer.c
 $(OBJ)harfbuzz-gdef.o: src/gfx/drivers/harfbuzz/harfbuzz-gdef.c
        $(CC) $(CFLAGS) -c src/gfx/drivers/harfbuzz/harfbuzz-gdef.c -o $(OBJ)harfbuzz-gdef.o
 
-$(OBJ)harfbuzz-global.o: src/gfx/drivers/harfbuzz/harfbuzz-global.c
-       $(CC) $(CFLAGS) -c src/gfx/drivers/harfbuzz/harfbuzz-global.c -o $(OBJ)harfbuzz-global.o
-
 $(OBJ)harfbuzz-gpos.o: src/gfx/drivers/harfbuzz/harfbuzz-gpos.c
        $(CC) $(CFLAGS) -c src/gfx/drivers/harfbuzz/harfbuzz-gpos.c -o $(OBJ)harfbuzz-gpos.o
 
@@ -869,6 +1407,12 @@ $(OBJ)harfbuzz-stream.o: src/gfx/drivers/harfbuzz/harfbuzz-stream.c
 $(OBJ)harfbuzz-tibetan.o: src/gfx/drivers/harfbuzz/harfbuzz-tibetan.c
        $(CC) $(CFLAGS) -c src/gfx/drivers/harfbuzz/harfbuzz-tibetan.c -o $(OBJ)harfbuzz-tibetan.o
 
+$(OBJ)harfbuzz-impl.o: src/gfx/drivers/harfbuzz/harfbuzz-impl.c
+       $(CC) $(CFLAGS) -c src/gfx/drivers/harfbuzz/harfbuzz-impl.c -o $(OBJ)harfbuzz-impl.o
+
+$(OBJ)harfbuzz-thai.o: src/gfx/drivers/harfbuzz/harfbuzz-thai.c
+       $(CC) $(CFLAGS) -c src/gfx/drivers/harfbuzz/harfbuzz-thai.c -o $(OBJ)harfbuzz-thai.o
+
 $(OBJ)GDIDisplayDriver.o: $(OBJ)GDIDisplayDriver.c
        $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)GDIDisplayDriver.c -o $(OBJ)GDIDisplayDriver.o
 
@@ -881,6 +1425,12 @@ $(OBJ)lfbConvert.o: $(OBJ)lfbConvert.c
 $(OBJ)LFBDisplayDriver.o: $(OBJ)LFBDisplayDriver.c
        $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)LFBDisplayDriver.c -o $(OBJ)LFBDisplayDriver.o
 
+$(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
 
@@ -947,6 +1497,15 @@ $(OBJ)StatusBar.o: $(OBJ)StatusBar.c
 $(OBJ)Stacker.o: $(OBJ)Stacker.c
        $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)Stacker.c -o $(OBJ)Stacker.o
 
+$(OBJ)PathBox.o: $(OBJ)PathBox.c
+       $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)PathBox.c -o $(OBJ)PathBox.o
+
+$(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
 
@@ -968,6 +1527,21 @@ $(OBJ)ReplaceDialog.o: $(OBJ)ReplaceDialog.c
 $(OBJ)WindowList.o: $(OBJ)WindowList.c
        $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)WindowList.c -o $(OBJ)WindowList.o
 
+$(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
+
+$(OBJ)NCursesInterface.o: $(OBJ)NCursesInterface.c
+       $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)NCursesInterface.c -o $(OBJ)NCursesInterface.o
+
 $(OBJ)Win32Interface.o: $(OBJ)Win32Interface.c
        $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)Win32Interface.c -o $(OBJ)Win32Interface.o
 
@@ -986,9 +1560,6 @@ $(OBJ)ClipBoard.o: $(OBJ)ClipBoard.c
 $(OBJ)Cursor.o: $(OBJ)Cursor.c
        $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)Cursor.c -o $(OBJ)Cursor.o
 
-$(OBJ)Desktop3D.o: $(OBJ)Desktop3D.c
-       $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)Desktop3D.c -o $(OBJ)Desktop3D.o
-
 $(OBJ)FormDesigner.o: $(OBJ)FormDesigner.c
        $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)FormDesigner.c -o $(OBJ)FormDesigner.o
 
@@ -1014,49 +1585,49 @@ $(OBJ)Window.o: $(OBJ)Window.c
        $(CC) $(CFLAGS) $(FVISIBILITY) -c $(OBJ)Window.c -o $(OBJ)Window.o
 
 $(OBJ)Array.o: $(OBJ)Array.c
-       $(CC) $(CFLAGS) -DECERE_COM_MODULE $(FVISIBILITY) -c $(OBJ)Array.c -o $(OBJ)Array.o
+       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)Array.c -o $(OBJ)Array.o
 
 $(OBJ)AVLTree.o: $(OBJ)AVLTree.c
-       $(CC) $(CFLAGS) -DECERE_COM_MODULE $(FVISIBILITY) -c $(OBJ)AVLTree.c -o $(OBJ)AVLTree.o
+       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)AVLTree.c -o $(OBJ)AVLTree.o
 
 $(OBJ)BuiltInContainer.o: $(OBJ)BuiltInContainer.c
-       $(CC) $(CFLAGS) -DECERE_COM_MODULE $(FVISIBILITY) -c $(OBJ)BuiltInContainer.c -o $(OBJ)BuiltInContainer.o
+       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)BuiltInContainer.c -o $(OBJ)BuiltInContainer.o
 
 $(OBJ)Container.o: $(OBJ)Container.c
-       $(CC) $(CFLAGS) -DECERE_COM_MODULE $(FVISIBILITY) -c $(OBJ)Container.c -o $(OBJ)Container.o
+       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)Container.c -o $(OBJ)Container.o
 
 $(OBJ)CustomAVLTree.o: $(OBJ)CustomAVLTree.c
-       $(CC) $(CFLAGS) -DECERE_COM_MODULE $(FVISIBILITY) -c $(OBJ)CustomAVLTree.c -o $(OBJ)CustomAVLTree.o
+       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)CustomAVLTree.c -o $(OBJ)CustomAVLTree.o
 
 $(OBJ)LinkList.o: $(OBJ)LinkList.c
-       $(CC) $(CFLAGS) -DECERE_COM_MODULE $(FVISIBILITY) -c $(OBJ)LinkList.c -o $(OBJ)LinkList.o
+       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)LinkList.c -o $(OBJ)LinkList.o
 
 $(OBJ)List.o: $(OBJ)List.c
-       $(CC) $(CFLAGS) -DECERE_COM_MODULE $(FVISIBILITY) -c $(OBJ)List.c -o $(OBJ)List.o
+       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)List.c -o $(OBJ)List.o
 
 $(OBJ)Map.o: $(OBJ)Map.c
-       $(CC) $(CFLAGS) -DECERE_COM_MODULE $(FVISIBILITY) -c $(OBJ)Map.c -o $(OBJ)Map.o
+       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)Map.c -o $(OBJ)Map.o
 
 $(OBJ)BinaryTree.o: $(OBJ)BinaryTree.c
-       $(CC) $(CFLAGS) -DECERE_COM_MODULE $(FVISIBILITY) -c $(OBJ)BinaryTree.c -o $(OBJ)BinaryTree.o
+       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)BinaryTree.c -o $(OBJ)BinaryTree.o
 
 $(OBJ)BTNode.o: $(OBJ)BTNode.c
-       $(CC) $(CFLAGS) -DECERE_COM_MODULE $(FVISIBILITY) -c $(OBJ)BTNode.c -o $(OBJ)BTNode.o
+       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)BTNode.c -o $(OBJ)BTNode.o
 
 $(OBJ)dataTypes.o: $(OBJ)dataTypes.c
-       $(CC) $(CFLAGS) -DECERE_COM_MODULE $(FVISIBILITY) -c $(OBJ)dataTypes.c -o $(OBJ)dataTypes.o
+       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)dataTypes.c -o $(OBJ)dataTypes.o
 
 $(OBJ)instance.o: $(OBJ)instance.c
-       $(CC) $(CFLAGS) -DECERE_COM_MODULE $(FVISIBILITY) -c $(OBJ)instance.c -o $(OBJ)instance.o
+       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)instance.c -o $(OBJ)instance.o
 
 $(OBJ)String.o: $(OBJ)String.c
-       $(CC) $(CFLAGS) -DECERE_COM_MODULE $(FVISIBILITY) -c $(OBJ)String.c -o $(OBJ)String.o
+       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)String.c -o $(OBJ)String.o
 
 $(OBJ)OldList.o: $(OBJ)OldList.c
-       $(CC) $(CFLAGS) -DECERE_COM_MODULE $(FVISIBILITY) -c $(OBJ)OldList.c -o $(OBJ)OldList.o
+       $(CC) -DECERE_COM_MODULE $(CFLAGS) $(FVISIBILITY) -c $(OBJ)OldList.c -o $(OBJ)OldList.o
 
 $(OBJ)instance.c.o: src/com/instance.c
-       $(CC) $(CFLAGS) -DECERE_COM_MODULE -c src/com/instance.c -o $(OBJ)instance.c.o
+       $(CC) -DECERE_COM_MODULE $(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)
@@ -1070,8 +1641,10 @@ clean: objdir
        $(call rmq,$(COBJECTS2))
        $(call rmq,$(IMPORTS1))
        $(call rmq,$(IMPORTS2))
+       $(call rmq,$(IMPORTS3))
        $(call rmq,$(SYMBOLS1))
        $(call rmq,$(SYMBOLS2))
+       $(call rmq,$(SYMBOLS3))
 
 realclean:
        $(call rmrq,$(OBJ))