documentor: Fixed caret positioning bug after opening a new page
[sdk] / ecere / Makefile.installer
index 49c2644..20e2794 100644 (file)
@@ -67,31 +67,14 @@ _ECSOURCES1 = \
        src/sys/units.ec \
        src/sys/i18n.ec \
        src/sys/Condition.ec \
-       $(if $(WINDOWS_TARGET),,src/gfx/3D/meshes/Cube.ec) \
-       $(if $(WINDOWS_TARGET),,src/gfx/3D/meshes/SkyBox.ec) \
-       $(if $(WINDOWS_TARGET),,src/gfx/3D/meshes/Sphere.ec) \
-       $(if $(WINDOWS_TARGET),,src/gfx/3D/models/Object3DSFormat.ec) \
-       $(if $(WINDOWS_TARGET),,src/gfx/3D/Camera.ec) \
-       $(if $(WINDOWS_TARGET),,src/gfx/3D/Matrix.ec) \
-       $(if $(WINDOWS_TARGET),,src/gfx/3D/Mesh.ec) \
-       $(if $(WINDOWS_TARGET),,src/gfx/3D/Object.ec) \
-       $(if $(WINDOWS_TARGET),,src/gfx/3D/Plane.ec) \
-       $(if $(WINDOWS_TARGET),,src/gfx/3D/Quaternion.ec) \
-       $(if $(WINDOWS_TARGET),,src/gfx/3D/Vector3D.ec) \
        src/gfx/bitmaps/BMPFormat.ec \
-       $(if $(WINDOWS_TARGET),,src/gfx/bitmaps/GIFFormat.ec) \
-       $(if $(WINDOWS_TARGET),,src/gfx/bitmaps/JPEGFormat.ec) \
        src/gfx/bitmaps/PCXFormat.ec \
        src/gfx/bitmaps/PNGFormat.ec \
-       $(if $(WINDOWS_TARGET),,src/gfx/bitmaps/RGBFormat.ec) \
        $(if $(WINDOWS_TARGET),src/gfx/drivers/GDIDisplayDriver.ec,) \
        src/gfx/drivers/lfbBlit.ec \
        src/gfx/drivers/lfbConvert.ec \
-       src/gfx/drivers/LFBDisplayDriver.ec \
-       $(if $(or $(LINUX_TARGET),$(OSX_TARGET)),src/gfx/drivers/NCursesDisplayDriver.ec,)
+       src/gfx/drivers/LFBDisplayDriver.ec
 _ECSOURCES2 = \
-       $(if $(OSX_TARGET),src/gfx/drivers/CocoaOpenGLDisplayDriver.ec,) \
-       $(if $(or $(LINUX_TARGET),$(OSX_TARGET)),src/gfx/drivers/XDisplayDriver.ec,) \
        src/gfx/Bitmap.ec \
        src/gfx/BitmapResource.ec \
        src/gfx/Color.ec \
@@ -100,6 +83,9 @@ _ECSOURCES2 = \
        src/gfx/FontResource.ec \
        src/gfx/Resource.ec \
        src/gfx/Surface.ec \
+       src/gfx/fontManagement.ec \
+       src/gfx/fontRendering.ec \
+       src/gfx/imgDistMap.ec \
        src/gui/controls/Button.ec \
        src/gui/controls/CalendarControl.ec \
        src/gui/controls/DataBox.ec \
@@ -125,18 +111,12 @@ _ECSOURCES2 = \
        src/gui/dialogs/MessageBox.ec \
        src/gui/dialogs/ReplaceDialog.ec \
        src/gui/dialogs/WindowList.ec \
-       $(if $(OSX_TARGET),src/gui/drivers/cocoa/CocoaDispatch.ec,) \
-       $(if $(OSX_TARGET),src/gui/drivers/cocoa/CocoaInterface.ec,) \
-       $(if $(or $(LINUX_TARGET),$(OSX_TARGET)),src/gui/drivers/NCursesInterface.ec,) \
-       $(if $(WINDOWS_TARGET),src/gui/drivers/Win32Interface.ec,) \
-       $(if $(or $(LINUX_TARGET),$(OSX_TARGET)),src/gui/drivers/XInterface.ec,)
+       $(if $(WINDOWS_TARGET),src/gui/drivers/Win32Interface.ec,)
 _ECSOURCES3 = \
-       $(if $(WINDOWS_TARGET),,src/gui/skins/TVisionSkin.ec) \
        src/gui/skins/WindowsSkin.ec \
        src/gui/Anchor.ec \
        src/gui/ClipBoard.ec \
        src/gui/Cursor.ec \
-       $(if $(WINDOWS_TARGET),,src/gui/Desktop3D.ec) \
        src/gui/FormDesigner.ec \
        src/gui/GuiApplication.ec \
        src/gui/Interface.ec \
@@ -145,12 +125,6 @@ _ECSOURCES3 = \
        src/gui/Timer.ec \
        src/gui/typeEdit.ec \
        src/gui/Window.ec \
-       $(if $(WINDOWS_TARGET),,src/net/dcom.ec) \
-       $(if $(WINDOWS_TARGET),,src/net/HTTPFile.ec) \
-       $(if $(WINDOWS_TARGET),,src/net/network.ec) \
-       $(if $(WINDOWS_TARGET),,src/net/NetworkClientFile.ec) \
-       $(if $(WINDOWS_TARGET),,src/net/Service.ec) \
-       $(if $(WINDOWS_TARGET),,src/net/Socket.ec) \
        src/com/containers/Array.ec \
        src/com/containers/AVLTree.ec \
        src/com/containers/BuiltInContainer.ec \
@@ -225,8 +199,6 @@ _OBJECTS = \
        $(OBJ)File.c.o \
        $(OBJ)DualPipe.c.o \
        $(OBJ)System.c.o \
