makefiles: single file per line for all file lists in all makefiles.

diff --git a/compiler/bootstrap/ecc/Makefile b/compiler/bootstrap/ecc/Makefile
index 063d587..d4766d4 100644 (file)
--- a/compiler/bootstrap/ecc/Makefile
+++ b/compiler/bootstrap/ecc/Makefile
@@ -15,9 +15,13 @@ CONSOLE =
 
 TARGET = obj/$(CONFIG).$(PLATFORM)/ecc$(E)
 
-OBJECTS = $(OBJ)ecc.o $(OBJ)$(MODULE).main$(O)
+OBJECTS = \
+       $(OBJ)ecc.o \
+       $(OBJ)$(MODULE).main$(O)
 
-SOURCES = bootstrap/ecc.c bootstrap/ecc.main.c
+SOURCES = \
+       bootstrap/ecc.c \
+       bootstrap/ecc.main.c
 
 # CROSS-PLATFORM MAGIC
 

diff --git a/compiler/bootstrap/ecere/Makefile b/compiler/bootstrap/ecere/Makefile
index d64c4d1..d1510b3 100644 (file)
--- a/compiler/bootstrap/ecere/Makefile
+++ b/compiler/bootstrap/ecere/Makefile
@@ -13,19 +13,60 @@ RES = res/
 
 TARGET = obj/$(CONFIG).$(PLATFORM)/$(LP)ecereBootstrap$(A)
 
-OBJECTS = $(OBJ)Array.o $(OBJ)AVLTree.o $(OBJ)BinaryTree.o $(OBJ)BTNode.o \
-       $(OBJ)BufferedFile.o $(OBJ)BuiltInContainer.o $(OBJ)Container.o $(OBJ)CustomAVLTree.o \
-       $(OBJ)dataTypes.o $(OBJ)DualPipe.o $(OBJ)ecere.main.o $(OBJ)File.o $(OBJ)instance.o \
-       $(OBJ)LinkList.o $(OBJ)List.o $(OBJ)Map.o $(OBJ)memory.o $(OBJ)OldList.o $(OBJ)String.o \
-       $(OBJ)System.o $(OBJ)TempFile.o $(OBJ)instance.c.o $(OBJ)DualPipe.c.o $(OBJ)File.c.o \
-       $(OBJ)System.c.o $(OBJ)i18n.o
-
-SOURCES = bootstrap/Array.c bootstrap/AVLTree.c bootstrap/BinaryTree.c bootstrap/i18n.c \
-       bootstrap/BTNode.c bootstrap/BufferedFile.c bootstrap/BuiltInContainer.c bootstrap/Container.c \
-       bootstrap/CustomAVLTree.c bootstrap/dataTypes.c bootstrap/DualPipe.c bootstrap/ecere.main.c \
-       bootstrap/File.c bootstrap/instance.c bootstrap/LinkList.c bootstrap/List.c bootstrap/Map.c \
-       bootstrap/memory.c bootstrap/OldList.c bootstrap/String.c bootstrap/System.c bootstrap/TempFile.c \
-       ../../../ecere/src/com/instance.c ../../../ecere/src/sys/DualPipe.c ../../../ecere/src/sys/File.c \
+OBJECTS = \
+       $(OBJ)Array.o \
+       $(OBJ)AVLTree.o \
+       $(OBJ)BinaryTree.o \
+       $(OBJ)BTNode.o \
+       $(OBJ)BufferedFile.o \
+       $(OBJ)BuiltInContainer.o \
+       $(OBJ)Container.o \
+       $(OBJ)CustomAVLTree.o \
+       $(OBJ)dataTypes.o \
+       $(OBJ)DualPipe.o \
+       $(OBJ)ecere.main.o \
+       $(OBJ)File.o \
+       $(OBJ)instance.o \
+       $(OBJ)LinkList.o \
+       $(OBJ)List.o \
+       $(OBJ)Map.o \
+       $(OBJ)memory.o \
+       $(OBJ)OldList.o \
+       $(OBJ)String.o \
+       $(OBJ)System.o \
+       $(OBJ)TempFile.o \
+       $(OBJ)instance.c.o \
+       $(OBJ)DualPipe.c.o \
+       $(OBJ)File.c.o \
+       $(OBJ)System.c.o \
+       $(OBJ)i18n.o
+
+SOURCES = \
+       bootstrap/Array.c \
+       bootstrap/AVLTree.c \
+       bootstrap/BinaryTree.c \
+       bootstrap/i18n.c \
+       bootstrap/BTNode.c \
+       bootstrap/BufferedFile.c \
+       bootstrap/BuiltInContainer.c \
+       bootstrap/Container.c \
+       bootstrap/CustomAVLTree.c \
+       bootstrap/dataTypes.c \
+       bootstrap/DualPipe.c \
+       bootstrap/ecere.main.c \
+       bootstrap/File.c \
+       bootstrap/instance.c \
+       bootstrap/LinkList.c \
+       bootstrap/List.c \
+       bootstrap/Map.c \
+       bootstrap/memory.c \
+       bootstrap/OldList.c \
+       bootstrap/String.c \
+       bootstrap/System.c \
+       bootstrap/TempFile.c \
+       ../../../ecere/src/com/instance.c \
+       ../../../ecere/src/sys/DualPipe.c \
+       ../../../ecere/src/sys/File.c \
        ../../../ecere/src/sys/System.c
 
 # CROSS-PLATFORM MAGIC

diff --git a/compiler/bootstrap/ecp/Makefile b/compiler/bootstrap/ecp/Makefile
index f03e620..37e05cd 100644 (file)
--- a/compiler/bootstrap/ecp/Makefile
+++ b/compiler/bootstrap/ecp/Makefile
@@ -15,9 +15,13 @@ CONSOLE =
 
 TARGET = obj/$(CONFIG).$(PLATFORM)/ecp$(E)
 
-OBJECTS = $(OBJ)ecp.o $(OBJ)$(MODULE).main$(O)
+OBJECTS = \
+       $(OBJ)ecp.o \
+       $(OBJ)$(MODULE).main$(O)
 
-SOURCES = bootstrap/ecp.c bootstrap/ecp.main.c
+SOURCES = \
+       bootstrap/ecp.c \
+       bootstrap/ecp.main.c
 
 # CROSS-PLATFORM MAGIC
 

diff --git a/compiler/bootstrap/ecs/Makefile b/compiler/bootstrap/ecs/Makefile
index d5ce937..96f028a 100644 (file)
--- a/compiler/bootstrap/ecs/Makefile
+++ b/compiler/bootstrap/ecs/Makefile
@@ -15,9 +15,13 @@ CONSOLE =
 
 TARGET = obj/$(CONFIG).$(PLATFORM)/ecs$(E)
 
-OBJECTS = $(OBJ)ecs.o $(OBJ)$(MODULE).main$(O)
+OBJECTS = \
+       $(OBJ)ecs.o \
+       $(OBJ)$(MODULE).main$(O)
 
-SOURCES = bootstrap/ecs.c bootstrap/ecs.main.c
+SOURCES = \
+       bootstrap/ecs.c \
+       bootstrap/ecs.main.c
 
 # CROSS-PLATFORM MAGIC
 

diff --git a/compiler/bootstrap/libec/Makefile b/compiler/bootstrap/libec/Makefile
index 3df26f7..26b85e9 100644 (file)
--- a/compiler/bootstrap/libec/Makefile
+++ b/compiler/bootstrap/libec/Makefile
@@ -13,16 +13,51 @@ RES =
 
 TARGET = obj/$(CONFIG).$(PLATFORM)/$(LP)ecBootstrap$(A)
 
-OBJECTS = $(OBJ)ast.o $(OBJ)copy.o $(OBJ)dbpass.o $(OBJ)ec.main.o $(OBJ)ecdefs.o \
-       $(OBJ)expression.o $(OBJ)firstPass.o $(OBJ)freeAst.o $(OBJ)grammar.o $(OBJ)lexer.o \
-       $(OBJ)loadSymbols.o $(OBJ)output.o $(OBJ)pass0.o $(OBJ)pass1.o $(OBJ)pass15.o $(OBJ)pass16.o \
-       $(OBJ)pass2.o $(OBJ)pass3.o $(OBJ)shortcuts.o $(OBJ)type.o $(OBJ)bsl.o
-
-SOURCES = bootstrap/ast.c bootstrap/copy.c bootstrap/dbpass.c bootstrap/ec.main.c \
-       bootstrap/ecdefs.c bootstrap/expression.c bootstrap/firstPass.c bootstrap/freeAst.c \
-       bootstrap/grammar.c bootstrap/lexer.c bootstrap/loadSymbols.c bootstrap/output.c bootstrap/pass0.c \
-       bootstrap/pass1.c bootstrap/pass15.c bootstrap/pass16.c bootstrap/pass2.c bootstrap/pass3.c \
-       bootstrap/shortcuts.c bootstrap/type.c ../bsl.c
+OBJECTS = \
+       $(OBJ)ast.o \
+       $(OBJ)copy.o \
+       $(OBJ)dbpass.o \
+       $(OBJ)ec.main.o \
+       $(OBJ)ecdefs.o \
+       $(OBJ)expression.o \
+       $(OBJ)firstPass.o \
+       $(OBJ)freeAst.o \
+       $(OBJ)grammar.o \
+       $(OBJ)lexer.o \
+       $(OBJ)loadSymbols.o \
+       $(OBJ)output.o \
+       $(OBJ)pass0.o \
+       $(OBJ)pass1.o \
+       $(OBJ)pass15.o \
+       $(OBJ)pass16.o \
+       $(OBJ)pass2.o \
+       $(OBJ)pass3.o \
+       $(OBJ)shortcuts.o \
+       $(OBJ)type.o \
+       $(OBJ)bsl.o
+
+SOURCES = \
+       bootstrap/ast.c \
+       bootstrap/copy.c \
+       bootstrap/dbpass.c \
+       bootstrap/ec.main.c \
+       bootstrap/ecdefs.c \
+       bootstrap/expression.c \
+       bootstrap/firstPass.c \
+       bootstrap/freeAst.c \
+       bootstrap/grammar.c \
+       bootstrap/lexer.c \
+       bootstrap/loadSymbols.c \
+       bootstrap/output.c \
+       bootstrap/pass0.c \
+       bootstrap/pass1.c \
+       bootstrap/pass15.c \
+       bootstrap/pass16.c \
+       bootstrap/pass2.c \
+       bootstrap/pass3.c \
+       bootstrap/shortcuts.c \
+       bootstrap/type.c \
+       ../bsl.c
 
 # CROSS-PLATFORM MAGIC
 

diff --git a/compiler/ecc/Makefile b/compiler/ecc/Makefile
index b5b78c0..e79dfa6 100644 (file)
--- a/compiler/ecc/Makefile
+++ b/compiler/ecc/Makefile
@@ -15,15 +15,21 @@ CONSOLE = -mconsole
 
 TARGET = obj/$(CONFIG).$(PLATFORM)/ecc$(E)
 
-OBJECTS = $(OBJ)ecc.o $(OBJ)$(MODULE).main$(O)
+OBJECTS = \
+       $(OBJ)ecc.o \
+       $(OBJ)$(MODULE).main$(O)
 
-COBJECTS = $(OBJ)ecc.c
+COBJECTS = \
+       $(OBJ)ecc.c
 
-SYMBOLS = $(OBJ)ecc.sym
+SYMBOLS = \
+       $(OBJ)ecc.sym
 
-IMPORTS = $(OBJ)ecc.imp
+IMPORTS = \
+       $(OBJ)ecc.imp
 
-SOURCES = ecc.ec
+SOURCES = \
+       ecc.ec
 
 RESOURCES =
 

diff --git a/compiler/ecp/Makefile b/compiler/ecp/Makefile
index 2fd8c5a..a005576 100644 (file)
--- a/compiler/ecp/Makefile
+++ b/compiler/ecp/Makefile
@@ -15,15 +15,21 @@ CONSOLE = -mconsole
 
 TARGET = obj/$(CONFIG).$(PLATFORM)/ecp$(E)
 
-OBJECTS = $(OBJ)ecp.o $(OBJ)$(MODULE).main$(O)
+OBJECTS = \
+       $(OBJ)ecp.o \
+       $(OBJ)$(MODULE).main$(O)
 
-COBJECTS = $(OBJ)ecp.c
+COBJECTS = \
+       $(OBJ)ecp.c
 
-SYMBOLS = $(OBJ)ecp.sym
+SYMBOLS = \
+       $(OBJ)ecp.sym
 
-IMPORTS = $(OBJ)ecp.imp
+IMPORTS = \
+       $(OBJ)ecp.imp
 
-SOURCES = ecp.ec
+SOURCES = \
+       ecp.ec
 
 RESOURCES =
 

diff --git a/compiler/ecs/Makefile b/compiler/ecs/Makefile
index 19ad2b2..3d4325f 100644 (file)
--- a/compiler/ecs/Makefile
+++ b/compiler/ecs/Makefile
@@ -15,15 +15,21 @@ CONSOLE = -mconsole
 
 TARGET = obj/$(CONFIG).$(PLATFORM)/ecs$(E)
 
-OBJECTS = $(OBJ)ecs.o $(OBJ)$(MODULE).main$(O)
+OBJECTS = \
+       $(OBJ)ecs.o \
+       $(OBJ)$(MODULE).main$(O)
 
-COBJECTS = $(OBJ)ecs.c
+COBJECTS = \
+       $(OBJ)ecs.c
 
-SYMBOLS = $(OBJ)ecs.sym
+SYMBOLS = \
+       $(OBJ)ecs.sym
 
-IMPORTS = $(OBJ)ecs.imp
+IMPORTS = \
+       $(OBJ)ecs.imp
 
-SOURCES = ecs.ec
+SOURCES = \
+       ecs.ec
 
 RESOURCES =
 

diff --git a/compiler/libec/Makefile b/compiler/libec/Makefile
index aba8ef8..197ee28 100644 (file)
--- a/compiler/libec/Makefile
+++ b/compiler/libec/Makefile
@@ -25,30 +25,112 @@ SONAME =
 endif
 
 # $(OBJ)bsl.o is added manually here