-       $(if $(OSX_TARGET),$(OBJ)CocoaEcereBridge.o,) \
-       $(if $(OSX_TARGET),$(OBJ)EcereView.o,) \
        $(OBJ)instance.c.o
 
 OBJECTS = $(_OBJECTS) $(ECOBJECTS) $(OBJ)$(MODULE).main$(O)
@@ -235,8 +207,6 @@ SOURCES = $(ECSOURCES) \
        src/sys/File.c \
        src/sys/DualPipe.c \
        src/sys/System.c \
-       $(if $(OSX_TARGET),src/gui/drivers/cocoa/CocoaEcereBridge.m,) \
-       $(if $(OSX_TARGET),src/gui/drivers/cocoa/EcereView.m,) \
        src/com/instance.c
 
 RESOURCES = $(RESOURCES1) $(RESOURCES2) $(RESOURCES3)
@@ -345,13 +315,13 @@ RESOURCES3 = \
        $(RES)status/audioVolumeHigh.png \
        $(RES)status/folderOpen.png \
        $(RES)unicode/derivedGeneralCategoryStripped.txt \
-       locale/ecere/es.mo \
-       locale/ecere/hu.mo \
-       locale/ecere/mr.mo \
-       locale/ecere/nl.mo \
-       locale/ecere/pt_BR.mo \
-       locale/ecere/ru.mo \
-       locale/ecere/zh_CN.mo
+       locale/es.mo \
+       locale/hu.mo \
+       locale/mr.mo \
+       locale/nl.mo \
+       locale/pt_BR.mo \
+       locale/ru.mo \
+       locale/zh_CN.mo
 
 LIBS += $(SHAREDLIB) $(EXECUTABLE) $(LINKOPT)
 
@@ -365,11 +335,10 @@ endif
 
 PRJ_CFLAGS += \
         $(if $(WINDOWS_TARGET), \
-                        -I../deps/DirectX-9.0/include \
-                        -I../deps/jpeg-6b \
-                        -I../deps/libpng-1.4.0 \
+                        -I../deps/jpeg-9a \
+                        -I../deps/libpng-1.6.12 \
                         -I../deps/libungif-4.1.1/lib \
-                        -I../deps/zlib \
+                        -I../deps/zlib-1.2.8 \
                         -I../deps/freetype-2.3.12/include \
                         -I../deps/glext,) \
         $(if $(LINUX_TARGET), \
@@ -380,8 +349,8 @@ PRJ_CFLAGS += \
                         -I$(SYSROOT)/usr/X11/include \
                         -I/usr/X11R6/include/freetype2 \
                         -I/usr/X11R6/include \
-                        -I../deps/jpeg-6b \
-                        -I../deps/libpng-1.4.0 \
+                        -I../deps/jpeg-9a \
+                        -I../deps/libpng-1.6.12 \
                         -I../deps/libungif-4.1.1/lib,) \
         $(if $(DEBUG), -g, -Os) $(FPIC) -w -DREPOSITORY_VERSION="\"$(REPOSITORY_VER)\"" \
                         -DBUILDING_ECERE_COM \
@@ -398,6 +367,7 @@ CUSTOM1_PRJ_CFLAGS = \
                         -DECERE_COM_MODULE \
         $(PRJ_CFLAGS)
 
+ECFLAGS += -module $(MODULE)
 ECFLAGS += \
         -nolinenumbers -defaultns ecere
 
@@ -407,9 +377,9 @@ ifdef WINDOWS_TARGET
 
 ifndef STATIC_LIBRARY_TARGET
 OFLAGS += \
-        -L$(call quote_path,../deps/zlib/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)) \
-        -L$(call quote_path,../deps/jpeg-6b/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)) \
-        -L$(call quote_path,../deps/libpng-1.4.0/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)) \
+        -L$(call quote_path,../deps/zlib-1.2.8/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)) \
+        -L$(call quote_path,../deps/jpeg-9a/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)) \
+        -L$(call quote_path,../deps/libpng-1.6.12/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)) \
         -L$(call quote_path,../deps/libungif-4.1.1/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)) \
         -L$(call quote_path,../deps/freetype-2.3.12/obj/release.$(PLATFORM)$(COMPILER_SUFFIX))
 LIBS += \
@@ -460,8 +430,8 @@ ifndef STATIC_LIBRARY_TARGET
 OFLAGS += \
         -L$(call quote_path,$(SYSROOT)/usr/X11/lib) \
         -L$(call quote_path,/usr/X11R6/lib) \
-        -L$(call quote_path,../deps/jpeg-6b/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)) \
-        -L$(call quote_path,../deps/libpng-1.4.0/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)) \
+        -L$(call quote_path,../deps/jpeg-9a/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)) \
+        -L$(call quote_path,../deps/libpng-1.6.12/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)) \
         -L$(call quote_path,../deps/libungif-4.1.1/obj/release.$(PLATFORM)$(COMPILER_SUFFIX))
 LIBS += \
        $(call _L,curses) \
@@ -489,12 +459,12 @@ CECFLAGS += -cpp $(_CPP)
 all: objdir $(TARGET)
 
 objdir:
-       $(if $(wildcard $(OBJ)),,$(call mkdirq,$(OBJ)))
+       $(if $(wildcard $(OBJ)),,$(call mkdir,$(OBJ)))
        $(if $(ECERE_SDK_SRC),$(if $(wildcard $(call escspace,$(ECERE_SDK_SRC)/crossplatform.mk)),,@$(call echo,Ecere SDK Source Warning: The value of ECERE_SDK_SRC is pointing to an incorrect ($(ECERE_SDK_SRC)) location.)),)
        $(if $(ECERE_SDK_SRC),,$(if $(ECP_DEBUG)$(ECC_DEBUG)$(ECS_DEBUG),@$(call echo,ECC Debug Warning: Please define ECERE_SDK_SRC before using ECP_DEBUG, ECC_DEBUG or ECS_DEBUG),))
 
 $(OBJ)$(MODULE).main.ec: $(SYMBOLS) $(COBJECTS)