-OBJECTS = $(OBJ)ast.o $(OBJ)copy.o $(OBJ)dbpass.o $(OBJ)ecdefs.o $(OBJ)expression.o \
-       $(OBJ)firstPass.o $(OBJ)freeAst.o $(OBJ)grammar.o $(OBJ)lexer.o $(OBJ)loadSymbols.o \
-       $(OBJ)output.o $(OBJ)pass0.o $(OBJ)pass1.o $(OBJ)pass15.o $(OBJ)pass16.o $(OBJ)pass2.o \
-       $(OBJ)pass3.o $(OBJ)shortcuts.o $(OBJ)type.o $(OBJ)bsl.o $(OBJ)$(MODULE).main$(O)
-
-COBJECTS = $(OBJ)ast.c $(OBJ)copy.c $(OBJ)dbpass.c $(OBJ)ecdefs.c $(OBJ)expression.c \
-       $(OBJ)firstPass.c $(OBJ)freeAst.c $(OBJ)grammar.c $(OBJ)lexer.c $(OBJ)loadSymbols.c \
-       $(OBJ)output.c $(OBJ)pass0.c $(OBJ)pass1.c $(OBJ)pass15.c $(OBJ)pass16.c $(OBJ)pass2.c \
-       $(OBJ)pass3.c $(OBJ)shortcuts.c $(OBJ)type.c
-
-SYMBOLS = $(OBJ)ast.sym $(OBJ)copy.sym $(OBJ)dbpass.sym $(OBJ)ecdefs.sym \
-       $(OBJ)expression.sym $(OBJ)firstPass.sym $(OBJ)freeAst.sym $(OBJ)grammar.sym $(OBJ)lexer.sym \
-       $(OBJ)loadSymbols.sym $(OBJ)output.sym $(OBJ)pass0.sym $(OBJ)pass1.sym $(OBJ)pass15.sym \
-       $(OBJ)pass16.sym $(OBJ)pass2.sym $(OBJ)pass3.sym $(OBJ)shortcuts.sym $(OBJ)type.sym
-
-IMPORTS = $(OBJ)ast.imp $(OBJ)copy.imp $(OBJ)dbpass.imp $(OBJ)ecdefs.imp \
-       $(OBJ)expression.imp $(OBJ)firstPass.imp $(OBJ)freeAst.imp $(OBJ)grammar.imp $(OBJ)lexer.imp \
-       $(OBJ)loadSymbols.imp $(OBJ)output.imp $(OBJ)pass0.imp $(OBJ)pass1.imp $(OBJ)pass15.imp \
-       $(OBJ)pass16.imp $(OBJ)pass2.imp $(OBJ)pass3.imp $(OBJ)shortcuts.imp $(OBJ)type.imp
-
-SOURCES = src/ast.ec src/copy.ec src/dbpass.ec src/ecdefs.ec src/expression.ec \
-       src/firstPass.ec src/freeAst.ec src/grammar.ec src/lexer.ec src/loadSymbols.ec src/output.ec \
-       src/pass0.ec src/pass1.ec src/pass15.ec src/pass16.ec src/pass2.ec src/pass3.ec \
-       src/shortcuts.ec src/type.ec
+OBJECTS = \
+       $(OBJ)ast.o \
+       $(OBJ)copy.o \
+       $(OBJ)dbpass.o \
+       $(OBJ)ecdefs.o \
+       $(OBJ)expression.o \
+       $(OBJ)firstPass.o \
+       $(OBJ)freeAst.o \
+       $(OBJ)grammar.o \
+       $(OBJ)lexer.o \
+       $(OBJ)loadSymbols.o \
+       $(OBJ)output.o \
+       $(OBJ)pass0.o \
+       $(OBJ)pass1.o \
+       $(OBJ)pass15.o \
+       $(OBJ)pass16.o \
+       $(OBJ)pass2.o \
+       $(OBJ)pass3.o \
+       $(OBJ)shortcuts.o \
+       $(OBJ)type.o \
+       $(OBJ)bsl.o \
+       $(OBJ)$(MODULE).main$(O)
+
+COBJECTS = \
+       $(OBJ)ast.c \
+       $(OBJ)copy.c \
+       $(OBJ)dbpass.c \
+       $(OBJ)ecdefs.c \
+       $(OBJ)expression.c \
+       $(OBJ)firstPass.c \
+       $(OBJ)freeAst.c \
+       $(OBJ)grammar.c \
+       $(OBJ)lexer.c \
+       $(OBJ)loadSymbols.c \
+       $(OBJ)output.c \
+       $(OBJ)pass0.c \
+       $(OBJ)pass1.c \
+       $(OBJ)pass15.c \
+       $(OBJ)pass16.c \
+       $(OBJ)pass2.c \
+       $(OBJ)pass3.c \
+       $(OBJ)shortcuts.c \
+       $(OBJ)type.c
+
+SYMBOLS = \
+       $(OBJ)ast.sym \
+       $(OBJ)copy.sym \
+       $(OBJ)dbpass.sym \
+       $(OBJ)ecdefs.sym \
+       $(OBJ)expression.sym \
+       $(OBJ)firstPass.sym \
+       $(OBJ)freeAst.sym \
+       $(OBJ)grammar.sym \
+       $(OBJ)lexer.sym \
+       $(OBJ)loadSymbols.sym \
+       $(OBJ)output.sym \
+       $(OBJ)pass0.sym \
+       $(OBJ)pass1.sym \
+       $(OBJ)pass15.sym \
+       $(OBJ)pass16.sym \
+       $(OBJ)pass2.sym \
+       $(OBJ)pass3.sym \
+       $(OBJ)shortcuts.sym \
+       $(OBJ)type.sym
+
+IMPORTS = \
+       $(OBJ)ast.imp \
+       $(OBJ)copy.imp \
+       $(OBJ)dbpass.imp \
+       $(OBJ)ecdefs.imp \
+       $(OBJ)expression.imp \
+       $(OBJ)firstPass.imp \
+       $(OBJ)freeAst.imp \
+       $(OBJ)grammar.imp \
+       $(OBJ)lexer.imp \
+       $(OBJ)loadSymbols.imp \
+       $(OBJ)output.imp \
+       $(OBJ)pass0.imp \
+       $(OBJ)pass1.imp \
+       $(OBJ)pass15.imp \
+       $(OBJ)pass16.imp \
+       $(OBJ)pass2.imp \
+       $(OBJ)pass3.imp \
+       $(OBJ)shortcuts.imp \
+       $(OBJ)type.imp
+
+SOURCES = \
+       src/ast.ec \
+       src/copy.ec \
+       src/dbpass.ec \
+       src/ecdefs.ec \
+       src/expression.ec \
+       src/firstPass.ec \
+       src/freeAst.ec \
+       src/grammar.ec \
+       src/lexer.ec \
+       src/loadSymbols.ec \
+       src/output.ec \
+       src/pass0.ec \
+       src/pass1.ec \
+       src/pass15.ec \
+       src/pass16.ec \
+       src/pass2.ec \
+       src/pass3.ec \
+       src/shortcuts.ec \
+       src/type.ec
 
 RESOURCES =
 

diff --git a/deps/freetype-2.3.12/Makefile b/deps/freetype-2.3.12/Makefile
index eee84ef..252564e 100644 (file)
--- a/deps/freetype-2.3.12/Makefile
+++ b/deps/freetype-2.3.12/Makefile
@@ -13,14 +13,51 @@ RES =
 
 TARGET = obj/$(CONFIG).$(PLATFORM)/$(LP)freetype$(A)
 
-OBJECTS = $(OBJ)afglobal.o $(OBJ)afindic.o $(OBJ)autofit.o $(OBJ)ftapi.o $(OBJ)ftbase.o \
-       $(OBJ)ftbbox.o $(OBJ)ftbdf.o $(OBJ)ftbitmap.o $(OBJ)ftdebug.o $(OBJ)ftgasp.o $(OBJ)ftglyph.o \
-       $(OBJ)ftgxval.o $(OBJ)ftinit.o $(OBJ)ftlcdfil.o $(OBJ)ftmm.o $(OBJ)ftotval.o $(OBJ)ftpatent.o \
-       $(OBJ)ftpfr.o $(OBJ)ftstroke.o $(OBJ)ftsynth.o $(OBJ)ftsystem.o $(OBJ)fttype1.o \
-       $(OBJ)ftwinfnt.o $(OBJ)ftxf86.o $(OBJ)bdf.o $(OBJ)ftcache.o $(OBJ)cff.o $(OBJ)type1cid.o \
-       $(OBJ)gxvalid.o $(OBJ)ftgzip.o $(OBJ)ftlzw.o $(OBJ)otvalid.o $(OBJ)pcf.o $(OBJ)pfr.o \
-       $(OBJ)psaux.o $(OBJ)pshinter.o $(OBJ)psnames.o $(OBJ)raster.o $(OBJ)sfnt.o $(OBJ)smooth.o \
-       $(OBJ)truetype.o $(OBJ)type1.o $(OBJ)type42.o $(OBJ)winfnt.o
+OBJECTS = \
+       $(OBJ)afglobal.o \
+       $(OBJ)afindic.o \
+       $(OBJ)autofit.o \
+       $(OBJ)ftapi.o \
+       $(OBJ)ftbase.o \
+       $(OBJ)ftbbox.o \
+       $(OBJ)ftbdf.o \
+       $(OBJ)ftbitmap.o \
+       $(OBJ)ftdebug.o \
+       $(OBJ)ftgasp.o \
+       $(OBJ)ftglyph.o \
+       $(OBJ)ftgxval.o \
+       $(OBJ)ftinit.o \
+       $(OBJ)ftlcdfil.o \
+       $(OBJ)ftmm.o \
+       $(OBJ)ftotval.o \
+       $(OBJ)ftpatent.o \
+       $(OBJ)ftpfr.o \
+       $(OBJ)ftstroke.o \
+       $(OBJ)ftsynth.o \
+       $(OBJ)ftsystem.o \
+       $(OBJ)fttype1.o \
+       $(OBJ)ftwinfnt.o \
+       $(OBJ)ftxf86.o \
+       $(OBJ)bdf.o \
+       $(OBJ)ftcache.o \
+       $(OBJ)cff.o \
+       $(OBJ)type1cid.o \
+       $(OBJ)gxvalid.o \
+       $(OBJ)ftgzip.o \
+       $(OBJ)ftlzw.o \
+       $(OBJ)otvalid.o \
+       $(OBJ)pcf.o \
+       $(OBJ)pfr.o \
+       $(OBJ)psaux.o \
+       $(OBJ)pshinter.o \
+       $(OBJ)psnames.o \
+       $(OBJ)raster.o \
+       $(OBJ)sfnt.o \
+       $(OBJ)smooth.o \
+       $(OBJ)truetype.o \
+       $(OBJ)type1.o \
+       $(OBJ)type42.o \
+       $(OBJ)winfnt.o
 
 COBJECTS =
 
@@ -28,16 +65,51 @@ SYMBOLS =
 
 IMPORTS =
 
-SOURCES = src/autofit/afglobal.c src/autofit/afindic.c src/autofit/autofit.c \
-       src/base/ftapi.c src/base/ftbase.c src/base/ftbbox.c src/base/ftbdf.c src/base/ftbitmap.c \
-       src/base/ftdebug.c src/base/ftgasp.c src/base/ftglyph.c src/base/ftgxval.c src/base/ftinit.c \
-       src/base/ftlcdfil.c src/base/ftmm.c src/base/ftotval.c src/base/ftpatent.c src/base/ftpfr.c \
-       src/base/ftstroke.c src/base/ftsynth.c src/base/ftsystem.c src/base/fttype1.c src/base/ftwinfnt.c \
-       src/base/ftxf86.c src/bdf/bdf.c src/cache/ftcache.c src/cff/cff.c src/cid/type1cid.c \
-       src/gxvalid/gxvalid.c src/gzip/ftgzip.c src/lzw/ftlzw.c src/otvalid/otvalid.c src/pcf/pcf.c \
-       src/pfr/pfr.c src/psaux/psaux.c src/pshinter/pshinter.c src/psnames/psnames.c \
-       src/raster/raster.c src/sfnt/sfnt.c src/smooth/smooth.c src/truetype/truetype.c src/type1/type1.c \
-       src/type42/type42.c src/winfonts/winfnt.c
+SOURCES = \
+       src/autofit/afglobal.c \
+       src/autofit/afindic.c \
+       src/autofit/autofit.c \
+       src/base/ftapi.c \
+       src/base/ftbase.c \
+       src/base/ftbbox.c \
+       src/base/ftbdf.c \
+       src/base/ftbitmap.c \
+       src/base/ftdebug.c \
+       src/base/ftgasp.c \
+       src/base/ftglyph.c \
+       src/base/ftgxval.c \
+       src/base/ftinit.c \
+       src/base/ftlcdfil.c \
+       src/base/ftmm.c \
+       src/base/ftotval.c \
+       src/base/ftpatent.c \
+       src/base/ftpfr.c \
+       src/base/ftstroke.c \
+       src/base/ftsynth.c \
+       src/base/ftsystem.c \
+       src/base/fttype1.c \
+       src/base/ftwinfnt.c \
+       src/base/ftxf86.c \
+       src/bdf/bdf.c \
+       src/cache/ftcache.c \
+       src/cff/cff.c \
+       src/cid/type1cid.c \
+       src/gxvalid/gxvalid.c \
+       src/gzip/ftgzip.c \
+       src/lzw/ftlzw.c \
+       src/otvalid/otvalid.c \
+       src/pcf/pcf.c \
+       src/pfr/pfr.c \
+       src/psaux/psaux.c \
+       src/pshinter/pshinter.c \
+       src/psnames/psnames.c \
+       src/raster/raster.c \
+       src/sfnt/sfnt.c \
+       src/smooth/smooth.c \
+       src/truetype/truetype.c \
+       src/type1/type1.c \
+       src/type42/type42.c \
+       src/winfonts/winfnt.c
 
 RESOURCES =
 

diff --git a/deps/jpeg-6b/Makefile b/deps/jpeg-6b/Makefile
index 86f1029..5d2365e 100644 (file)
--- a/deps/jpeg-6b/Makefile
+++ b/deps/jpeg-6b/Makefile
@@ -13,16 +13,56 @@ RES =
 
 TARGET = obj/$(CONFIG).$(PLATFORM)/$(LP)jpeg$(A)
 