-       @$(call rmq,$(OBJ)symbols.lst)
+       @$(call rm,$(OBJ)symbols.lst)
        @$(call touch,$(OBJ)symbols.lst)
        @$(call echo,$(SYMBOLS1)) >> $(OBJ)symbols.lst
        @$(call echo,$(SYMBOLS2)) >> $(OBJ)symbols.lst
@@ -511,7 +481,7 @@ $(OBJ)$(MODULE).main.c: $(OBJ)$(MODULE).main.ec
 $(SYMBOLS): | objdir
 $(OBJECTS): | objdir
 $(TARGET): $(SOURCES) $(RESOURCES) $(SYMBOLS) $(OBJECTS) | objdir
-       @$(call rmq,$(OBJ)objects.lst)
+       @$(call rm,$(OBJ)objects.lst)
        @$(call touch,$(OBJ)objects.lst)
        @$(call echo,$(_OBJECTS)) >> $(OBJ)objects.lst
        @$(call echo,$(OBJ)$(MODULE).main$(O)) >> $(OBJ)objects.lst
@@ -540,9 +510,13 @@ endif
        $(EAR) aw$(EARFLAGS) $(TARGET) $(RES)places/driveRemote.png $(RES)places/folder.png $(RES)places/folderRemote.png $(RES)places/networkServer.png $(RES)places/networkWorkgroup.png $(RES)places/brokenFolder.png "places"
        $(EAR) aw$(EARFLAGS) $(TARGET) $(RES)status/audioVolumeHigh.png $(RES)status/folderOpen.png "status"
        $(EAR) aw$(EARFLAGS) $(TARGET) $(RES)unicode/derivedGeneralCategoryStripped.txt "unicode"
-       $(EAR) aw$(EARFLAGS) $(TARGET) locale/ecere/es.mo locale/ecere/hu.mo locale/ecere/mr.mo locale/ecere/nl.mo locale/ecere/pt_BR.mo locale/ecere/ru.mo locale/ecere/zh_CN.mo "locale/ecere"
+       $(EAR) aw$(EARFLAGS) $(TARGET) locale/es.mo locale/hu.mo locale/mr.mo locale/nl.mo locale/pt_BR.mo locale/ru.mo locale/zh_CN.mo "locale"
 else
+ifdef WINDOWS_HOST
        $(AR) rcs $(TARGET) @$(OBJ)objects.lst $(LIBS)
+else
+       $(AR) rcs $(TARGET) $(OBJECTS) $(LIBS)
+endif
 endif
 ifdef SHARED_LIBRARY_TARGET
 ifdef LINUX_TARGET
@@ -618,86 +592,10 @@ $(OBJ)i18n.sym: src/sys/i18n.ec
 $(OBJ)Condition.sym: src/sys/Condition.ec
        $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/sys/Condition.ec) -o $(call quote_path,$@)
 
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Cube.sym: src/gfx/3D/meshes/Cube.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/3D/meshes/Cube.ec) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)SkyBox.sym: src/gfx/3D/meshes/SkyBox.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/3D/meshes/SkyBox.ec) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Sphere.sym: src/gfx/3D/meshes/Sphere.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/3D/meshes/Sphere.ec) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Object3DSFormat.sym: src/gfx/3D/models/Object3DSFormat.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/3D/models/Object3DSFormat.ec) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Camera.sym: src/gfx/3D/Camera.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/3D/Camera.ec) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Matrix.sym: src/gfx/3D/Matrix.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/3D/Matrix.ec) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Mesh.sym: src/gfx/3D/Mesh.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/3D/Mesh.ec) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Object.sym: src/gfx/3D/Object.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/3D/Object.ec) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Plane.sym: src/gfx/3D/Plane.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/3D/Plane.ec) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Quaternion.sym: src/gfx/3D/Quaternion.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/3D/Quaternion.ec) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Vector3D.sym: src/gfx/3D/Vector3D.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/3D/Vector3D.ec) -o $(call quote_path,$@)
-endif
-
 $(OBJ)BMPFormat.sym: src/gfx/bitmaps/BMPFormat.ec
        $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/bitmaps/BMPFormat.ec) -o $(call quote_path,$@)
 
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)GIFFormat.sym: src/gfx/bitmaps/GIFFormat.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/bitmaps/GIFFormat.ec) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)JPEGFormat.sym: src/gfx/bitmaps/JPEGFormat.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/bitmaps/JPEGFormat.ec) -o $(call quote_path,$@)
-endif
-
-$(OBJ)PCXFormat.sym: src/gfx/bitmaps/PCXFormat.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/bitmaps/PCXFormat.ec) -o $(call quote_path,$@)
-
-$(OBJ)PNGFormat.sym: src/gfx/bitmaps/PNGFormat.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/bitmaps/PNGFormat.ec) -o $(call quote_path,$@)
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)RGBFormat.sym: src/gfx/bitmaps/RGBFormat.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/bitmaps/RGBFormat.ec) -o $(call quote_path,$@)
-endif
-
-ifneq "$(WINDOWS_TARGET)" ""
+ifneq ($(WINDOWS_TARGET),)
 $(OBJ)GDIDisplayDriver.sym: src/gfx/drivers/GDIDisplayDriver.ec
        $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/drivers/GDIDisplayDriver.ec) -o $(call quote_path,$@)
 endif
@@ -711,21 +609,6 @@ $(OBJ)lfbConvert.sym: src/gfx/drivers/lfbConvert.ec
 $(OBJ)LFBDisplayDriver.sym: src/gfx/drivers/LFBDisplayDriver.ec
        $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/drivers/LFBDisplayDriver.ec) -o $(call quote_path,$@)
 
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)NCursesDisplayDriver.sym: src/gfx/drivers/NCursesDisplayDriver.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/drivers/NCursesDisplayDriver.ec) -o $(call quote_path,$@)
-endif
-
-ifneq "$(OSX_TARGET)" ""
-$(OBJ)CocoaOpenGLDisplayDriver.sym: src/gfx/drivers/CocoaOpenGLDisplayDriver.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/drivers/CocoaOpenGLDisplayDriver.ec) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)XDisplayDriver.sym: src/gfx/drivers/XDisplayDriver.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/drivers/XDisplayDriver.ec) -o $(call quote_path,$@)
-endif
-
 $(OBJ)Bitmap.sym: src/gfx/Bitmap.ec
        $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/Bitmap.ec) -o $(call quote_path,$@)
 