-OBJECTS = $(OBJ)jcapimin.o $(OBJ)jcapistd.o $(OBJ)jccoefct.o $(OBJ)jccolor.o \
-       $(OBJ)jcdctmgr.o $(OBJ)jchuff.o $(OBJ)jcinit.o $(OBJ)jcmainct.o $(OBJ)jcmarker.o \
-       $(OBJ)jcmaster.o $(OBJ)jcomapi.o $(OBJ)jcparam.o $(OBJ)jcphuff.o $(OBJ)jcprepct.o \
-       $(OBJ)jcsample.o $(OBJ)jctrans.o $(OBJ)jdapimin.o $(OBJ)jdapistd.o $(OBJ)jdatadst.o \
-       $(OBJ)jdatasrc.o $(OBJ)jdcoefct.o $(OBJ)jdcolor.o $(OBJ)jddctmgr.o $(OBJ)jdhuff.o \
-       $(OBJ)jdinput.o $(OBJ)jdmainct.o $(OBJ)jdmarker.o $(OBJ)jdmaster.o $(OBJ)jdmerge.o \
-       $(OBJ)jdphuff.o $(OBJ)jdpostct.o $(OBJ)jdsample.o $(OBJ)jdtrans.o $(OBJ)jerror.o \
-       $(OBJ)jfdctflt.o $(OBJ)jfdctfst.o $(OBJ)jfdctint.o $(OBJ)jidctflt.o $(OBJ)jidctfst.o \
-       $(OBJ)jidctint.o $(OBJ)jidctred.o $(OBJ)jmemansi.o $(OBJ)jmemmgr.o $(OBJ)jmemname.o \
-       $(OBJ)jmemnobs.o $(OBJ)jquant1.o $(OBJ)jquant2.o $(OBJ)jutils.o $(OBJ)transupp.o
+OBJECTS = \
+       $(OBJ)jcapimin.o \
+       $(OBJ)jcapistd.o \
+       $(OBJ)jccoefct.o \
+       $(OBJ)jccolor.o \
+       $(OBJ)jcdctmgr.o \
+       $(OBJ)jchuff.o \
+       $(OBJ)jcinit.o \
+       $(OBJ)jcmainct.o \
+       $(OBJ)jcmarker.o \
+       $(OBJ)jcmaster.o \
+       $(OBJ)jcomapi.o \
+       $(OBJ)jcparam.o \
+       $(OBJ)jcphuff.o \
+       $(OBJ)jcprepct.o \
+       $(OBJ)jcsample.o \
+       $(OBJ)jctrans.o \
+       $(OBJ)jdapimin.o \
+       $(OBJ)jdapistd.o \
+       $(OBJ)jdatadst.o \
+       $(OBJ)jdatasrc.o \
+       $(OBJ)jdcoefct.o \
+       $(OBJ)jdcolor.o \
+       $(OBJ)jddctmgr.o \
+       $(OBJ)jdhuff.o \
+       $(OBJ)jdinput.o \
+       $(OBJ)jdmainct.o \
+       $(OBJ)jdmarker.o \
+       $(OBJ)jdmaster.o \
+       $(OBJ)jdmerge.o \
+       $(OBJ)jdphuff.o \
+       $(OBJ)jdpostct.o \
+       $(OBJ)jdsample.o \
+       $(OBJ)jdtrans.o \
+       $(OBJ)jerror.o \
+       $(OBJ)jfdctflt.o \
+       $(OBJ)jfdctfst.o \
+       $(OBJ)jfdctint.o \
+       $(OBJ)jidctflt.o \
+       $(OBJ)jidctfst.o \
+       $(OBJ)jidctint.o \
+       $(OBJ)jidctred.o \
+       $(OBJ)jmemansi.o \
+       $(OBJ)jmemmgr.o \
+       $(OBJ)jmemname.o \
+       $(OBJ)jmemnobs.o \
+       $(OBJ)jquant1.o \
+       $(OBJ)jquant2.o \
+       $(OBJ)jutils.o \
+       $(OBJ)transupp.o
 
 COBJECTS =
 
@@ -30,12 +70,56 @@ SYMBOLS =
 
 IMPORTS =
 
-SOURCES = jcapimin.c jcapistd.c jccoefct.c jccolor.c jcdctmgr.c jchuff.c jcinit.c jcmainct.c \
-       jcmarker.c jcmaster.c jcomapi.c jcparam.c jcphuff.c jcprepct.c jcsample.c jctrans.c \
-       jdapimin.c jdapistd.c jdatadst.c jdatasrc.c jdcoefct.c jdcolor.c jddctmgr.c jdhuff.c \
-       jdinput.c jdmainct.c jdmarker.c jdmaster.c jdmerge.c jdphuff.c jdpostct.c jdsample.c \
-       jdtrans.c jerror.c jfdctflt.c jfdctfst.c jfdctint.c jidctflt.c jidctfst.c jidctint.c \
-       jidctred.c jmemansi.c jmemmgr.c jmemname.c jmemnobs.c jquant1.c jquant2.c jutils.c transupp.c
+SOURCES = \
+       jcapimin.c \
+       jcapistd.c \
+       jccoefct.c \
+       jccolor.c \
+       jcdctmgr.c \
+       jchuff.c \
+       jcinit.c \
+       jcmainct.c \
+       jcmarker.c \
+       jcmaster.c \
+       jcomapi.c \
+       jcparam.c \
+       jcphuff.c \
+       jcprepct.c \
+       jcsample.c \
+       jctrans.c \
+       jdapimin.c \
+       jdapistd.c \
+       jdatadst.c \
+       jdatasrc.c \
+       jdcoefct.c \
+       jdcolor.c \
+       jddctmgr.c \
+       jdhuff.c \
+       jdinput.c \
+       jdmainct.c \
+       jdmarker.c \
+       jdmaster.c \
+       jdmerge.c \
+       jdphuff.c \
+       jdpostct.c \
+       jdsample.c \
+       jdtrans.c \
+       jerror.c \
+       jfdctflt.c \
+       jfdctfst.c \
+       jfdctint.c \
+       jidctflt.c \
+       jidctfst.c \
+       jidctint.c \
+       jidctred.c \
+       jmemansi.c \
+       jmemmgr.c \
+       jmemname.c \
+       jmemnobs.c \
+       jquant1.c \
+       jquant2.c \
+       jutils.c \
+       transupp.c
 
 RESOURCES =
 

diff --git a/deps/libpng-1.4.0/Makefile b/deps/libpng-1.4.0/Makefile
index 1f3ac5a..d7101d1 100644 (file)
--- a/deps/libpng-1.4.0/Makefile
+++ b/deps/libpng-1.4.0/Makefile
@@ -13,9 +13,22 @@ RES =
 
 TARGET = obj/$(CONFIG).$(PLATFORM)/$(LP)png$(A)
 
-OBJECTS = $(OBJ)png.o $(OBJ)pngerror.o $(OBJ)pngget.o $(OBJ)pngmem.o $(OBJ)pngpread.o \
-       $(OBJ)pngread.o $(OBJ)pngrio.o $(OBJ)pngrtran.o $(OBJ)pngrutil.o $(OBJ)pngset.o \
-       $(OBJ)pngtrans.o $(OBJ)pngwio.o $(OBJ)pngwrite.o $(OBJ)pngwtran.o $(OBJ)pngwutil.o
+OBJECTS = \
+       $(OBJ)png.o \
+       $(OBJ)pngerror.o \
+       $(OBJ)pngget.o \
+       $(OBJ)pngmem.o \
+       $(OBJ)pngpread.o \
+       $(OBJ)pngread.o \
+       $(OBJ)pngrio.o \
+       $(OBJ)pngrtran.o \
+       $(OBJ)pngrutil.o \
+       $(OBJ)pngset.o \
+       $(OBJ)pngtrans.o \
+       $(OBJ)pngwio.o \
+       $(OBJ)pngwrite.o \
+       $(OBJ)pngwtran.o \
+       $(OBJ)pngwutil.o
 
 COBJECTS =
 
@@ -23,8 +36,21 @@ SYMBOLS =
 
 IMPORTS =
 
-SOURCES = ./png.c ./pngerror.c ./pngget.c ./pngmem.c ./pngpread.c ./pngread.c ./pngrio.c \
-       ./pngrtran.c ./pngrutil.c ./pngset.c ./pngtrans.c ./pngwio.c ./pngwrite.c ./pngwtran.c \
+SOURCES = \
+       ./png.c \
+       ./pngerror.c \
+       ./pngget.c \
+       ./pngmem.c \
+       ./pngpread.c \
+       ./pngread.c \
+       ./pngrio.c \
+       ./pngrtran.c \
+       ./pngrutil.c \
+       ./pngset.c \
+       ./pngtrans.c \
+       ./pngwio.c \
+       ./pngwrite.c \
+       ./pngwtran.c \
        ./pngwutil.c
 
 RESOURCES =

diff --git a/deps/libungif-4.1.1/Makefile b/deps/libungif-4.1.1/Makefile
index a7dffaa..97b7b9b 100644 (file)
--- a/deps/libungif-4.1.1/Makefile
+++ b/deps/libungif-4.1.1/Makefile
@@ -13,7 +13,10 @@ RES =
 
 TARGET = obj/$(CONFIG).$(PLATFORM)/$(LP)ungif$(A)
 
-OBJECTS = $(OBJ)dgif_lib.o $(OBJ)gif_err.o $(OBJ)gifalloc.o
+OBJECTS = \
+       $(OBJ)dgif_lib.o \
+       $(OBJ)gif_err.o \
+       $(OBJ)gifalloc.o
 
 COBJECTS =
 
@@ -21,7 +24,10 @@ SYMBOLS =
 
 IMPORTS =
 
-SOURCES = lib/dgif_lib.c lib/gif_err.c lib/gifalloc.c
+SOURCES = \
+       lib/dgif_lib.c \
+       lib/gif_err.c \
+       lib/gifalloc.c
 
 RESOURCES =
 

diff --git a/deps/zlib/Makefile b/deps/zlib/Makefile
index 5d3881f..9c1d080 100644 (file)
--- a/deps/zlib/Makefile
+++ b/deps/zlib/Makefile
@@ -13,8 +13,18 @@ RES =
 
 TARGET = obj/$(CONFIG).$(PLATFORM)/$(LP)z$(A)
 
-OBJECTS = $(OBJ)adler32.o $(OBJ)compress.o $(OBJ)crc32.o $(OBJ)deflate.o $(OBJ)gzio.o \
-       $(OBJ)infback.o $(OBJ)inffast.o $(OBJ)inflate.o $(OBJ)inftrees.o $(OBJ)trees.o $(OBJ)uncompr.o \
+OBJECTS = \
+       $(OBJ)adler32.o \
+       $(OBJ)compress.o \
+       $(OBJ)crc32.o \
+       $(OBJ)deflate.o \
+       $(OBJ)gzio.o \
+       $(OBJ)infback.o \
+       $(OBJ)inffast.o \
+       $(OBJ)inflate.o \
+       $(OBJ)inftrees.o \
+       $(OBJ)trees.o \
+       $(OBJ)uncompr.o \
        $(OBJ)zutil.o
 
 COBJECTS =
@@ -23,8 +33,19 @@ SYMBOLS =
 
 IMPORTS =
 
-SOURCES = adler32.c compress.c crc32.c deflate.c gzio.c infback.c inffast.c inflate.c \
-       inftrees.c trees.c uncompr.c zutil.c
+SOURCES = \
+       adler32.c \
+       compress.c \
+       crc32.c \
+       deflate.c \
+       gzio.c \
+       infback.c \
+       inffast.c \
+       inflate.c \
+       inftrees.c \
+       trees.c \
+       uncompr.c \
+       zutil.c
 
 RESOURCES =
 

diff --git a/documentor/Makefile b/documentor/Makefile
index c874572..5a36446 100644 (file)
--- a/documentor/Makefile
+++ b/documentor/Makefile
@@ -15,27 +15,64 @@ CONSOLE = -mwindows
 
 TARGET = obj/$(CONFIG).$(PLATFORM)/documentor$(E)
 
-OBJECTS = $(OBJ)htmlParser.o $(OBJ)HTMLView.o $(OBJ)lines.o $(OBJ)tables.o \
-       $(OBJ)IDESettings.o $(OBJ)OldIDESettings.o $(OBJ)StringsBox.o $(OBJ)Documentor.o \
-       $(OBJ)SettingsDialog.o $(OBJ)$(MODULE).main$(O)
-
-COBJECTS = $(OBJ)htmlParser.c $(OBJ)HTMLView.c $(OBJ)lines.c $(OBJ)tables.c \
-       $(OBJ)IDESettings.c $(OBJ)OldIDESettings.c $(OBJ)StringsBox.c $(OBJ)Documentor.c \
+OBJECTS = \
+       $(OBJ)htmlParser.o \
+       $(OBJ)HTMLView.o \
+       $(OBJ)lines.o \
+       $(OBJ)tables.o \
+       $(OBJ)IDESettings.o \
+       $(OBJ)OldIDESettings.o \
+       $(OBJ)StringsBox.o \
+       $(OBJ)Documentor.o \
+       $(OBJ)SettingsDialog.o \
+       $(OBJ)$(MODULE).main$(O)
+
+COBJECTS = \
+       $(OBJ)htmlParser.c \
+       $(OBJ)HTMLView.c \
+       $(OBJ)lines.c \
+       $(OBJ)tables.c \
+       $(OBJ)IDESettings.c \
+       $(OBJ)OldIDESettings.c \
+       $(OBJ)StringsBox.c \
+       $(OBJ)Documentor.c \
        $(OBJ)SettingsDialog.c
 
-SYMBOLS = $(OBJ)htmlParser.sym $(OBJ)HTMLView.sym $(OBJ)lines.sym $(OBJ)tables.sym \
-       $(OBJ)IDESettings.sym $(OBJ)OldIDESettings.sym $(OBJ)StringsBox.sym $(OBJ)Documentor.sym \
+SYMBOLS = \
+       $(OBJ)htmlParser.sym \
+       $(OBJ)HTMLView.sym \
+       $(OBJ)lines.sym \
+       $(OBJ)tables.sym \
+       $(OBJ)IDESettings.sym \
+       $(OBJ)OldIDESettings.sym \
+       $(OBJ)StringsBox.sym \
+       $(OBJ)Documentor.sym \
        $(OBJ)SettingsDialog.sym
 
-IMPORTS = $(OBJ)htmlParser.imp $(OBJ)HTMLView.imp $(OBJ)lines.imp $(OBJ)tables.imp \
-       $(OBJ)IDESettings.imp $(OBJ)OldIDESettings.imp $(OBJ)StringsBox.imp $(OBJ)Documentor.imp \
+IMPORTS = \
+       $(OBJ)htmlParser.imp \
+       $(OBJ)HTMLView.imp \
+       $(OBJ)lines.imp \
+       $(OBJ)tables.imp \
+       $(OBJ)IDESettings.imp \
+       $(OBJ)OldIDESettings.imp \
+       $(OBJ)StringsBox.imp \
+       $(OBJ)Documentor.imp \
        $(OBJ)SettingsDialog.imp
 