@@ -750,6 +633,15 @@ $(OBJ)Resource.sym: src/gfx/Resource.ec
 $(OBJ)Surface.sym: src/gfx/Surface.ec
        $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/Surface.ec) -o $(call quote_path,$@)
 
+$(OBJ)fontManagement.sym: src/gfx/fontManagement.ec
+       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/fontManagement.ec) -o $(call quote_path,$@)
+
+$(OBJ)fontRendering.sym: src/gfx/fontRendering.ec
+       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/fontRendering.ec) -o $(call quote_path,$@)
+
+$(OBJ)imgDistMap.sym: src/gfx/imgDistMap.ec
+       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/imgDistMap.ec) -o $(call quote_path,$@)
+
 $(OBJ)Button.sym: src/gui/controls/Button.ec
        $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gui/controls/Button.ec) -o $(call quote_path,$@)
 
@@ -825,36 +717,11 @@ $(OBJ)ReplaceDialog.sym: src/gui/dialogs/ReplaceDialog.ec
 $(OBJ)WindowList.sym: src/gui/dialogs/WindowList.ec
        $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gui/dialogs/WindowList.ec) -o $(call quote_path,$@)
 
-ifneq "$(OSX_TARGET)" ""
-$(OBJ)CocoaDispatch.sym: src/gui/drivers/cocoa/CocoaDispatch.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gui/drivers/cocoa/CocoaDispatch.ec) -o $(call quote_path,$@)
-endif
-
-ifneq "$(OSX_TARGET)" ""
-$(OBJ)CocoaInterface.sym: src/gui/drivers/cocoa/CocoaInterface.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gui/drivers/cocoa/CocoaInterface.ec) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)NCursesInterface.sym: src/gui/drivers/NCursesInterface.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gui/drivers/NCursesInterface.ec) -o $(call quote_path,$@)
-endif
-
-ifneq "$(WINDOWS_TARGET)" ""
+ifneq ($(WINDOWS_TARGET),)
 $(OBJ)Win32Interface.sym: src/gui/drivers/Win32Interface.ec
        $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gui/drivers/Win32Interface.ec) -o $(call quote_path,$@)
 endif
 
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)XInterface.sym: src/gui/drivers/XInterface.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gui/drivers/XInterface.ec) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)TVisionSkin.sym: src/gui/skins/TVisionSkin.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gui/skins/TVisionSkin.ec) -o $(call quote_path,$@)
-endif
-
 $(OBJ)WindowsSkin.sym: src/gui/skins/WindowsSkin.ec
        $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gui/skins/WindowsSkin.ec) -o $(call quote_path,$@)
 
@@ -867,11 +734,6 @@ $(OBJ)ClipBoard.sym: src/gui/ClipBoard.ec
 $(OBJ)Cursor.sym: src/gui/Cursor.ec
        $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gui/Cursor.ec) -o $(call quote_path,$@)
 
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Desktop3D.sym: src/gui/Desktop3D.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gui/Desktop3D.ec) -o $(call quote_path,$@)
-endif
-
 $(OBJ)FormDesigner.sym: src/gui/FormDesigner.ec
        $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gui/FormDesigner.ec) -o $(call quote_path,$@)
 
@@ -896,36 +758,6 @@ $(OBJ)typeEdit.sym: src/gui/typeEdit.ec
 $(OBJ)Window.sym: src/gui/Window.ec
        $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gui/Window.ec) -o $(call quote_path,$@)
 
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)dcom.sym: src/net/dcom.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/net/dcom.ec) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)HTTPFile.sym: src/net/HTTPFile.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/net/HTTPFile.ec) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)network.sym: src/net/network.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/net/network.ec) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)NetworkClientFile.sym: src/net/NetworkClientFile.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/net/NetworkClientFile.ec) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Service.sym: src/net/Service.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/net/Service.ec) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Socket.sym: src/net/Socket.ec
-       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/net/Socket.ec) -o $(call quote_path,$@)
-endif
-
 $(OBJ)Array.sym: src/com/containers/Array.ec
        $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_PRJ_CFLAGS) -c $(call quote_path,src/com/containers/Array.ec) -o $(call quote_path,$@)
 