-SOURCES = ../extras/html/htmlParser.ec ../extras/html/HTMLView.ec \
-       ../extras/html/lines.ec ../extras/html/tables.ec ../ide/src/IDESettings.ec \
-       ../ide/src/OldIDESettings.ec ../extras/gui/controls/StringsBox.ec src/Documentor.ec src/SettingsDialog.ec
-
-RESOURCES = locale/zh_CN/LC_MESSAGES/documentor.mo
+SOURCES = \
+       ../extras/html/htmlParser.ec \
+       ../extras/html/HTMLView.ec \
+       ../extras/html/lines.ec \
+       ../extras/html/tables.ec \
+       ../ide/src/IDESettings.ec \
+       ../ide/src/OldIDESettings.ec \
+       ../extras/gui/controls/StringsBox.ec \
+       src/Documentor.ec \
+       src/SettingsDialog.ec
+
+RESOURCES = \
+       locale/zh_CN/LC_MESSAGES/documentor.mo
 
 # CROSS-PLATFORM MAGIC
 

diff --git a/ear/cmd/Makefile b/ear/cmd/Makefile
index b63316d..4579e8b 100644 (file)
--- a/ear/cmd/Makefile
+++ b/ear/cmd/Makefile
@@ -15,17 +15,24 @@ CONSOLE = -mconsole
 
 TARGET = obj/$(CONFIG).$(PLATFORM)/ear$(E)
 
-OBJECTS = $(OBJ)ear.o $(OBJ)$(MODULE).main$(O)
+OBJECTS = \
+       $(OBJ)ear.o \
+       $(OBJ)$(MODULE).main$(O)
 
-COBJECTS = $(OBJ)ear.c
+COBJECTS = \
+       $(OBJ)ear.c
 
-SYMBOLS = $(OBJ)ear.sym
+SYMBOLS = \
+       $(OBJ)ear.sym
 
-IMPORTS = $(OBJ)ear.imp
+IMPORTS = \
+       $(OBJ)ear.imp
 
-SOURCES = ear.ec
+SOURCES = \
+       ear.ec
 
-RESOURCES = ../extract/obj/release.$(PLATFORM)/extract$(E)
+RESOURCES = \
+       ../extract/obj/release.$(PLATFORM)/extract$(E)
 
 # CROSS-PLATFORM MAGIC
 

diff --git a/ear/extract/Makefile b/ear/extract/Makefile
index d4c07c9..800a80c 100644 (file)
--- a/ear/extract/Makefile
+++ b/ear/extract/Makefile
@@ -15,29 +15,48 @@ CONSOLE = -mwindows
 
 TARGET = obj/$(CONFIG).$(PLATFORM)/extract$(E)
 
-OBJECTS = $(OBJ)extract.o $(OBJ)$(MODULE).main$(O)
-
-COBJECTS = $(OBJ)extract.c
-
-SYMBOLS = $(OBJ)extract.sym
-
-IMPORTS = $(OBJ)extract.imp
-
-SOURCES = extract.ec
-
-RESOURCES = ../../ecere/res/vanilla/ecere/actions/folderNew.png \
-       ../../ecere/res/vanilla/ecere/actions/goUp.png ../../ecere/res/vanilla/ecere/devices/computer.png \
-       ../../ecere/res/vanilla/ecere/devices/driveHardDisk.png ../../ecere/res/vanilla/ecere/devices/driveRemovableMedia.png \
-       ../../ecere/res/vanilla/ecere/devices/mediaFloppy.png ../../ecere/res/vanilla/ecere/devices/mediaOptical.png \
-       ../../ecere/res/vanilla/ecere/elements/areaClose.png ../../ecere/res/vanilla/ecere/elements/areaMaximize.png \
-       ../../ecere/res/vanilla/ecere/elements/areaMinimize.png ../../ecere/res/vanilla/ecere/elements/areaRestore.png \
-       ../../ecere/res/vanilla/ecere/elements/arrowDown.png ../../ecere/res/vanilla/ecere/elements/arrowLeft.png \
-       ../../ecere/res/vanilla/ecere/elements/arrowRight.png ../../ecere/res/vanilla/ecere/elements/arrowUp.png \
-       ../../ecere/res/vanilla/ecere/elements/optionBoxDisabledSelected.png ../../ecere/res/vanilla/ecere/elements/optionBoxDown.png \
-       ../../ecere/res/vanilla/ecere/elements/optionBoxSelected.png ../../ecere/res/vanilla/ecere/elements/optionBoxSelectedDown.png \
-       ../../ecere/res/vanilla/ecere/elements/optionBoxUp.png ../../ecere/res/vanilla/ecere/places/driveRemote.png \
-       ../../ecere/res/vanilla/ecere/places/folder.png ../../ecere/res/vanilla/ecere/places/folderRemote.png \
-       ../../ecere/res/vanilla/ecere/places/networkServer.png ../../ecere/res/vanilla/ecere/places/networkWorkgroup.png \
+OBJECTS = \
+       $(OBJ)extract.o \
+       $(OBJ)$(MODULE).main$(O)
+
+COBJECTS = \
+       $(OBJ)extract.c
+
+SYMBOLS = \
+       $(OBJ)extract.sym
+
+IMPORTS = \
+       $(OBJ)extract.imp
+
+SOURCES = \
+       extract.ec
+
+RESOURCES = \
+       ../../ecere/res/vanilla/ecere/actions/folderNew.png \
+       ../../ecere/res/vanilla/ecere/actions/goUp.png \
+       ../../ecere/res/vanilla/ecere/devices/computer.png \
+       ../../ecere/res/vanilla/ecere/devices/driveHardDisk.png \
+       ../../ecere/res/vanilla/ecere/devices/driveRemovableMedia.png \
+       ../../ecere/res/vanilla/ecere/devices/mediaFloppy.png \
+       ../../ecere/res/vanilla/ecere/devices/mediaOptical.png \
+       ../../ecere/res/vanilla/ecere/elements/areaClose.png \
+       ../../ecere/res/vanilla/ecere/elements/areaMaximize.png \
+       ../../ecere/res/vanilla/ecere/elements/areaMinimize.png \
+       ../../ecere/res/vanilla/ecere/elements/areaRestore.png \
+       ../../ecere/res/vanilla/ecere/elements/arrowDown.png \
+       ../../ecere/res/vanilla/ecere/elements/arrowLeft.png \
+       ../../ecere/res/vanilla/ecere/elements/arrowRight.png \
+       ../../ecere/res/vanilla/ecere/elements/arrowUp.png \
+       ../../ecere/res/vanilla/ecere/elements/optionBoxDisabledSelected.png \
+       ../../ecere/res/vanilla/ecere/elements/optionBoxDown.png \
+       ../../ecere/res/vanilla/ecere/elements/optionBoxSelected.png \
+       ../../ecere/res/vanilla/ecere/elements/optionBoxSelectedDown.png \
+       ../../ecere/res/vanilla/ecere/elements/optionBoxUp.png \
+       ../../ecere/res/vanilla/ecere/places/driveRemote.png \
+       ../../ecere/res/vanilla/ecere/places/folder.png \
+       ../../ecere/res/vanilla/ecere/places/folderRemote.png \
+       ../../ecere/res/vanilla/ecere/places/networkServer.png \
+       ../../ecere/res/vanilla/ecere/places/networkWorkgroup.png \
        ../../ecere/res/vanilla/ecere/status/folderOpen.png
 
 # CROSS-PLATFORM MAGIC

diff --git a/ecere/Makefile b/ecere/Makefile
index 009b2d0..6255757 100644 (file)
--- a/ecere/Makefile
+++ b/ecere/Makefile
@@ -24,225 +24,777 @@ SONAME =
 endif
 
 OBJECTS = $(OBJECTS1) $(OBJECTS2) $(OBJECTS3) $(OBJECTS4)
-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)Cube.o $(OBJ)SkyBox.o $(OBJ)Sphere.o $(OBJ)Object3DSFormat.o \
-       $(OBJ)Camera.o $(OBJ)Matrix.o $(OBJ)Mesh.o $(OBJ)Object.o $(OBJ)Plane.o $(OBJ)Quaternion.o \
-       $(OBJ)Vector3D.o $(OBJ)BMPFormat.o $(OBJ)GIFFormat.o $(OBJ)JPEGFormat.o $(OBJ)PCXFormat.o \
-       $(OBJ)PNGFormat.o $(OBJ)RGBFormat.o $(OBJ)harfbuzz-freetype.o $(OBJ)harfbuzz-unicode-tables.o \
-       $(OBJ)harfbuzz-unicode.o $(OBJ)harfbuzz-arabic.o $(OBJ)harfbuzz-buffer.o $(OBJ)harfbuzz-gdef.o \
-       $(OBJ)harfbuzz-gpos.o $(OBJ)harfbuzz-gsub.o $(OBJ)harfbuzz-hangul.o
-OBJECTS2 = $(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 $(OBJ)harfbuzz-impl.o $(OBJ)harfbuzz-thai.o \
-       $(if $(WINDOWS),$(OBJ)Direct3D8DisplayDriver.o,) $(if $(WINDOWS),$(OBJ)Direct3D9DisplayDriver.o,) \
-       $(if $(WINDOWS),$(OBJ)DirectDrawDisplayDriver.o,) $(if $(WINDOWS),$(OBJ)GDIDisplayDriver.o,) $(OBJ)lfbBlit.o $(OBJ)lfbConvert.o \
-       $(OBJ)LFBDisplayDriver.o $(if $(or $(LINUX),$(OSX)),$(OBJ)NCursesDisplayDriver.o,) \
-       $(OBJ)OpenGLDisplayDriver.o $(if $(WINDOWS),$(OBJ)Win32BitmapPrinterDisplayDriver.o,) \
-       $(if $(WINDOWS),$(OBJ)Win32ConsoleDisplayDriver.o,) $(if $(WINDOWS),$(OBJ)Win32PrinterDisplayDriver.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
-OBJECTS3 = $(OBJ)ListBox.o $(OBJ)Menu.o $(OBJ)Picture.o $(OBJ)ProgressBar.o \
-       $(OBJ)ScrollBar.o $(OBJ)StatusBar.o $(OBJ)TabControl.o $(OBJ)PaneSplitter.o $(OBJ)Stacker.o \
-       $(OBJ)PathBox.o $(OBJ)ColorPicker.o $(OBJ)FileDialog.o $(OBJ)FindDialog.o $(OBJ)GoToDialog.o \
-       $(OBJ)MessageBox.o $(OBJ)ReplaceDialog.o $(OBJ)WindowList.o \
-       $(if $(or $(LINUX),$(OSX)),$(OBJ)NCursesInterface.o,) $(if $(WINDOWS),$(OBJ)Win32Interface.o,) \
-       $(if $(WINDOWS),$(OBJ)Win32ConsoleInterface.o,) $(if $(or $(LINUX),$(OSX)),$(OBJ)XInterface.o,) $(OBJ)TVisionSkin.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)dcom.o $(OBJ)HTTPFile.o $(OBJ)network.o \
-       $(OBJ)NetworkClientFile.o $(OBJ)Service.o $(OBJ)Socket.o $(OBJ)Array.o $(OBJ)AVLTree.o \
-       $(OBJ)BuiltInContainer.o $(OBJ)Container.o
-OBJECTS4 = $(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)
+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)Cube.o \
+       $(OBJ)SkyBox.o \
+       $(OBJ)Sphere.o \
+       $(OBJ)Object3DSFormat.o \
+       $(OBJ)Camera.o \
+       $(OBJ)Matrix.o \
+       $(OBJ)Mesh.o \
+       $(OBJ)Object.o \
+       $(OBJ)Plane.o \
+       $(OBJ)Quaternion.o \
+       $(OBJ)Vector3D.o \
+       $(OBJ)BMPFormat.o \
+       $(OBJ)GIFFormat.o \
+       $(OBJ)JPEGFormat.o \
+       $(OBJ)PCXFormat.o \
+       $(OBJ)PNGFormat.o \
+       $(OBJ)RGBFormat.o \
+       $(OBJ)harfbuzz-freetype.o \
+       $(OBJ)harfbuzz-unicode-tables.o \
+       $(OBJ)harfbuzz-unicode.o \
+       $(OBJ)harfbuzz-arabic.o \
+       $(OBJ)harfbuzz-buffer.o \
+       $(OBJ)harfbuzz-gdef.o \
+       $(OBJ)harfbuzz-gpos.o \
+       $(OBJ)harfbuzz-gsub.o \
+       $(OBJ)harfbuzz-hangul.o
+OBJECTS2 = \
+       $(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 \
+       $(OBJ)harfbuzz-impl.o \
+       $(OBJ)harfbuzz-thai.o \
+       $(if $(WINDOWS),$(OBJ)Direct3D8DisplayDriver.o,) \
+       $(if $(WINDOWS),$(OBJ)Direct3D9DisplayDriver.o,) \
+       $(if $(WINDOWS),$(OBJ)DirectDrawDisplayDriver.o,) \
+       $(if $(WINDOWS),$(OBJ)GDIDisplayDriver.o,) \
+       $(OBJ)lfbBlit.o \
+       $(OBJ)lfbConvert.o \
+       $(OBJ)LFBDisplayDriver.o \
+       $(if $(or $(LINUX),$(OSX)),$(OBJ)NCursesDisplayDriver.o,) \
+       $(OBJ)OpenGLDisplayDriver.o \
+       $(if $(WINDOWS),$(OBJ)Win32BitmapPrinterDisplayDriver.o,) \
+       $(if $(WINDOWS),$(OBJ)Win32ConsoleDisplayDriver.o,) \
+       $(if $(WINDOWS),$(OBJ)Win32PrinterDisplayDriver.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
+OBJECTS3 = \
+       $(OBJ)ListBox.o \
+       $(OBJ)Menu.o \
+       $(OBJ)Picture.o \
+       $(OBJ)ProgressBar.o \
+       $(OBJ)ScrollBar.o \
+       $(OBJ)StatusBar.o \
+       $(OBJ)TabControl.o \
+       $(OBJ)PaneSplitter.o \
+       $(OBJ)Stacker.o \
+       $(OBJ)PathBox.o \
+       $(OBJ)ColorPicker.o \
+       $(OBJ)FileDialog.o \
+       $(OBJ)FindDialog.o \
+       $(OBJ)GoToDialog.o \
+       $(OBJ)MessageBox.o \
+       $(OBJ)ReplaceDialog.o \
+       $(OBJ)WindowList.o \
+       $(if $(or $(LINUX),$(OSX)),$(OBJ)NCursesInterface.o,) \
+       $(if $(WINDOWS),$(OBJ)Win32Interface.o,) \
+       $(if $(WINDOWS),$(OBJ)Win32ConsoleInterface.o,) \
+       $(if $(or $(LINUX),$(OSX)),$(OBJ)XInterface.o,) \
+       $(OBJ)TVisionSkin.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)dcom.o \
+       $(OBJ)HTTPFile.o \
+       $(OBJ)network.o \
+       $(OBJ)NetworkClientFile.o \
+       $(OBJ)Service.o \
+       $(OBJ)Socket.o \
+       $(OBJ)Array.o \
+       $(OBJ)AVLTree.o \
+       $(OBJ)BuiltInContainer.o \
+       $(OBJ)Container.o
+OBJECTS4 = \
+       $(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) $(COBJECTS3)
-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)Cube.c \
-       $(OBJ)SkyBox.c $(OBJ)Sphere.c $(OBJ)Object3DSFormat.c $(OBJ)Camera.c $(OBJ)Matrix.c \
-       $(OBJ)Mesh.c $(OBJ)Object.c $(OBJ)Plane.c $(OBJ)Quaternion.c $(OBJ)Vector3D.c \
-       $(OBJ)BMPFormat.c $(OBJ)GIFFormat.c $(OBJ)JPEGFormat.c $(OBJ)PCXFormat.c $(OBJ)PNGFormat.c \
-       $(OBJ)RGBFormat.c $(if $(WINDOWS),$(OBJ)Direct3D8DisplayDriver.c,) \
-       $(if $(WINDOWS),$(OBJ)Direct3D9DisplayDriver.c,) $(if $(WINDOWS),$(OBJ)DirectDrawDisplayDriver.c,) \
-       $(if $(WINDOWS),$(OBJ)GDIDisplayDriver.c,) $(OBJ)lfbBlit.c $(OBJ)lfbConvert.c $(OBJ)LFBDisplayDriver.c \
+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)Cube.c \
+       $(OBJ)SkyBox.c \
+       $(OBJ)Sphere.c \
+       $(OBJ)Object3DSFormat.c \
+       $(OBJ)Camera.c \
+       $(OBJ)Matrix.c \
+       $(OBJ)Mesh.c \
+       $(OBJ)Object.c \
+       $(OBJ)Plane.c \
+       $(OBJ)Quaternion.c \
+       $(OBJ)Vector3D.c \
+       $(OBJ)BMPFormat.c \
+       $(OBJ)GIFFormat.c \
+       $(OBJ)JPEGFormat.c \
+       $(OBJ)PCXFormat.c \
+       $(OBJ)PNGFormat.c \
+       $(OBJ)RGBFormat.c \
+       $(if $(WINDOWS),$(OBJ)Direct3D8DisplayDriver.c,) \
+       $(if $(WINDOWS),$(OBJ)Direct3D9DisplayDriver.c,) \
+       $(if $(WINDOWS),$(OBJ)DirectDrawDisplayDriver.c,) \
+       $(if $(WINDOWS),$(OBJ)GDIDisplayDriver.c,) \
+       $(OBJ)lfbBlit.c \
+       $(OBJ)lfbConvert.c \
+       $(OBJ)LFBDisplayDriver.c \
        $(if $(or $(LINUX),$(OSX)),$(OBJ)NCursesDisplayDriver.c,)