@@ -1033,86 +865,16 @@ $(OBJ)i18n.c: src/sys/i18n.ec $(OBJ)i18n.sym | $(SYMBOLS)
 $(OBJ)Condition.c: src/sys/Condition.ec $(OBJ)Condition.sym | $(SYMBOLS)
        $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/sys/Condition.ec) -o $(call quote_path,$@) -symbols $(OBJ)
 
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Cube.c: src/gfx/3D/meshes/Cube.ec $(OBJ)Cube.sym | $(SYMBOLS)
-       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/3D/meshes/Cube.ec) -o $(call quote_path,$@) -symbols $(OBJ)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)SkyBox.c: src/gfx/3D/meshes/SkyBox.ec $(OBJ)SkyBox.sym | $(SYMBOLS)
-       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/3D/meshes/SkyBox.ec) -o $(call quote_path,$@) -symbols $(OBJ)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Sphere.c: src/gfx/3D/meshes/Sphere.ec $(OBJ)Sphere.sym | $(SYMBOLS)
-       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/3D/meshes/Sphere.ec) -o $(call quote_path,$@) -symbols $(OBJ)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Object3DSFormat.c: src/gfx/3D/models/Object3DSFormat.ec $(OBJ)Object3DSFormat.sym | $(SYMBOLS)
-       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/3D/models/Object3DSFormat.ec) -o $(call quote_path,$@) -symbols $(OBJ)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Camera.c: src/gfx/3D/Camera.ec $(OBJ)Camera.sym | $(SYMBOLS)
-       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/3D/Camera.ec) -o $(call quote_path,$@) -symbols $(OBJ)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Matrix.c: src/gfx/3D/Matrix.ec $(OBJ)Matrix.sym | $(SYMBOLS)
-       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/3D/Matrix.ec) -o $(call quote_path,$@) -symbols $(OBJ)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Mesh.c: src/gfx/3D/Mesh.ec $(OBJ)Mesh.sym | $(SYMBOLS)
-       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/3D/Mesh.ec) -o $(call quote_path,$@) -symbols $(OBJ)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Object.c: src/gfx/3D/Object.ec $(OBJ)Object.sym | $(SYMBOLS)
-       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/3D/Object.ec) -o $(call quote_path,$@) -symbols $(OBJ)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Plane.c: src/gfx/3D/Plane.ec $(OBJ)Plane.sym | $(SYMBOLS)
-       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/3D/Plane.ec) -o $(call quote_path,$@) -symbols $(OBJ)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Quaternion.c: src/gfx/3D/Quaternion.ec $(OBJ)Quaternion.sym | $(SYMBOLS)
-       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/3D/Quaternion.ec) -o $(call quote_path,$@) -symbols $(OBJ)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Vector3D.c: src/gfx/3D/Vector3D.ec $(OBJ)Vector3D.sym | $(SYMBOLS)
-       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/3D/Vector3D.ec) -o $(call quote_path,$@) -symbols $(OBJ)
-endif
-
 $(OBJ)BMPFormat.c: src/gfx/bitmaps/BMPFormat.ec $(OBJ)BMPFormat.sym | $(SYMBOLS)
        $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/bitmaps/BMPFormat.ec) -o $(call quote_path,$@) -symbols $(OBJ)
 
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)GIFFormat.c: src/gfx/bitmaps/GIFFormat.ec $(OBJ)GIFFormat.sym | $(SYMBOLS)
-       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/bitmaps/GIFFormat.ec) -o $(call quote_path,$@) -symbols $(OBJ)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)JPEGFormat.c: src/gfx/bitmaps/JPEGFormat.ec $(OBJ)JPEGFormat.sym | $(SYMBOLS)
-       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/bitmaps/JPEGFormat.ec) -o $(call quote_path,$@) -symbols $(OBJ)
-endif
-
 $(OBJ)PCXFormat.c: src/gfx/bitmaps/PCXFormat.ec $(OBJ)PCXFormat.sym | $(SYMBOLS)
        $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/bitmaps/PCXFormat.ec) -o $(call quote_path,$@) -symbols $(OBJ)
 
 $(OBJ)PNGFormat.c: src/gfx/bitmaps/PNGFormat.ec $(OBJ)PNGFormat.sym | $(SYMBOLS)
        $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/bitmaps/PNGFormat.ec) -o $(call quote_path,$@) -symbols $(OBJ)
 
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)RGBFormat.c: src/gfx/bitmaps/RGBFormat.ec $(OBJ)RGBFormat.sym | $(SYMBOLS)
-       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/bitmaps/RGBFormat.ec) -o $(call quote_path,$@) -symbols $(OBJ)
-endif
-
-ifneq "$(WINDOWS_TARGET)" ""
+ifneq ($(WINDOWS_TARGET),)
 $(OBJ)GDIDisplayDriver.c: src/gfx/drivers/GDIDisplayDriver.ec $(OBJ)GDIDisplayDriver.sym | $(SYMBOLS)
        $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/drivers/GDIDisplayDriver.ec) -o $(call quote_path,$@) -symbols $(OBJ)
 endif
@@ -1126,21 +888,11 @@ $(OBJ)lfbConvert.c: src/gfx/drivers/lfbConvert.ec $(OBJ)lfbConvert.sym | $(SYMBO
 $(OBJ)LFBDisplayDriver.c: src/gfx/drivers/LFBDisplayDriver.ec $(OBJ)LFBDisplayDriver.sym | $(SYMBOLS)
        $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/drivers/LFBDisplayDriver.ec) -o $(call quote_path,$@) -symbols $(OBJ)
 
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
+ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),)
 $(OBJ)NCursesDisplayDriver.c: src/gfx/drivers/NCursesDisplayDriver.ec $(OBJ)NCursesDisplayDriver.sym | $(SYMBOLS)
        $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/drivers/NCursesDisplayDriver.ec) -o $(call quote_path,$@) -symbols $(OBJ)
 endif
 
-ifneq "$(OSX_TARGET)" ""
-$(OBJ)CocoaOpenGLDisplayDriver.c: src/gfx/drivers/CocoaOpenGLDisplayDriver.ec $(OBJ)CocoaOpenGLDisplayDriver.sym | $(SYMBOLS)
-       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/drivers/CocoaOpenGLDisplayDriver.ec) -o $(call quote_path,$@) -symbols $(OBJ)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)XDisplayDriver.c: src/gfx/drivers/XDisplayDriver.ec $(OBJ)XDisplayDriver.sym | $(SYMBOLS)
-       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/drivers/XDisplayDriver.ec) -o $(call quote_path,$@) -symbols $(OBJ)
-endif
-
 $(OBJ)Bitmap.c: src/gfx/Bitmap.ec $(OBJ)Bitmap.sym | $(SYMBOLS)
        $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/Bitmap.ec) -o $(call quote_path,$@) -symbols $(OBJ)
 
@@ -1165,6 +917,15 @@ $(OBJ)Resource.c: src/gfx/Resource.ec $(OBJ)Resource.sym | $(SYMBOLS)
 $(OBJ)Surface.c: src/gfx/Surface.ec $(OBJ)Surface.sym | $(SYMBOLS)
        $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/Surface.ec) -o $(call quote_path,$@) -symbols $(OBJ)
 
+$(OBJ)fontManagement.c: src/gfx/fontManagement.ec $(OBJ)fontManagement.sym | $(SYMBOLS)
+       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/fontManagement.ec) -o $(call quote_path,$@) -symbols $(OBJ)
+
+$(OBJ)fontRendering.c: src/gfx/fontRendering.ec $(OBJ)fontRendering.sym | $(SYMBOLS)
+       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/fontRendering.ec) -o $(call quote_path,$@) -symbols $(OBJ)
+
+$(OBJ)imgDistMap.c: src/gfx/imgDistMap.ec $(OBJ)imgDistMap.sym | $(SYMBOLS)
+       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/imgDistMap.ec) -o $(call quote_path,$@) -symbols $(OBJ)
+
 $(OBJ)Button.c: src/gui/controls/Button.ec $(OBJ)Button.sym | $(SYMBOLS)
        $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gui/controls/Button.ec) -o $(call quote_path,$@) -symbols $(OBJ)
 
@@ -1240,36 +1001,16 @@ $(OBJ)ReplaceDialog.c: src/gui/dialogs/ReplaceDialog.ec $(OBJ)ReplaceDialog.sym
 $(OBJ)WindowList.c: src/gui/dialogs/WindowList.ec $(OBJ)WindowList.sym | $(SYMBOLS)
        $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gui/dialogs/WindowList.ec) -o $(call quote_path,$@) -symbols $(OBJ)
 
-ifneq "$(OSX_TARGET)" ""
-$(OBJ)CocoaDispatch.c: src/gui/drivers/cocoa/CocoaDispatch.ec $(OBJ)CocoaDispatch.sym | $(SYMBOLS)
-       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gui/drivers/cocoa/CocoaDispatch.ec) -o $(call quote_path,$@) -symbols $(OBJ)
-endif
-
-ifneq "$(OSX_TARGET)" ""
-$(OBJ)CocoaInterface.c: src/gui/drivers/cocoa/CocoaInterface.ec $(OBJ)CocoaInterface.sym | $(SYMBOLS)
-       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gui/drivers/cocoa/CocoaInterface.ec) -o $(call quote_path,$@) -symbols $(OBJ)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)NCursesInterface.c: src/gui/drivers/NCursesInterface.ec $(OBJ)NCursesInterface.sym | $(SYMBOLS)
-       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gui/drivers/NCursesInterface.ec) -o $(call quote_path,$@) -symbols $(OBJ)
-endif
-
-ifneq "$(WINDOWS_TARGET)" ""
+ifneq ($(WINDOWS_TARGET),)
 $(OBJ)Win32Interface.c: src/gui/drivers/Win32Interface.ec $(OBJ)Win32Interface.sym | $(SYMBOLS)
        $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gui/drivers/Win32Interface.ec) -o $(call quote_path,$@) -symbols $(OBJ)
 endif
 
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
+ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),)
 $(OBJ)XInterface.c: src/gui/drivers/XInterface.ec $(OBJ)XInterface.sym | $(SYMBOLS)
        $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gui/drivers/XInterface.ec) -o $(call quote_path,$@) -symbols $(OBJ)
 endif
 
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)TVisionSkin.c: src/gui/skins/TVisionSkin.ec $(OBJ)TVisionSkin.sym | $(SYMBOLS)
-       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gui/skins/TVisionSkin.ec) -o $(call quote_path,$@) -symbols $(OBJ)
-endif
-
 $(OBJ)WindowsSkin.c: src/gui/skins/WindowsSkin.ec $(OBJ)WindowsSkin.sym | $(SYMBOLS)
        $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gui/skins/WindowsSkin.ec) -o $(call quote_path,$@) -symbols $(OBJ)
 
@@ -1282,11 +1023,6 @@ $(OBJ)ClipBoard.c: src/gui/ClipBoard.ec $(OBJ)ClipBoard.sym | $(SYMBOLS)
 $(OBJ)Cursor.c: src/gui/Cursor.ec $(OBJ)Cursor.sym | $(SYMBOLS)
        $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gui/Cursor.ec) -o $(call quote_path,$@) -symbols $(OBJ)
 
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Desktop3D.c: src/gui/Desktop3D.ec $(OBJ)Desktop3D.sym | $(SYMBOLS)
-       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gui/Desktop3D.ec) -o $(call quote_path,$@) -symbols $(OBJ)
-endif
-
 $(OBJ)FormDesigner.c: src/gui/FormDesigner.ec $(OBJ)FormDesigner.sym | $(SYMBOLS)
        $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gui/FormDesigner.ec) -o $(call quote_path,$@) -symbols $(OBJ)
 
@@ -1311,36 +1047,6 @@ $(OBJ)typeEdit.c: src/gui/typeEdit.ec $(OBJ)typeEdit.sym | $(SYMBOLS)
 $(OBJ)Window.c: src/gui/Window.ec $(OBJ)Window.sym | $(SYMBOLS)
        $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gui/Window.ec) -o $(call quote_path,$@) -symbols $(OBJ)
 
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)dcom.c: src/net/dcom.ec $(OBJ)dcom.sym | $(SYMBOLS)
-       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/net/dcom.ec) -o $(call quote_path,$@) -symbols $(OBJ)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)HTTPFile.c: src/net/HTTPFile.ec $(OBJ)HTTPFile.sym | $(SYMBOLS)
-       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/net/HTTPFile.ec) -o $(call quote_path,$@) -symbols $(OBJ)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)network.c: src/net/network.ec $(OBJ)network.sym | $(SYMBOLS)
-       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/net/network.ec) -o $(call quote_path,$@) -symbols $(OBJ)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)NetworkClientFile.c: src/net/NetworkClientFile.ec $(OBJ)NetworkClientFile.sym | $(SYMBOLS)
-       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/net/NetworkClientFile.ec) -o $(call quote_path,$@) -symbols $(OBJ)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Service.c: src/net/Service.ec $(OBJ)Service.sym | $(SYMBOLS)
-       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/net/Service.ec) -o $(call quote_path,$@) -symbols $(OBJ)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Socket.c: src/net/Socket.ec $(OBJ)Socket.sym | $(SYMBOLS)
-       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/net/Socket.ec) -o $(call quote_path,$@) -symbols $(OBJ)
-endif
-
 $(OBJ)Array.c: src/com/containers/Array.ec $(OBJ)Array.sym | $(SYMBOLS)
        $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/com/containers/Array.ec) -o $(call quote_path,$@) -symbols $(OBJ)
 