-COBJECTS2 = $(OBJ)OpenGLDisplayDriver.c \
-       $(if $(WINDOWS),$(OBJ)Win32BitmapPrinterDisplayDriver.c,) $(if $(WINDOWS),$(OBJ)Win32ConsoleDisplayDriver.c,) \
-       $(if $(WINDOWS),$(OBJ)Win32PrinterDisplayDriver.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)TabControl.c $(OBJ)PaneSplitter.c $(OBJ)Stacker.c \
-       $(OBJ)PathBox.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 $(WINDOWS),$(OBJ)Win32ConsoleInterface.c,) $(if $(or $(LINUX),$(OSX)),$(OBJ)XInterface.c,)
-COBJECTS3 = $(OBJ)TVisionSkin.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)dcom.c $(OBJ)HTTPFile.c $(OBJ)network.c $(OBJ)NetworkClientFile.c $(OBJ)Service.c \
-       $(OBJ)Socket.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
+COBJECTS2 = \
+       $(OBJ)OpenGLDisplayDriver.c \
+       $(if $(WINDOWS),$(OBJ)Win32BitmapPrinterDisplayDriver.c,) \
+       $(if $(WINDOWS),$(OBJ)Win32ConsoleDisplayDriver.c,) \
+       $(if $(WINDOWS),$(OBJ)Win32PrinterDisplayDriver.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)TabControl.c \
+       $(OBJ)PaneSplitter.c \
+       $(OBJ)Stacker.c \
+       $(OBJ)PathBox.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 $(WINDOWS),$(OBJ)Win32ConsoleInterface.c,) \
+       $(if $(or $(LINUX),$(OSX)),$(OBJ)XInterface.c,)
+COBJECTS3 = \
+       $(OBJ)TVisionSkin.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)dcom.c \
+       $(OBJ)HTTPFile.c \
+       $(OBJ)network.c \
+       $(OBJ)NetworkClientFile.c \
+       $(OBJ)Service.c \
+       $(OBJ)Socket.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)Cube.sym $(OBJ)SkyBox.sym $(OBJ)Sphere.sym \
-       $(OBJ)Object3DSFormat.sym $(OBJ)Camera.sym $(OBJ)Matrix.sym $(OBJ)Mesh.sym $(OBJ)Object.sym \
-       $(OBJ)Plane.sym $(OBJ)Quaternion.sym $(OBJ)Vector3D.sym $(OBJ)BMPFormat.sym \
-       $(OBJ)GIFFormat.sym $(OBJ)JPEGFormat.sym $(OBJ)PCXFormat.sym $(OBJ)PNGFormat.sym \
-       $(OBJ)RGBFormat.sym $(if $(WINDOWS),$(OBJ)Direct3D8DisplayDriver.sym,) \
-       $(if $(WINDOWS),$(OBJ)Direct3D9DisplayDriver.sym,) $(if $(WINDOWS),$(OBJ)DirectDrawDisplayDriver.sym,) \
-       $(if $(WINDOWS),$(OBJ)GDIDisplayDriver.sym,) $(OBJ)lfbBlit.sym $(OBJ)lfbConvert.sym $(OBJ)LFBDisplayDriver.sym
-SYMBOLS2 = $(if $(or $(LINUX),$(OSX)),$(OBJ)NCursesDisplayDriver.sym,) \
-       $(OBJ)OpenGLDisplayDriver.sym $(if $(WINDOWS),$(OBJ)Win32BitmapPrinterDisplayDriver.sym,) \
-       $(if $(WINDOWS),$(OBJ)Win32ConsoleDisplayDriver.sym,) $(if $(WINDOWS),$(OBJ)Win32PrinterDisplayDriver.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)TabControl.sym $(OBJ)PaneSplitter.sym $(OBJ)Stacker.sym \
-       $(OBJ)PathBox.sym $(OBJ)ColorPicker.sym $(OBJ)FileDialog.sym $(OBJ)FindDialog.sym \
-       $(OBJ)GoToDialog.sym $(OBJ)MessageBox.sym $(OBJ)ReplaceDialog.sym $(OBJ)WindowList.sym
-SYMBOLS3 = $(if $(or $(LINUX),$(OSX)),$(OBJ)NCursesInterface.sym,) \
-       $(if $(WINDOWS),$(OBJ)Win32Interface.sym,) $(if $(WINDOWS),$(OBJ)Win32ConsoleInterface.sym,) \
-       $(if $(or $(LINUX),$(OSX)),$(OBJ)XInterface.sym,) $(OBJ)TVisionSkin.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)dcom.sym $(OBJ)HTTPFile.sym $(OBJ)network.sym \
-       $(OBJ)NetworkClientFile.sym $(OBJ)Service.sym $(OBJ)Socket.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
+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)Cube.sym \
+       $(OBJ)SkyBox.sym \
+       $(OBJ)Sphere.sym \
+       $(OBJ)Object3DSFormat.sym \
+       $(OBJ)Camera.sym \
+       $(OBJ)Matrix.sym \
+       $(OBJ)Mesh.sym \
+       $(OBJ)Object.sym \
+       $(OBJ)Plane.sym \
+       $(OBJ)Quaternion.sym \
+       $(OBJ)Vector3D.sym \
+       $(OBJ)BMPFormat.sym \
+       $(OBJ)GIFFormat.sym \
+       $(OBJ)JPEGFormat.sym \
+       $(OBJ)PCXFormat.sym \
+       $(OBJ)PNGFormat.sym \
+       $(OBJ)RGBFormat.sym \
+       $(if $(WINDOWS),$(OBJ)Direct3D8DisplayDriver.sym,) \
+       $(if $(WINDOWS),$(OBJ)Direct3D9DisplayDriver.sym,) \
+       $(if $(WINDOWS),$(OBJ)DirectDrawDisplayDriver.sym,) \
+       $(if $(WINDOWS),$(OBJ)GDIDisplayDriver.sym,) \
+       $(OBJ)lfbBlit.sym \
+       $(OBJ)lfbConvert.sym \
+       $(OBJ)LFBDisplayDriver.sym
+SYMBOLS2 = \
+       $(if $(or $(LINUX),$(OSX)),$(OBJ)NCursesDisplayDriver.sym,) \
+       $(OBJ)OpenGLDisplayDriver.sym \
+       $(if $(WINDOWS),$(OBJ)Win32BitmapPrinterDisplayDriver.sym,) \
+       $(if $(WINDOWS),$(OBJ)Win32ConsoleDisplayDriver.sym,) \
+       $(if $(WINDOWS),$(OBJ)Win32PrinterDisplayDriver.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)TabControl.sym \
+       $(OBJ)PaneSplitter.sym \
+       $(OBJ)Stacker.sym \
+       $(OBJ)PathBox.sym \
+       $(OBJ)ColorPicker.sym \
+       $(OBJ)FileDialog.sym \
+       $(OBJ)FindDialog.sym \
+       $(OBJ)GoToDialog.sym \
+       $(OBJ)MessageBox.sym \
+       $(OBJ)ReplaceDialog.sym \
+       $(OBJ)WindowList.sym
+SYMBOLS3 = \
+       $(if $(or $(LINUX),$(OSX)),$(OBJ)NCursesInterface.sym,) \
+       $(if $(WINDOWS),$(OBJ)Win32Interface.sym,) \
+       $(if $(WINDOWS),$(OBJ)Win32ConsoleInterface.sym,) \
+       $(if $(or $(LINUX),$(OSX)),$(OBJ)XInterface.sym,) \
+       $(OBJ)TVisionSkin.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)dcom.sym \
+       $(OBJ)HTTPFile.sym \
+       $(OBJ)network.sym \
+       $(OBJ)NetworkClientFile.sym \
+       $(OBJ)Service.sym \
+       $(OBJ)Socket.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) $(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)Cube.imp $(OBJ)SkyBox.imp $(OBJ)Sphere.imp \
-       $(OBJ)Object3DSFormat.imp $(OBJ)Camera.imp $(OBJ)Matrix.imp $(OBJ)Mesh.imp $(OBJ)Object.imp \
-       $(OBJ)Plane.imp $(OBJ)Quaternion.imp $(OBJ)Vector3D.imp $(OBJ)BMPFormat.imp \
-       $(OBJ)GIFFormat.imp $(OBJ)JPEGFormat.imp $(OBJ)PCXFormat.imp $(OBJ)PNGFormat.imp \
-       $(OBJ)RGBFormat.imp $(if $(WINDOWS),$(OBJ)Direct3D8DisplayDriver.imp,) \
-       $(if $(WINDOWS),$(OBJ)Direct3D9DisplayDriver.imp,) $(if $(WINDOWS),$(OBJ)DirectDrawDisplayDriver.imp,) \
-       $(if $(WINDOWS),$(OBJ)GDIDisplayDriver.imp,) $(OBJ)lfbBlit.imp $(OBJ)lfbConvert.imp $(OBJ)LFBDisplayDriver.imp
-IMPORTS2 = $(if $(or $(LINUX),$(OSX)),$(OBJ)NCursesDisplayDriver.imp,) \
-       $(OBJ)OpenGLDisplayDriver.imp $(if $(WINDOWS),$(OBJ)Win32BitmapPrinterDisplayDriver.imp,) \
-       $(if $(WINDOWS),$(OBJ)Win32ConsoleDisplayDriver.imp,) $(if $(WINDOWS),$(OBJ)Win32PrinterDisplayDriver.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)TabControl.imp $(OBJ)PaneSplitter.imp $(OBJ)Stacker.imp \
-       $(OBJ)PathBox.imp $(OBJ)ColorPicker.imp $(OBJ)FileDialog.imp $(OBJ)FindDialog.imp \
-       $(OBJ)GoToDialog.imp $(OBJ)MessageBox.imp $(OBJ)ReplaceDialog.imp $(OBJ)WindowList.imp
-IMPORTS3 = $(if $(or $(LINUX),$(OSX)),$(OBJ)NCursesInterface.imp,) \
-       $(if $(WINDOWS),$(OBJ)Win32Interface.imp,) $(if $(WINDOWS),$(OBJ)Win32ConsoleInterface.imp,) \
-       $(if $(or $(LINUX),$(OSX)),$(OBJ)XInterface.imp,) $(OBJ)TVisionSkin.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)dcom.imp $(OBJ)HTTPFile.imp $(OBJ)network.imp \
-       $(OBJ)NetworkClientFile.imp $(OBJ)Service.imp $(OBJ)Socket.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
+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)Cube.imp \
+       $(OBJ)SkyBox.imp \
+       $(OBJ)Sphere.imp \
+       $(OBJ)Object3DSFormat.imp \
+       $(OBJ)Camera.imp \
+       $(OBJ)Matrix.imp \
+       $(OBJ)Mesh.imp \
+       $(OBJ)Object.imp \
+       $(OBJ)Plane.imp \
+       $(OBJ)Quaternion.imp \
+       $(OBJ)Vector3D.imp \
+       $(OBJ)BMPFormat.imp \
+       $(OBJ)GIFFormat.imp \
+       $(OBJ)JPEGFormat.imp \
+       $(OBJ)PCXFormat.imp \
+       $(OBJ)PNGFormat.imp \
+       $(OBJ)RGBFormat.imp \
+       $(if $(WINDOWS),$(OBJ)Direct3D8DisplayDriver.imp,) \
+       $(if $(WINDOWS),$(OBJ)Direct3D9DisplayDriver.imp,) \
+       $(if $(WINDOWS),$(OBJ)DirectDrawDisplayDriver.imp,) \
+       $(if $(WINDOWS),$(OBJ)GDIDisplayDriver.imp,) \
+       $(OBJ)lfbBlit.imp \
+       $(OBJ)lfbConvert.imp \
+       $(OBJ)LFBDisplayDriver.imp
+IMPORTS2 = \
+       $(if $(or $(LINUX),$(OSX)),$(OBJ)NCursesDisplayDriver.imp,) \
+       $(OBJ)OpenGLDisplayDriver.imp \
+       $(if $(WINDOWS),$(OBJ)Win32BitmapPrinterDisplayDriver.imp,) \
+       $(if $(WINDOWS),$(OBJ)Win32ConsoleDisplayDriver.imp,) \
+       $(if $(WINDOWS),$(OBJ)Win32PrinterDisplayDriver.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)TabControl.imp \
+       $(OBJ)PaneSplitter.imp \
+       $(OBJ)Stacker.imp \
+       $(OBJ)PathBox.imp \
+       $(OBJ)ColorPicker.imp \
+       $(OBJ)FileDialog.imp \
+       $(OBJ)FindDialog.imp \
+       $(OBJ)GoToDialog.imp \
+       $(OBJ)MessageBox.imp \
+       $(OBJ)ReplaceDialog.imp \
+       $(OBJ)WindowList.imp
+IMPORTS3 = \
+       $(if $(or $(LINUX),$(OSX)),$(OBJ)NCursesInterface.imp,) \
+       $(if $(WINDOWS),$(OBJ)Win32Interface.imp,) \
+       $(if $(WINDOWS),$(OBJ)Win32ConsoleInterface.imp,) \
+       $(if $(or $(LINUX),$(OSX)),$(OBJ)XInterface.imp,) \
+       $(OBJ)TVisionSkin.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)dcom.imp \
+       $(OBJ)HTTPFile.imp \
+       $(OBJ)network.imp \
+       $(OBJ)NetworkClientFile.imp \
+       $(OBJ)Service.imp \
+       $(OBJ)Socket.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) $(SOURCES4)
-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/3D/meshes/Cube.ec src/gfx/3D/meshes/SkyBox.ec \
-       src/gfx/3D/meshes/Sphere.ec src/gfx/3D/models/Object3DSFormat.ec src/gfx/3D/Camera.ec \
-       src/gfx/3D/Matrix.ec src/gfx/3D/Mesh.ec src/gfx/3D/Object.ec src/gfx/3D/Plane.ec \
-       src/gfx/3D/Quaternion.ec src/gfx/3D/Vector3D.ec src/gfx/bitmaps/BMPFormat.ec \
-       src/gfx/bitmaps/GIFFormat.ec src/gfx/bitmaps/JPEGFormat.ec src/gfx/bitmaps/PCXFormat.ec \
-       src/gfx/bitmaps/PNGFormat.ec src/gfx/bitmaps/RGBFormat.ec \
-       src/gfx/drivers/harfbuzz/unicode/harfbuzz-freetype.c src/gfx/drivers/harfbuzz/unicode/harfbuzz-unicode-tables.c \
-       src/gfx/drivers/harfbuzz/unicode/harfbuzz-unicode.c 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-gpos.c src/gfx/drivers/harfbuzz/harfbuzz-gsub.c \
-       src/gfx/drivers/harfbuzz/harfbuzz-hangul.c src/gfx/drivers/harfbuzz/harfbuzz-hebrew.c \
+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/3D/meshes/Cube.ec \
+       src/gfx/3D/meshes/SkyBox.ec \
+       src/gfx/3D/meshes/Sphere.ec \
+       src/gfx/3D/models/Object3DSFormat.ec \
+       src/gfx/3D/Camera.ec \
+       src/gfx/3D/Matrix.ec \
+       src/gfx/3D/Mesh.ec \
+       src/gfx/3D/Object.ec \
+       src/gfx/3D/Plane.ec \
+       src/gfx/3D/Quaternion.ec \
+       src/gfx/3D/Vector3D.ec \
+       src/gfx/bitmaps/BMPFormat.ec \
+       src/gfx/bitmaps/GIFFormat.ec \
+       src/gfx/bitmaps/JPEGFormat.ec \
+       src/gfx/bitmaps/PCXFormat.ec \
+       src/gfx/bitmaps/PNGFormat.ec \
+       src/gfx/bitmaps/RGBFormat.ec \
+       src/gfx/drivers/harfbuzz/unicode/harfbuzz-freetype.c \
+       src/gfx/drivers/harfbuzz/unicode/harfbuzz-unicode-tables.c \
+       src/gfx/drivers/harfbuzz/unicode/harfbuzz-unicode.c \
+       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-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
-SOURCES2 = 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 src/gfx/drivers/harfbuzz/harfbuzz-impl.c \
-       src/gfx/drivers/harfbuzz/harfbuzz-thai.c $(if $(WINDOWS),src/gfx/drivers/Direct3D8DisplayDriver.ec,) \
-       $(if $(WINDOWS),src/gfx/drivers/Direct3D9DisplayDriver.ec,) $(if $(WINDOWS),src/gfx/drivers/DirectDrawDisplayDriver.ec,) \
-       $(if $(WINDOWS),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,) \
-       src/gfx/drivers/OpenGLDisplayDriver.ec $(if $(WINDOWS),src/gfx/drivers/Win32BitmapPrinterDisplayDriver.ec,) \
-       $(if $(WINDOWS),src/gfx/drivers/Win32ConsoleDisplayDriver.ec,) $(if $(WINDOWS),src/gfx/drivers/Win32PrinterDisplayDriver.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 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
-SOURCES3 = src/gui/controls/Picture.ec src/gui/controls/ProgressBar.ec \
-       src/gui/controls/ScrollBar.ec src/gui/controls/StatusBar.ec src/gui/controls/TabControl.ec \
-       src/gui/controls/PaneSplitter.ec src/gui/controls/Stacker.ec src/gui/controls/PathBox.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 $(or $(LINUX),$(OSX)),src/gui/drivers/NCursesInterface.ec,) \
-       $(if $(WINDOWS),src/gui/drivers/Win32Interface.ec,) $(if $(WINDOWS),src/gui/drivers/Win32ConsoleInterface.ec,) \
-       $(if $(or $(LINUX),$(OSX)),src/gui/drivers/XInterface.ec,) src/gui/skins/TVisionSkin.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/net/dcom.ec src/net/HTTPFile.ec src/net/network.ec \
-       src/net/NetworkClientFile.ec src/net/Service.ec src/net/Socket.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
-SOURCES4 = src/com/dataTypes.ec src/com/instance.ec src/com/String.ec src/com/OldList.ec \
+SOURCES2 = \
+       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 \
+       src/gfx/drivers/harfbuzz/harfbuzz-impl.c \
+       src/gfx/drivers/harfbuzz/harfbuzz-thai.c \
+       $(if $(WINDOWS),src/gfx/drivers/Direct3D8DisplayDriver.ec,) \
+       $(if $(WINDOWS),src/gfx/drivers/Direct3D9DisplayDriver.ec,) \
+       $(if $(WINDOWS),src/gfx/drivers/DirectDrawDisplayDriver.ec,) \
+       $(if $(WINDOWS),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,) \
+       src/gfx/drivers/OpenGLDisplayDriver.ec \
+       $(if $(WINDOWS),src/gfx/drivers/Win32BitmapPrinterDisplayDriver.ec,) \
+       $(if $(WINDOWS),src/gfx/drivers/Win32ConsoleDisplayDriver.ec,) \
+       $(if $(WINDOWS),src/gfx/drivers/Win32PrinterDisplayDriver.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 \
+       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
+SOURCES3 = \
+       src/gui/controls/Picture.ec \
+       src/gui/controls/ProgressBar.ec \
+       src/gui/controls/ScrollBar.ec \
+       src/gui/controls/StatusBar.ec \
+       src/gui/controls/TabControl.ec \
+       src/gui/controls/PaneSplitter.ec \
+       src/gui/controls/Stacker.ec \
+       src/gui/controls/PathBox.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 $(or $(LINUX),$(OSX)),src/gui/drivers/NCursesInterface.ec,) \
+       $(if $(WINDOWS),src/gui/drivers/Win32Interface.ec,) \
+       $(if $(WINDOWS),src/gui/drivers/Win32ConsoleInterface.ec,) \
+       $(if $(or $(LINUX),$(OSX)),src/gui/drivers/XInterface.ec,) \
+       src/gui/skins/TVisionSkin.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/net/dcom.ec \
+       src/net/HTTPFile.ec \
+       src/net/network.ec \
+       src/net/NetworkClientFile.ec \
+       src/net/Service.ec \
+       src/net/Socket.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
+SOURCES4 = \
+       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
 
 

diff --git a/ecere/Makefile.ecereCOM b/ecere/Makefile.ecereCOM
index 1542c03..65371d0 100644 (file)
--- a/ecere/Makefile.ecereCOM
+++ b/ecere/Makefile.ecereCOM
@@ -23,30 +23,92 @@ TARGET = obj/$(MODULE).$(CONFIG).$(PLATFORM)/$(LP)ecereCOM$(SO)
 SONAME =
 endif
 
-OBJECTS = $(OBJ)Mutex.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 = $(OBJ)Mutex.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 \
+OBJECTS = \
+       $(OBJ)Mutex.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 = \
+       $(OBJ)Mutex.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 = $(OBJ)Mutex.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 \
+SYMBOLS = \
+       $(OBJ)Mutex.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 = $(OBJ)Mutex.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 \
+IMPORTS = \
+       $(OBJ)Mutex.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 = src/sys/Mutex.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 \
+SOURCES = \
+       src/sys/Mutex.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 =

diff --git a/ecere/Makefile.vanilla b/ecere/Makefile.vanilla
index dcad716..1ded631 100644 (file)
--- a/ecere/Makefile.vanilla
+++ b/ecere/Makefile.vanilla
@@ -14,181 +14,602 @@ 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)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) \
+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)ColorPicker.o \
-       $(OBJ)FileDialog.o $(OBJ)FindDialog.o $(OBJ)GoToDialog.o $(OBJ)MessageBox.o $(OBJ)ReplaceDialog.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)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 \
+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)
 
 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)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 \
+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)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
 
 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)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 \
+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)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
 
 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)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 \