@@ -1457,86 +1163,16 @@ $(OBJ)i18n.o: $(OBJ)i18n.c
 $(OBJ)Condition.o: $(OBJ)Condition.c
        $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Condition.c) -o $(call quote_path,$@)
 
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Cube.o: $(OBJ)Cube.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Cube.c) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)SkyBox.o: $(OBJ)SkyBox.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)SkyBox.c) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Sphere.o: $(OBJ)Sphere.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Sphere.c) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Object3DSFormat.o: $(OBJ)Object3DSFormat.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Object3DSFormat.c) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Camera.o: $(OBJ)Camera.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Camera.c) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Matrix.o: $(OBJ)Matrix.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Matrix.c) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Mesh.o: $(OBJ)Mesh.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Mesh.c) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Object.o: $(OBJ)Object.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Object.c) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Plane.o: $(OBJ)Plane.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Plane.c) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Quaternion.o: $(OBJ)Quaternion.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Quaternion.c) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Vector3D.o: $(OBJ)Vector3D.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Vector3D.c) -o $(call quote_path,$@)
-endif
-
 $(OBJ)BMPFormat.o: $(OBJ)BMPFormat.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)BMPFormat.c) -o $(call quote_path,$@)
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)GIFFormat.o: $(OBJ)GIFFormat.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)GIFFormat.c) -o $(call quote_path,$@)
-endif
+       $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)BMPFormat.c -o $(OBJ)BMPFormat.o
 
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)JPEGFormat.o: $(OBJ)JPEGFormat.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)JPEGFormat.c) -o $(call quote_path,$@)
-endif
-
-$(OBJ)PCXFormat.o: $(OBJ)PCXFormat.c
+$(OBJ)PCXFormat$(O): $(OBJ)PCXFormat.c
        $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)PCXFormat.c) -o $(call quote_path,$@)
 
-$(OBJ)PNGFormat.o: $(OBJ)PNGFormat.c
+$(OBJ)PNGFormat$(O): $(OBJ)PNGFormat.c
        $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)PNGFormat.c) -o $(call quote_path,$@)
 
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)RGBFormat.o: $(OBJ)RGBFormat.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)RGBFormat.c) -o $(call quote_path,$@)
-endif
-
-ifneq "$(WINDOWS_TARGET)" ""
+ifneq ($(WINDOWS_TARGET),)
 $(OBJ)GDIDisplayDriver.o: $(OBJ)GDIDisplayDriver.c
        $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)GDIDisplayDriver.c) -o $(call quote_path,$@)
 endif
@@ -1550,21 +1186,6 @@ $(OBJ)lfbConvert.o: $(OBJ)lfbConvert.c
 $(OBJ)LFBDisplayDriver.o: $(OBJ)LFBDisplayDriver.c
        $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)LFBDisplayDriver.c) -o $(call quote_path,$@)
 
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)NCursesDisplayDriver.o: $(OBJ)NCursesDisplayDriver.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)NCursesDisplayDriver.c) -o $(call quote_path,$@)
-endif
-
-ifneq "$(OSX_TARGET)" ""
-$(OBJ)CocoaOpenGLDisplayDriver.o: $(OBJ)CocoaOpenGLDisplayDriver.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)CocoaOpenGLDisplayDriver.c) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)XDisplayDriver.o: $(OBJ)XDisplayDriver.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)XDisplayDriver.c) -o $(call quote_path,$@)
-endif
-
 $(OBJ)Bitmap.o: $(OBJ)Bitmap.c
        $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Bitmap.c) -o $(call quote_path,$@)
 
@@ -1589,6 +1210,15 @@ $(OBJ)Resource.o: $(OBJ)Resource.c
 $(OBJ)Surface.o: $(OBJ)Surface.c
        $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Surface.c) -o $(call quote_path,$@)
 
+$(OBJ)fontManagement$(O): $(OBJ)fontManagement.c
+       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)fontManagement.c) -o $(call quote_path,$@)
+
+$(OBJ)fontRendering$(O): $(OBJ)fontRendering.c
+       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)fontRendering.c) -o $(call quote_path,$@)
+
+$(OBJ)imgDistMap$(O): $(OBJ)imgDistMap.c
+       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)imgDistMap.c) -o $(call quote_path,$@)
+
 $(OBJ)Button.o: $(OBJ)Button.c
        $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Button.c) -o $(call quote_path,$@)
 
@@ -1664,46 +1294,16 @@ $(OBJ)ReplaceDialog.o: $(OBJ)ReplaceDialog.c
 $(OBJ)WindowList.o: $(OBJ)WindowList.c
        $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)WindowList.c) -o $(call quote_path,$@)
 