+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)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 = 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),,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) \
+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),,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,) \
-       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,) 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/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 \
+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,) \
+       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,) \
+       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/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 $(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,) 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
+SOURCES3 = \
+       $(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/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
 
 # CROSS-PLATFORM MAGIC
 

diff --git a/eda/drivers/sqlite/Makefile b/eda/drivers/sqlite/Makefile
index d336996..1768910 100644 (file)
--- a/eda/drivers/sqlite/Makefile
+++ b/eda/drivers/sqlite/Makefile
@@ -23,15 +23,23 @@ TARGET = obj/$(CONFIG).$(PLATFORM)/$(LP)EDASQLite$(SO)
 SONAME =
 endif
 
-OBJECTS = $(OBJ)sqlite3.o $(OBJ)EDASQLite.o $(OBJ)$(MODULE).main$(O)
+OBJECTS = \
+       $(OBJ)sqlite3.o \
+       $(OBJ)EDASQLite.o \
+       $(OBJ)$(MODULE).main$(O)
 
-COBJECTS = $(OBJ)EDASQLite.c
+COBJECTS = \
+       $(OBJ)EDASQLite.c
 
-SYMBOLS = $(OBJ)EDASQLite.sym
+SYMBOLS = \
+       $(OBJ)EDASQLite.sym
 
-IMPORTS = $(OBJ)EDASQLite.imp
+IMPORTS = \
+       $(OBJ)EDASQLite.imp
 
-SOURCES = sqlite3.c EDASQLite.ec
+SOURCES = \
+       sqlite3.c \
+       EDASQLite.ec
 
 RESOURCES =
 

diff --git a/eda/drivers/sqliteCipher/Makefile b/eda/drivers/sqliteCipher/Makefile
index fc2c60f..8c15823 100644 (file)
--- a/eda/drivers/sqliteCipher/Makefile
+++ b/eda/drivers/sqliteCipher/Makefile
@@ -23,16 +23,28 @@ TARGET = obj/$(CONFIG).$(PLATFORM)/$(LP)EDASQLiteCipher$(SO)
 SONAME =
 endif
 
-OBJECTS = $(OBJ)sqlite3.o $(OBJ)EDASQLiteCipher.o $(OBJ)EDASQLite.o \
+OBJECTS = \
+       $(OBJ)sqlite3.o \
+       $(OBJ)EDASQLiteCipher.o \
+       $(OBJ)EDASQLite.o \
        $(OBJ)$(MODULE).main$(O)
 
-COBJECTS = $(OBJ)EDASQLiteCipher.c $(OBJ)EDASQLite.c
+COBJECTS = \
+       $(OBJ)EDASQLiteCipher.c \
+       $(OBJ)EDASQLite.c
 
-SYMBOLS = $(OBJ)EDASQLiteCipher.sym $(OBJ)EDASQLite.sym
+SYMBOLS = \
+       $(OBJ)EDASQLiteCipher.sym \
+       $(OBJ)EDASQLite.sym
 
-IMPORTS = $(OBJ)EDASQLiteCipher.imp $(OBJ)EDASQLite.imp
+IMPORTS = \
+       $(OBJ)EDASQLiteCipher.imp \
+       $(OBJ)EDASQLite.imp
 
-SOURCES = sqlite3.c EDASQLiteCipher.ec ../sqlite/EDASQLite.ec
+SOURCES = \
+       sqlite3.c \
+       EDASQLiteCipher.ec \
+       ../sqlite/EDASQLite.ec
 
 RESOURCES =
 

diff --git a/eda/libeda/Makefile b/eda/libeda/Makefile
index d93361a..58262b2 100644 (file)
--- a/eda/libeda/Makefile
+++ b/eda/libeda/Makefile
@@ -23,20 +23,56 @@ TARGET = obj/$(CONFIG).$(PLATFORM)/$(LP)EDA$(SO)
 SONAME =
 endif
 
-OBJECTS = $(OBJ)EDB.o $(OBJ)MemoryEDB.o $(OBJ)FieldBox.o $(OBJ)TableEditor.o $(OBJ)EDA.o \
-       $(OBJ)ers.o $(OBJ)gui.o $(OBJ)idList.o $(OBJ)$(MODULE).main$(O)
-
-COBJECTS = $(OBJ)EDB.c $(OBJ)MemoryEDB.c $(OBJ)FieldBox.c $(OBJ)TableEditor.c $(OBJ)EDA.c \
-       $(OBJ)ers.c $(OBJ)gui.c $(OBJ)idList.c
-
-SYMBOLS = $(OBJ)EDB.sym $(OBJ)MemoryEDB.sym $(OBJ)FieldBox.sym $(OBJ)TableEditor.sym \
-       $(OBJ)EDA.sym $(OBJ)ers.sym $(OBJ)gui.sym $(OBJ)idList.sym
-
-IMPORTS = $(OBJ)EDB.imp $(OBJ)MemoryEDB.imp $(OBJ)FieldBox.imp $(OBJ)TableEditor.imp \
-       $(OBJ)EDA.imp $(OBJ)ers.imp $(OBJ)gui.imp $(OBJ)idList.imp
-
-SOURCES = src/EDB.ec src/MemoryEDB.ec src/gui/controls/FieldBox.ec \
-       src/gui/TableEditor.ec src/EDA.ec src/ers.ec src/gui.ec src/idList.ec
+OBJECTS = \
+       $(OBJ)EDB.o \
+       $(OBJ)MemoryEDB.o \
+       $(OBJ)FieldBox.o \
+       $(OBJ)TableEditor.o \
+       $(OBJ)EDA.o \
+       $(OBJ)ers.o \
+       $(OBJ)gui.o \
+       $(OBJ)idList.o \
+       $(OBJ)$(MODULE).main$(O)
+
+COBJECTS = \
+       $(OBJ)EDB.c \
+       $(OBJ)MemoryEDB.c \
+       $(OBJ)FieldBox.c \
+       $(OBJ)TableEditor.c \
+       $(OBJ)EDA.c \
+       $(OBJ)ers.c \
+       $(OBJ)gui.c \
+       $(OBJ)idList.c
+
+SYMBOLS = \
+       $(OBJ)EDB.sym \
+       $(OBJ)MemoryEDB.sym \
+       $(OBJ)FieldBox.sym \
+       $(OBJ)TableEditor.sym \
+       $(OBJ)EDA.sym \
+       $(OBJ)ers.sym \
+       $(OBJ)gui.sym \
+       $(OBJ)idList.sym
+
+IMPORTS = \
+       $(OBJ)EDB.imp \
+       $(OBJ)MemoryEDB.imp \
+       $(OBJ)FieldBox.imp \
+       $(OBJ)TableEditor.imp \
+       $(OBJ)EDA.imp \
+       $(OBJ)ers.imp \
+       $(OBJ)gui.imp \
+       $(OBJ)idList.imp
+
+SOURCES = \
+       src/EDB.ec \
+       src/MemoryEDB.ec \
+       src/gui/controls/FieldBox.ec \
+       src/gui/TableEditor.ec \
+       src/EDA.ec \
+       src/ers.ec \
+       src/gui.ec \
+       src/idList.ec
 
 RESOURCES =
 

diff --git a/epj2make/Makefile b/epj2make/Makefile
index 68aded9..c4abc94 100644 (file)
--- a/epj2make/Makefile
+++ b/epj2make/Makefile
@@ -15,21 +15,51 @@ CONSOLE = -mconsole
 
 TARGET = obj/$(CONFIG).$(PLATFORM)/epj2make$(E)
 
-OBJECTS = $(OBJ)Project.o $(OBJ)ProjectConfig.o $(OBJ)ProjectNode.o $(OBJ)IDESettings.o \
-       $(OBJ)OldIDESettings.o $(OBJ)StringsBox.o $(OBJ)epj2make.o $(OBJ)$(MODULE).main$(O)
-
-COBJECTS = $(OBJ)Project.c $(OBJ)ProjectConfig.c $(OBJ)ProjectNode.c $(OBJ)IDESettings.c \
-       $(OBJ)OldIDESettings.c $(OBJ)StringsBox.c $(OBJ)epj2make.c
-
-SYMBOLS = $(OBJ)Project.sym $(OBJ)ProjectConfig.sym $(OBJ)ProjectNode.sym \
-       $(OBJ)IDESettings.sym $(OBJ)OldIDESettings.sym $(OBJ)StringsBox.sym $(OBJ)epj2make.sym
-
-IMPORTS = $(OBJ)Project.imp $(OBJ)ProjectConfig.imp $(OBJ)ProjectNode.imp \
-       $(OBJ)IDESettings.imp $(OBJ)OldIDESettings.imp $(OBJ)StringsBox.imp $(OBJ)epj2make.imp
-
-SOURCES = ../ide/src/project/Project.ec ../ide/src/project/ProjectConfig.ec \
-       ../ide/src/project/ProjectNode.ec ../ide/src/IDESettings.ec ../ide/src/OldIDESettings.ec \
-       ../extras/gui/controls/StringsBox.ec epj2make.ec
+OBJECTS = \
+       $(OBJ)Project.o \
+       $(OBJ)ProjectConfig.o \
+       $(OBJ)ProjectNode.o \
+       $(OBJ)IDESettings.o \
+       $(OBJ)OldIDESettings.o \
+       $(OBJ)StringsBox.o \
+       $(OBJ)epj2make.o \
+       $(OBJ)$(MODULE).main$(O)
+
+COBJECTS = \
+       $(OBJ)Project.c \
+       $(OBJ)ProjectConfig.c \
+       $(OBJ)ProjectNode.c \
+       $(OBJ)IDESettings.c \
+       $(OBJ)OldIDESettings.c \
+       $(OBJ)StringsBox.c \
+       $(OBJ)epj2make.c
+
+SYMBOLS = \
+       $(OBJ)Project.sym \
+       $(OBJ)ProjectConfig.sym \
+       $(OBJ)ProjectNode.sym \
+       $(OBJ)IDESettings.sym \
+       $(OBJ)OldIDESettings.sym \
+       $(OBJ)StringsBox.sym \
+       $(OBJ)epj2make.sym
+
+IMPORTS = \
+       $(OBJ)Project.imp \
+       $(OBJ)ProjectConfig.imp \
+       $(OBJ)ProjectNode.imp \
+       $(OBJ)IDESettings.imp \
+       $(OBJ)OldIDESettings.imp \
+       $(OBJ)StringsBox.imp \
+       $(OBJ)epj2make.imp
+
+SOURCES = \
+       ../ide/src/project/Project.ec \
+       ../ide/src/project/ProjectConfig.ec \
+       ../ide/src/project/ProjectNode.ec \
+       ../ide/src/IDESettings.ec \
+       ../ide/src/OldIDESettings.ec \
+       ../extras/gui/controls/StringsBox.ec \
+       epj2make.ec
 
 RESOURCES = ../include.mk
 

diff --git a/ide/Makefile b/ide/Makefile
index 4aa9f97..64f504a 100644 (file)
--- a/ide/Makefile
+++ b/ide/Makefile
@@ -15,80 +15,265 @@ CONSOLE = -mwindows
 
 TARGET = obj/$(CONFIG).$(PLATFORM)/ide$(E)
 
-OBJECTS = $(OBJ)FileSystemIterator.o $(OBJ)layout.o $(OBJ)SelectorBar.o \
-       $(OBJ)StringsBox.o $(OBJ)ActiveCompilerDialog.o $(OBJ)CompilersDetectionDialog.o \
-       $(OBJ)FindInFilesDialog.o $(OBJ)GlobalSettingsDialog.o $(OBJ)NewProjectDialog.o $(OBJ)NodeProperties.o \
-       $(OBJ)ProjectActiveConfig.o $(OBJ)WorkspaceSettings.o $(OBJ)ProjectTabSettings.o $(OBJ)Project.o \
-       $(OBJ)ProjectConfig.o $(OBJ)ProjectNode.o $(OBJ)ProjectView.o $(OBJ)Workspace.o \
-       $(if $(WINDOWS),$(OBJ)vsSupport.o,) $(OBJ)CodeEditor.o $(OBJ)CodeObject.o $(OBJ)Designer.o $(OBJ)findCtx.o \
-       $(OBJ)findExp.o $(OBJ)findParams.o $(OBJ)Sheet.o $(OBJ)ToolBox.o $(OBJ)debugFindCtx.o \
-       $(OBJ)Debugger.o $(OBJ)debugTools.o $(OBJ)GDBDialog.o $(OBJ)process.o $(OBJ)BreakpointsView.o \
-       $(OBJ)CallStackView.o $(OBJ)OutputView.o $(OBJ)ThreadsView.o $(OBJ)WatchesView.o $(OBJ)ModelView.o \
-       $(OBJ)PictureEdit.o $(OBJ)about.o $(OBJ)ide.o $(OBJ)IDESettings.o $(OBJ)OldIDESettings.o \
-       $(OBJ)ProjectSettings.o $(OBJ)$(MODULE).main$(O)
-
-COBJECTS = $(OBJ)FileSystemIterator.c $(OBJ)layout.c $(OBJ)SelectorBar.c \
-       $(OBJ)StringsBox.c $(OBJ)ActiveCompilerDialog.c $(OBJ)CompilersDetectionDialog.c \
-       $(OBJ)FindInFilesDialog.c $(OBJ)GlobalSettingsDialog.c $(OBJ)NewProjectDialog.c $(OBJ)NodeProperties.c \
-       $(OBJ)ProjectActiveConfig.c $(OBJ)WorkspaceSettings.c $(OBJ)ProjectTabSettings.c $(OBJ)Project.c \
-       $(OBJ)ProjectConfig.c $(OBJ)ProjectNode.c $(OBJ)ProjectView.c $(OBJ)Workspace.c \
-       $(if $(WINDOWS),$(OBJ)vsSupport.c,) $(OBJ)CodeEditor.c $(OBJ)CodeObject.c $(OBJ)Designer.c $(OBJ)findCtx.c \
-       $(OBJ)findExp.c $(OBJ)findParams.c $(OBJ)Sheet.c $(OBJ)ToolBox.c $(OBJ)debugFindCtx.c \
-       $(OBJ)Debugger.c $(OBJ)debugTools.c $(OBJ)GDBDialog.c $(OBJ)process.c $(OBJ)BreakpointsView.c \
-       $(OBJ)CallStackView.c $(OBJ)OutputView.c $(OBJ)ThreadsView.c $(OBJ)WatchesView.c $(OBJ)ModelView.c \
-       $(OBJ)PictureEdit.c $(OBJ)about.c $(OBJ)ide.c $(OBJ)IDESettings.c $(OBJ)OldIDESettings.c \
+OBJECTS = \
+       $(OBJ)FileSystemIterator.o \
+       $(OBJ)layout.o \
+       $(OBJ)SelectorBar.o \
+       $(OBJ)StringsBox.o \
+       $(OBJ)ActiveCompilerDialog.o \
+       $(OBJ)CompilersDetectionDialog.o \
+       $(OBJ)FindInFilesDialog.o \
+       $(OBJ)GlobalSettingsDialog.o \
+       $(OBJ)NewProjectDialog.o \
+       $(OBJ)NodeProperties.o \
+       $(OBJ)ProjectActiveConfig.o \
+       $(OBJ)WorkspaceSettings.o \
+       $(OBJ)ProjectTabSettings.o \
+       $(OBJ)Project.o \
+       $(OBJ)ProjectConfig.o \
+       $(OBJ)ProjectNode.o \
+       $(OBJ)ProjectView.o \
+       $(OBJ)Workspace.o \
+       $(if $(WINDOWS),$(OBJ)vsSupport.o,) \
+       $(OBJ)CodeEditor.o \
+       $(OBJ)CodeObject.o \
+       $(OBJ)Designer.o \
+       $(OBJ)findCtx.o \
+       $(OBJ)findExp.o \
+       $(OBJ)findParams.o \
+       $(OBJ)Sheet.o \
+       $(OBJ)ToolBox.o \
+       $(OBJ)debugFindCtx.o \
+       $(OBJ)Debugger.o \
+       $(OBJ)debugTools.o \
+       $(OBJ)GDBDialog.o \
+       $(OBJ)process.o \
+       $(OBJ)BreakpointsView.o \
+       $(OBJ)CallStackView.o \
+       $(OBJ)OutputView.o \
+       $(OBJ)ThreadsView.o \
+       $(OBJ)WatchesView.o \
+       $(OBJ)ModelView.o \
+       $(OBJ)PictureEdit.o \
+       $(OBJ)about.o \
+       $(OBJ)ide.o \
+       $(OBJ)IDESettings.o \
+       $(OBJ)OldIDESettings.o \
+       $(OBJ)ProjectSettings.o \
+       $(OBJ)$(MODULE).main$(O)
+
+COBJECTS = \
+       $(OBJ)FileSystemIterator.c \
+       $(OBJ)layout.c \
+       $(OBJ)SelectorBar.c \
+       $(OBJ)StringsBox.c \
+       $(OBJ)ActiveCompilerDialog.c \
+       $(OBJ)CompilersDetectionDialog.c \
+       $(OBJ)FindInFilesDialog.c \
+       $(OBJ)GlobalSettingsDialog.c \
+       $(OBJ)NewProjectDialog.c \
+       $(OBJ)NodeProperties.c \
+       $(OBJ)ProjectActiveConfig.c \
+       $(OBJ)WorkspaceSettings.c \
+       $(OBJ)ProjectTabSettings.c \
+       $(OBJ)Project.c \
+       $(OBJ)ProjectConfig.c \
+       $(OBJ)ProjectNode.c \
+       $(OBJ)ProjectView.c \
+       $(OBJ)Workspace.c \
+       $(if $(WINDOWS),$(OBJ)vsSupport.c,) \
+       $(OBJ)CodeEditor.c \
+       $(OBJ)CodeObject.c \
+       $(OBJ)Designer.c \
+       $(OBJ)findCtx.c \
+       $(OBJ)findExp.c \
+       $(OBJ)findParams.c \
+       $(OBJ)Sheet.c \
+       $(OBJ)ToolBox.c \
+       $(OBJ)debugFindCtx.c \
+       $(OBJ)Debugger.c \
+       $(OBJ)debugTools.c \
+       $(OBJ)GDBDialog.c \
+       $(OBJ)process.c \
+       $(OBJ)BreakpointsView.c \
+       $(OBJ)CallStackView.c \
+       $(OBJ)OutputView.c \
+       $(OBJ)ThreadsView.c \
+       $(OBJ)WatchesView.c \
+       $(OBJ)ModelView.c \
+       $(OBJ)PictureEdit.c \
+       $(OBJ)about.c \
+       $(OBJ)ide.c \
+       $(OBJ)IDESettings.c \
+       $(OBJ)OldIDESettings.c \
        $(OBJ)ProjectSettings.c
 
 SYMBOLS = $(SYMBOLS1) $(SYMBOLS2)
-SYMBOLS1 = $(OBJ)FileSystemIterator.sym $(OBJ)layout.sym $(OBJ)SelectorBar.sym \
-       $(OBJ)StringsBox.sym $(OBJ)ActiveCompilerDialog.sym $(OBJ)CompilersDetectionDialog.sym \
-       $(OBJ)FindInFilesDialog.sym $(OBJ)GlobalSettingsDialog.sym $(OBJ)NewProjectDialog.sym \
-       $(OBJ)NodeProperties.sym $(OBJ)ProjectActiveConfig.sym $(OBJ)WorkspaceSettings.sym \
-       $(OBJ)ProjectTabSettings.sym $(OBJ)Project.sym $(OBJ)ProjectConfig.sym $(OBJ)ProjectNode.sym \
-       $(OBJ)ProjectView.sym $(OBJ)Workspace.sym $(if $(WINDOWS),$(OBJ)vsSupport.sym,) \
-       $(OBJ)CodeEditor.sym $(OBJ)CodeObject.sym $(OBJ)Designer.sym $(OBJ)findCtx.sym $(OBJ)findExp.sym \
-       $(OBJ)findParams.sym $(OBJ)Sheet.sym $(OBJ)ToolBox.sym $(OBJ)debugFindCtx.sym $(OBJ)Debugger.sym \
-       $(OBJ)debugTools.sym $(OBJ)GDBDialog.sym $(OBJ)process.sym $(OBJ)BreakpointsView.sym \
-       $(OBJ)CallStackView.sym $(OBJ)OutputView.sym $(OBJ)ThreadsView.sym $(OBJ)WatchesView.sym \
-       $(OBJ)ModelView.sym $(OBJ)PictureEdit.sym $(OBJ)about.sym $(OBJ)ide.sym $(OBJ)IDESettings.sym
-SYMBOLS2 = $(OBJ)OldIDESettings.sym $(OBJ)ProjectSettings.sym
+SYMBOLS1 = \
+       $(OBJ)FileSystemIterator.sym \
+       $(OBJ)layout.sym \
+       $(OBJ)SelectorBar.sym \
+       $(OBJ)StringsBox.sym \
+       $(OBJ)ActiveCompilerDialog.sym \
+       $(OBJ)CompilersDetectionDialog.sym \
+       $(OBJ)FindInFilesDialog.sym \
+       $(OBJ)GlobalSettingsDialog.sym \
+       $(OBJ)NewProjectDialog.sym \
+       $(OBJ)NodeProperties.sym \
+       $(OBJ)ProjectActiveConfig.sym \
+       $(OBJ)WorkspaceSettings.sym \
+       $(OBJ)ProjectTabSettings.sym \
+       $(OBJ)Project.sym \
+       $(OBJ)ProjectConfig.sym \
+       $(OBJ)ProjectNode.sym \
+       $(OBJ)ProjectView.sym \
+       $(OBJ)Workspace.sym \
+       $(if $(WINDOWS),$(OBJ)vsSupport.sym,) \
+       $(OBJ)CodeEditor.sym \
+       $(OBJ)CodeObject.sym \
+       $(OBJ)Designer.sym \
+       $(OBJ)findCtx.sym \
+       $(OBJ)findExp.sym \
+       $(OBJ)findParams.sym \
+       $(OBJ)Sheet.sym \
+       $(OBJ)ToolBox.sym \
+       $(OBJ)debugFindCtx.sym \
+       $(OBJ)Debugger.sym \
+       $(OBJ)debugTools.sym \
+       $(OBJ)GDBDialog.sym \
+       $(OBJ)process.sym \
+       $(OBJ)BreakpointsView.sym \
+       $(OBJ)CallStackView.sym \
+       $(OBJ)OutputView.sym \
+       $(OBJ)ThreadsView.sym \
+       $(OBJ)WatchesView.sym \
+       $(OBJ)ModelView.sym \
+       $(OBJ)PictureEdit.sym \
+       $(OBJ)about.sym \
+       $(OBJ)ide.sym \
+       $(OBJ)IDESettings.sym
+SYMBOLS2 = \
+       $(OBJ)OldIDESettings.sym \
+       $(OBJ)ProjectSettings.sym
 
 IMPORTS = $(IMPORTS1) $(IMPORTS2)
-IMPORTS1 = $(OBJ)FileSystemIterator.imp $(OBJ)layout.imp $(OBJ)SelectorBar.imp \
-       $(OBJ)StringsBox.imp $(OBJ)ActiveCompilerDialog.imp $(OBJ)CompilersDetectionDialog.imp \
-       $(OBJ)FindInFilesDialog.imp $(OBJ)GlobalSettingsDialog.imp $(OBJ)NewProjectDialog.imp \
-       $(OBJ)NodeProperties.imp $(OBJ)ProjectActiveConfig.imp $(OBJ)WorkspaceSettings.imp \
-       $(OBJ)ProjectTabSettings.imp $(OBJ)Project.imp $(OBJ)ProjectConfig.imp $(OBJ)ProjectNode.imp \
-       $(OBJ)ProjectView.imp $(OBJ)Workspace.imp $(if $(WINDOWS),$(OBJ)vsSupport.imp,) \
-       $(OBJ)CodeEditor.imp $(OBJ)CodeObject.imp $(OBJ)Designer.imp $(OBJ)findCtx.imp $(OBJ)findExp.imp \
-       $(OBJ)findParams.imp $(OBJ)Sheet.imp $(OBJ)ToolBox.imp $(OBJ)debugFindCtx.imp $(OBJ)Debugger.imp \
-       $(OBJ)debugTools.imp $(OBJ)GDBDialog.imp $(OBJ)process.imp $(OBJ)BreakpointsView.imp \
-       $(OBJ)CallStackView.imp $(OBJ)OutputView.imp $(OBJ)ThreadsView.imp $(OBJ)WatchesView.imp \
-       $(OBJ)ModelView.imp $(OBJ)PictureEdit.imp $(OBJ)about.imp $(OBJ)ide.imp $(OBJ)IDESettings.imp
-IMPORTS2 = $(OBJ)OldIDESettings.imp $(OBJ)ProjectSettings.imp
-
-SOURCES = ../extras/FileSystemIterator.ec ../extras/gui/layout.ec \
-       ../extras/gui/controls/SelectorBar.ec ../extras/gui/controls/StringsBox.ec src/dialogs/ActiveCompilerDialog.ec \
-       src/dialogs/CompilersDetectionDialog.ec src/dialogs/FindInFilesDialog.ec src/dialogs/GlobalSettingsDialog.ec \
-       src/dialogs/NewProjectDialog.ec src/dialogs/NodeProperties.ec src/dialogs/ProjectActiveConfig.ec \
-       src/dialogs/WorkspaceSettings.ec src/dialogs/ProjectTabSettings.ec src/project/Project.ec \
-       src/project/ProjectConfig.ec src/project/ProjectNode.ec src/project/ProjectView.ec \
-       src/project/Workspace.ec $(if $(WINDOWS),src/project/vsSupport.ec,) src/designer/CodeEditor.ec \
-       src/designer/CodeObject.ec src/designer/Designer.ec src/designer/findCtx.ec src/designer/findExp.ec \
-       src/designer/findParams.ec src/designer/Sheet.ec src/designer/ToolBox.ec src/debugger/debugFindCtx.ec \
-       src/debugger/Debugger.ec src/debugger/debugTools.ec src/debugger/GDBDialog.ec src/debugger/process.ec \
-       src/panels/BreakpointsView.ec src/panels/CallStackView.ec src/panels/OutputView.ec \
-       src/panels/ThreadsView.ec src/panels/WatchesView.ec src/documents/ModelView.ec \
-       src/documents/PictureEdit.ec src/about.ec src/ide.ec src/IDESettings.ec src/OldIDESettings.ec \
+IMPORTS1 = \
+       $(OBJ)FileSystemIterator.imp \
+       $(OBJ)layout.imp \
+       $(OBJ)SelectorBar.imp \
+       $(OBJ)StringsBox.imp \
+       $(OBJ)ActiveCompilerDialog.imp \
+       $(OBJ)CompilersDetectionDialog.imp \
+       $(OBJ)FindInFilesDialog.imp \
+       $(OBJ)GlobalSettingsDialog.imp \
+       $(OBJ)NewProjectDialog.imp \
+       $(OBJ)NodeProperties.imp \
+       $(OBJ)ProjectActiveConfig.imp \
+       $(OBJ)WorkspaceSettings.imp \
+       $(OBJ)ProjectTabSettings.imp \
+       $(OBJ)Project.imp \
+       $(OBJ)ProjectConfig.imp \
+       $(OBJ)ProjectNode.imp \
+       $(OBJ)ProjectView.imp \
+       $(OBJ)Workspace.imp \
+       $(if $(WINDOWS),$(OBJ)vsSupport.imp,) \
+       $(OBJ)CodeEditor.imp \
+       $(OBJ)CodeObject.imp \
+       $(OBJ)Designer.imp \
+       $(OBJ)findCtx.imp \
+       $(OBJ)findExp.imp \
+       $(OBJ)findParams.imp \
+       $(OBJ)Sheet.imp \
+       $(OBJ)ToolBox.imp \
+       $(OBJ)debugFindCtx.imp \
+       $(OBJ)Debugger.imp \
+       $(OBJ)debugTools.imp \
+       $(OBJ)GDBDialog.imp \
+       $(OBJ)process.imp \
+       $(OBJ)BreakpointsView.imp \
+       $(OBJ)CallStackView.imp \
+       $(OBJ)OutputView.imp \
+       $(OBJ)ThreadsView.imp \
+       $(OBJ)WatchesView.imp \
+       $(OBJ)ModelView.imp \
+       $(OBJ)PictureEdit.imp \
+       $(OBJ)about.imp \
+       $(OBJ)ide.imp \
+       $(OBJ)IDESettings.imp
+IMPORTS2 = \
+       $(OBJ)OldIDESettings.imp \
+       $(OBJ)ProjectSettings.imp
+
+SOURCES = \
+       ../extras/FileSystemIterator.ec \
+       ../extras/gui/layout.ec \
+       ../extras/gui/controls/SelectorBar.ec \
+       ../extras/gui/controls/StringsBox.ec \
+       src/dialogs/ActiveCompilerDialog.ec \
+       src/dialogs/CompilersDetectionDialog.ec \
+       src/dialogs/FindInFilesDialog.ec \
+       src/dialogs/GlobalSettingsDialog.ec \
+       src/dialogs/NewProjectDialog.ec \
+       src/dialogs/NodeProperties.ec \
+       src/dialogs/ProjectActiveConfig.ec \
+       src/dialogs/WorkspaceSettings.ec \
+       src/dialogs/ProjectTabSettings.ec \
+       src/project/Project.ec \
+       src/project/ProjectConfig.ec \
+       src/project/ProjectNode.ec \
+       src/project/ProjectView.ec \
+       src/project/Workspace.ec \
+       $(if $(WINDOWS),src/project/vsSupport.ec,) \
+       src/designer/CodeEditor.ec \
+       src/designer/CodeObject.ec \
+       src/designer/Designer.ec \
+       src/designer/findCtx.ec \
+       src/designer/findExp.ec \
+       src/designer/findParams.ec \
+       src/designer/Sheet.ec \
+       src/designer/ToolBox.ec \
+       src/debugger/debugFindCtx.ec \
+       src/debugger/Debugger.ec \
+       src/debugger/debugTools.ec \
+       src/debugger/GDBDialog.ec \
+       src/debugger/process.ec \
+       src/panels/BreakpointsView.ec \
+       src/panels/CallStackView.ec \
+       src/panels/OutputView.ec \
+       src/panels/ThreadsView.ec \
+       src/panels/WatchesView.ec \
+       src/documents/ModelView.ec \
+       src/documents/PictureEdit.ec \
+       src/about.ec \
+       src/ide.ec \
+       src/IDESettings.ec \
+       src/OldIDESettings.ec \
        src/ProjectSettings.ec
 
-RESOURCES = $(RES)actions/attach.png $(RES)actions/delete.png $(RES)actions/detach.png \
-       $(RES)actions/docNew.png $(RES)actions/editCopy.png $(RES)actions/editDelete.png \
-       $(RES)actions/delete2.png $(RES)codeMarks/breakpoint.png $(RES)codeMarks/breakpointDisabled.png \
-       $(RES)codeMarks/breakpointHalf.png $(RES)codeMarks/breakpointHalfDisabled.png $(RES)codeMarks/cursor.png \
-       $(RES)codeMarks/cursorError.png $(RES)codeMarks/topFrame.png $(RES)codeMarks/topFrameError.png \
-       $(RES)codeMarks/topFrameHalf.png $(RES)codeMarks/topFrameHalfError.png $(RES)others/mousePointer.png \
-       locale/zh_CN/LC_MESSAGES/ide.mo res/ecere.jpg res/ecereBack.jpg res/icon.png ../include.mk
+RESOURCES = \
+       $(RES)actions/attach.png \
+       $(RES)actions/delete.png \
+       $(RES)actions/detach.png \
+       $(RES)actions/docNew.png \
+       $(RES)actions/editCopy.png \
+       $(RES)actions/editDelete.png \
+       $(RES)actions/delete2.png \
+       $(RES)codeMarks/breakpoint.png \
+       $(RES)codeMarks/breakpointDisabled.png \
+       $(RES)codeMarks/breakpointHalf.png \
+       $(RES)codeMarks/breakpointHalfDisabled.png \
+       $(RES)codeMarks/cursor.png \
+       $(RES)codeMarks/cursorError.png \
+       $(RES)codeMarks/topFrame.png \
+       $(RES)codeMarks/topFrameError.png \
+       $(RES)codeMarks/topFrameHalf.png \
+       $(RES)codeMarks/topFrameHalfError.png \
+       $(RES)others/mousePointer.png \
+       locale/zh_CN/LC_MESSAGES/ide.mo \
+       res/ecere.jpg \
+       res/ecereBack.jpg \
+       res/icon.png \
+       ../include.mk
 
 # CROSS-PLATFORM MAGIC