-ifneq "$(OSX_TARGET)" ""
-$(OBJ)CocoaDispatch.o: $(OBJ)CocoaDispatch.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)CocoaDispatch.c) -o $(call quote_path,$@)
-endif
-
-ifneq "$(OSX_TARGET)" ""
-$(OBJ)CocoaEcereBridge.o: src/gui/drivers/cocoa/CocoaEcereBridge.m
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gui/drivers/cocoa/CocoaEcereBridge.m) -o $(call quote_path,$@)
-endif
-
-ifneq "$(OSX_TARGET)" ""
-$(OBJ)CocoaInterface.o: $(OBJ)CocoaInterface.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)CocoaInterface.c) -o $(call quote_path,$@)
-endif
-
-ifneq "$(OSX_TARGET)" ""
-$(OBJ)EcereView.o: src/gui/drivers/cocoa/EcereView.m
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gui/drivers/cocoa/EcereView.m) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)NCursesInterface.o: $(OBJ)NCursesInterface.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)NCursesInterface.c) -o $(call quote_path,$@)
-endif
-
-ifneq "$(WINDOWS_TARGET)" ""
+ifneq ($(WINDOWS_TARGET),)
 $(OBJ)Win32Interface.o: $(OBJ)Win32Interface.c
        $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Win32Interface.c) -o $(call quote_path,$@)
 endif
 
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
+ifneq ($(or $(LINUX_TARGET),$(OSX_TARGET)),)
 $(OBJ)XInterface.o: $(OBJ)XInterface.c
        $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)XInterface.c) -o $(call quote_path,$@)
 endif
 
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)TVisionSkin.o: $(OBJ)TVisionSkin.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)TVisionSkin.c) -o $(call quote_path,$@)
-endif
-
 $(OBJ)WindowsSkin.o: $(OBJ)WindowsSkin.c
        $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)WindowsSkin.c) -o $(call quote_path,$@)
 
@@ -1716,11 +1316,6 @@ $(OBJ)ClipBoard.o: $(OBJ)ClipBoard.c
 $(OBJ)Cursor.o: $(OBJ)Cursor.c
        $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Cursor.c) -o $(call quote_path,$@)
 
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Desktop3D.o: $(OBJ)Desktop3D.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Desktop3D.c) -o $(call quote_path,$@)
-endif
-
 $(OBJ)FormDesigner.o: $(OBJ)FormDesigner.c
        $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)FormDesigner.c) -o $(call quote_path,$@)
 
@@ -1745,36 +1340,6 @@ $(OBJ)typeEdit.o: $(OBJ)typeEdit.c
 $(OBJ)Window.o: $(OBJ)Window.c
        $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Window.c) -o $(call quote_path,$@)
 
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)dcom.o: $(OBJ)dcom.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)dcom.c) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)HTTPFile.o: $(OBJ)HTTPFile.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)HTTPFile.c) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)network.o: $(OBJ)network.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)network.c) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)NetworkClientFile.o: $(OBJ)NetworkClientFile.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)NetworkClientFile.c) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Service.o: $(OBJ)Service.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Service.c) -o $(call quote_path,$@)
-endif
-
-ifneq "$(or $(LINUX_TARGET),$(OSX_TARGET))" ""
-$(OBJ)Socket.o: $(OBJ)Socket.c
-       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Socket.c) -o $(call quote_path,$@)
-endif
-
 $(OBJ)Array.o: $(OBJ)Array.c
        $(CC) $(CFLAGS) $(CUSTOM1_PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)Array.c) -o $(call quote_path,$@)
 
@@ -1824,39 +1389,43 @@ $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
        $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(call quote_path,$@)
 
 cleantarget: objdir
-       $(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
-       $(call rmq,$(OBJ)symbols.lst)
-       $(call rmq,$(OBJ)objects.lst)
-       $(call rmq,$(TARGET))
+       $(call rm,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
+       $(call rm,$(OBJ)symbols.lst)
+       $(call rm,$(OBJ)objects.lst)
+       $(call rm,$(TARGET))
 ifdef SHARED_LIBRARY_TARGET
 ifdef LINUX_TARGET
 ifdef LINUX_HOST
-       $(call rmq,$(OBJ)$(LP)$(MODULE)$(SO)$(basename $(VER)))
-       $(call rmq,$(OBJ)$(LP)$(MODULE)$(SO))
+       $(call rm,$(OBJ)$(LP)$(MODULE)$(SO)$(basename $(VER)))
+       $(call rm,$(OBJ)$(LP)$(MODULE)$(SO))
 endif
 endif
 endif
 
 clean: cleantarget
-       $(call rmq,$(_OBJECTS))
-       $(call rmq,$(_ECOBJECTS1))
-       $(call rmq,$(_ECOBJECTS2))
-       $(call rmq,$(_ECOBJECTS3))
-       $(call rmq,$(_COBJECTS1))
-       $(call rmq,$(_COBJECTS2))
-       $(call rmq,$(_COBJECTS3))
-       $(call rmq,$(_BOWLS1))
-       $(call rmq,$(_BOWLS2))
-       $(call rmq,$(_BOWLS3))
-       $(call rmq,$(_IMPORTS1))
-       $(call rmq,$(_IMPORTS2))
-       $(call rmq,$(_IMPORTS3))
-       $(call rmq,$(_SYMBOLS1))
-       $(call rmq,$(_SYMBOLS2))
-       $(call rmq,$(_SYMBOLS3))
+       $(call rm,$(_OBJECTS))
+       $(call rm,$(_ECOBJECTS1))
+       $(call rm,$(_ECOBJECTS2))
+       $(call rm,$(_ECOBJECTS3))
+       $(call rm,$(_COBJECTS1))
+       $(call rm,$(_COBJECTS2))
+       $(call rm,$(_COBJECTS3))
+       $(call rm,$(_BOWLS1))
+       $(call rm,$(_BOWLS2))
+       $(call rm,$(_BOWLS3))
+       $(call rm,$(_IMPORTS1))
+       $(call rm,$(_IMPORTS2))
+       $(call rm,$(_IMPORTS3))
+       $(call rm,$(_SYMBOLS1))
+       $(call rm,$(_SYMBOLS2))
+       $(call rm,$(_SYMBOLS3))
 
 realclean: cleantarget
-       $(call rmrq,$(OBJ))
+       $(call rmr,$(OBJ))
+
+distclean:
+       +$(call cdmake,./,-f $(_CF_DIR)Cleanfile distclean distclean_all_subdirs)
 
-distclean: cleantarget
-       $(call rmrq,obj/)
+Makefile.installer: ;
+$(_CF_DIR)crossplatform.mk: ;
+$(_CF_DIR)default.cf: ;