From b3f74bb12ab86a90a05f7d48325b25c408d0b985 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Mon, 28 Oct 2024 13:39:23 +0900
Subject: Drop Borland compiler specific code

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 69e1261df646edf24612d7f953dac81182e7461b)
---
 PLATFORMS                                          |   2 +-
 README.Qt3                                         |   1 -
 doc/html/designer-manual-6.html                    |   2 +-
 doc/html/qcanvas-h.html                            |   2 +-
 doc/html/qglobal-h.html                            |  28 -
 doc/html/qmake-manual-2.html                       |   2 +-
 doc/html/qmake-manual-8.html                       |   3 -
 mkspecs/win32-borland/qmake.conf                   | 106 ----
 mkspecs/win32-borland/qplatformdefs.h              | 154 -----
 plugins/src/imageformats/mng/mng.pro               |   4 -
 plugins/src/sqldrivers/ibase/ibase.pro             |   3 +-
 plugins/src/sqldrivers/mysql/mysql.pro             |   3 -
 plugins/src/sqldrivers/odbc/odbc.pro               |   3 +-
 plugins/src/sqldrivers/psql/psql.pro               |   3 -
 plugins/src/sqldrivers/sqlite/sqlite.pro           |   3 -
 plugins/src/sqldrivers/sqlite3/sqlite3.pro         |   3 -
 qmake/Makefile.unix                                |   7 +-
 qmake/Makefile.win32-g++                           |   5 +-
 qmake/book/qmake-commandreference.leaf             |  24 -
 qmake/book/qmake-install.leaf                      |   2 +-
 qmake/generators/makefile.cpp                      |   7 -
 qmake/generators/win32/borland_bmake.cpp           | 664 ---------------------
 qmake/generators/win32/borland_bmake.h             |  60 --
 qmake/main.cpp                                     |   2 -
 src/3rdparty/libmng/libmng.h                       |   4 -
 src/3rdparty/libmng/libmng_callback_xs.c           |   7 -
 src/3rdparty/libmng/libmng_chunk_io.c              |   7 -
 src/3rdparty/libmng/libmng_chunk_io.h              |   4 -
 src/3rdparty/libmng/libmng_chunk_prc.c             |   7 -
 src/3rdparty/libmng/libmng_chunk_prc.h             |   4 -
 src/3rdparty/libmng/libmng_chunk_xs.c              |   7 -
 src/3rdparty/libmng/libmng_chunks.h                |   4 -
 src/3rdparty/libmng/libmng_cms.c                   |   7 -
 src/3rdparty/libmng/libmng_cms.h                   |   4 -
 src/3rdparty/libmng/libmng_conf.h                  |  14 -
 src/3rdparty/libmng/libmng_data.h                  |   4 -
 src/3rdparty/libmng/libmng_display.c               |   7 -
 src/3rdparty/libmng/libmng_display.h               |   4 -
 src/3rdparty/libmng/libmng_dither.c                |   7 -
 src/3rdparty/libmng/libmng_dither.h                |   4 -
 src/3rdparty/libmng/libmng_error.c                 |   7 -
 src/3rdparty/libmng/libmng_error.h                 |   4 -
 src/3rdparty/libmng/libmng_filter.c                |   7 -
 src/3rdparty/libmng/libmng_filter.h                |   4 -
 src/3rdparty/libmng/libmng_hlapi.c                 |   7 -
 src/3rdparty/libmng/libmng_jpeg.c                  |   7 -
 src/3rdparty/libmng/libmng_jpeg.h                  |   4 -
 src/3rdparty/libmng/libmng_memory.h                |   4 -
 src/3rdparty/libmng/libmng_object_prc.c            |   7 -
 src/3rdparty/libmng/libmng_object_prc.h            |   4 -
 src/3rdparty/libmng/libmng_objects.h               |   4 -
 src/3rdparty/libmng/libmng_pixels.c                |   7 -
 src/3rdparty/libmng/libmng_pixels.h                |   4 -
 src/3rdparty/libmng/libmng_prop_xs.c               |   7 -
 src/3rdparty/libmng/libmng_read.c                  |   7 -
 src/3rdparty/libmng/libmng_read.h                  |   4 -
 src/3rdparty/libmng/libmng_trace.c                 |   7 -
 src/3rdparty/libmng/libmng_trace.h                 |   4 -
 src/3rdparty/libmng/libmng_types.h                 |  14 -
 src/3rdparty/libmng/libmng_write.c                 |   7 -
 src/3rdparty/libmng/libmng_write.h                 |   4 -
 src/3rdparty/libmng/libmng_zlib.c                  |   7 -
 src/3rdparty/libmng/libmng_zlib.h                  |   4 -
 src/3rdparty/libmng/makefiles/README               |   1 -
 src/3rdparty/libmng/makefiles/makefile.bcb3        | 105 ----
 src/3rdparty/libpng/INSTALL                        |   6 -
 src/3rdparty/libpng/README                         |   7 -
 src/3rdparty/libpng/png.h                          |   9 -
 src/3rdparty/libpng/pngconf.h                      |  52 +-
 src/3rdparty/libpng/pngmem.c                       | 321 +---------
 src/3rdparty/libpng/pngtest.c                      |   4 -
 src/3rdparty/libpng/projects/borland/libpng.bpf    |  22 -
 src/3rdparty/libpng/projects/borland/libpng.bpg    |  25 -
 src/3rdparty/libpng/projects/borland/libpng.bpr    | 157 -----
 src/3rdparty/libpng/projects/borland/libpng.cpp    |  28 -
 .../libpng/projects/borland/libpng.readme.txt      |  19 -
 .../libpng/projects/borland/libpngstat.bpf         |  22 -
 .../libpng/projects/borland/libpngstat.bpr         | 109 ----
 .../libpng/projects/borland/zlib+libpng.bpg        |  33 -
 src/3rdparty/libpng/projects/borland/zlib.bpf      |  20 -
 src/3rdparty/libpng/projects/borland/zlib.bpg      |  25 -
 src/3rdparty/libpng/projects/borland/zlib.bpr      | 147 -----
 src/3rdparty/libpng/projects/borland/zlib.cpp      |  29 -
 src/3rdparty/libpng/projects/borland/zlibstat.bpf  |  20 -
 src/3rdparty/libpng/projects/borland/zlibstat.bpr  | 131 ----
 src/3rdparty/libpng/scripts/makefile.bc32          | 151 -----
 src/3rdparty/libpng/scripts/makefile.bd32          |  76 ---
 src/3rdparty/libpng/scripts/makefile.bor           | 162 -----
 src/3rdparty/libpng/scripts/makefile.tc3           |  89 ---
 src/3rdparty/sqlite/os.h                           |   4 +-
 src/3rdparty/zlib/win32/Makefile.bor               | 107 ----
 src/3rdparty/zlib/zconf.h                          |  17 +-
 src/3rdparty/zlib/zconf.in.h                       |  17 +-
 src/3rdparty/zlib/zutil.c                          |  78 ---
 src/3rdparty/zlib/zutil.h                          |  17 +-
 src/canvas/ntqcanvas.h                             |   2 +-
 src/kernel/ntqgplugin.h                            |   6 +-
 src/kernel/qcolor_p.cpp                            |   5 -
 src/kernel/qmngio.cpp                              |   7 -
 src/kernel/qobject.cpp                             |   9 -
 src/kernel/qrichtext.cpp                           |   2 +-
 src/moc/moc.y                                      |   9 -
 src/moc/moc_yacc.cpp                               |   9 -
 src/qt.pro                                         |  14 +-
 src/qtmain.pro                                     |   1 -
 src/sql/drivers/odbc/qsql_odbc.h                   |   8 -
 src/sql/qt_sql.pri                                 |  24 +-
 src/table/qtable.cpp                               |   5 -
 src/tools/ntqglobal.h                              |  28 -
 src/tools/ntqwinexport.h                           |   2 +-
 src/tools/qcom_p.h                                 |  10 -
 src/tools/qcomlibrary.cpp                          |   8 -
 src/tools/qgarray.cpp                              |   5 +-
 src/tools/qgvector.cpp                             |   4 -
 src/tools/qlocale.cpp                              |   4 -
 src/tools/qt_tools.pri                             |   2 -
 src/widgets/qiconview.cpp                          |   6 -
 src/widgets/qlistbox.cpp                           |   5 -
 src/xml/qt_xml.pri                                 |   4 -
 tools/designer/uilib/uilib.pro                     |   2 +-
 120 files changed, 45 insertions(+), 3469 deletions(-)
 delete mode 100644 mkspecs/win32-borland/qmake.conf
 delete mode 100644 mkspecs/win32-borland/qplatformdefs.h
 delete mode 100644 qmake/generators/win32/borland_bmake.cpp
 delete mode 100644 qmake/generators/win32/borland_bmake.h
 delete mode 100644 src/3rdparty/libmng/makefiles/makefile.bcb3
 delete mode 100644 src/3rdparty/libpng/projects/borland/libpng.bpf
 delete mode 100644 src/3rdparty/libpng/projects/borland/libpng.bpg
 delete mode 100644 src/3rdparty/libpng/projects/borland/libpng.bpr
 delete mode 100644 src/3rdparty/libpng/projects/borland/libpng.cpp
 delete mode 100644 src/3rdparty/libpng/projects/borland/libpng.readme.txt
 delete mode 100644 src/3rdparty/libpng/projects/borland/libpngstat.bpf
 delete mode 100644 src/3rdparty/libpng/projects/borland/libpngstat.bpr
 delete mode 100644 src/3rdparty/libpng/projects/borland/zlib+libpng.bpg
 delete mode 100644 src/3rdparty/libpng/projects/borland/zlib.bpf
 delete mode 100644 src/3rdparty/libpng/projects/borland/zlib.bpg
 delete mode 100644 src/3rdparty/libpng/projects/borland/zlib.bpr
 delete mode 100644 src/3rdparty/libpng/projects/borland/zlib.cpp
 delete mode 100644 src/3rdparty/libpng/projects/borland/zlibstat.bpf
 delete mode 100644 src/3rdparty/libpng/projects/borland/zlibstat.bpr
 delete mode 100644 src/3rdparty/libpng/scripts/makefile.bc32
 delete mode 100644 src/3rdparty/libpng/scripts/makefile.bd32
 delete mode 100644 src/3rdparty/libpng/scripts/makefile.bor
 delete mode 100644 src/3rdparty/libpng/scripts/makefile.tc3
 delete mode 100644 src/3rdparty/zlib/win32/Makefile.bor

diff --git a/PLATFORMS b/PLATFORMS
index 2a93ee926..780e622b5 100644
--- a/PLATFORMS
+++ b/PLATFORMS
@@ -10,7 +10,7 @@ Supported platforms and compilers:
   aix-xlc-64    irix-cc        linux-icc       solaris-g++-64   win32-msvc
   freebsd-g++   irix-cc-64     macx-g++        tru64-cxx        win32-msvc.net
   freebsd-icc   irix-g++       macx-pbuilder   tru64-g++
-  hpux-acc      linux-ecc-64   solaris-cc      win32-borland
+  hpux-acc      linux-ecc-64   solaris-cc
 
 Compilation problems:
 
diff --git a/README.Qt3 b/README.Qt3
index 8634addb7..e0da22c82 100644
--- a/README.Qt3
+++ b/README.Qt3
@@ -13,7 +13,6 @@ applications compiled for 3.2 will continue to run with 3.3.
 
 For this release, the following platforms have been tested:
 
-win32-borland
 win32-g++
 win32-icc
 win32-msvc
diff --git a/doc/html/designer-manual-6.html b/doc/html/designer-manual-6.html
index b21aa1652..93ac2b5e1 100644
--- a/doc/html/designer-manual-6.html
+++ b/doc/html/designer-manual-6.html
@@ -41,7 +41,7 @@ body { background: #ffffff; color: black; }
 <pre>
 SOURCES += main.cpp
 </pre>
-<p>You can then use <tt>qmake</tt> to generate the Makefile. (For example <tt>qmake -o Makefile myproject.pro</tt>.) Running <tt>make</tt> (Linux, Unix or Borland compilers), or <tt>nmake</tt> (Visual C++), will then call <tt>uic</tt>, <tt>moc</tt> and your compiler as necessary to build your application.</p>
+<p>You can then use <tt>qmake</tt> to generate the Makefile. (For example <tt>qmake -o Makefile myproject.pro</tt>.) Running <tt>make</tt> (Linux or Unix compilers), or <tt>nmake</tt> (Visual C++), will then call <tt>uic</tt>, <tt>moc</tt> and your compiler as necessary to build your application.</p>
 <!-- index Errors!Undefined reference --><!-- index Undefined references, Error --><!-- index qmake!HEADERS --><!-- index qmake!SOURCES --><p>If you use <em>TQt Designer</em> to create your main window and dialogs, but also add other C++ files, or if you subclass any of your forms you will need to add these files to the<!-- index .pro --> <tt>.pro</tt> file so that they are compiled with the rest of your application's source files. Each<!-- index .h --> <tt>.h</tt> file that you create separately from <em>TQt Designer</em> should be added to the <tt>HEADERS</tt> line, and each<!-- index .cpp --> <tt>.cpp</tt> file should be added to the <tt>SOURCES</tt> line, just as we've done for<!-- index main.cpp --> <tt>main.cpp</tt>. If you get undefined reference errors it is worth checking that you've added the names of all your header and implementation files to the<!-- index .pro --> <tt>.pro</tt> file.</p>
 <h4><a name="1-2"></a>Subclassing a Form</h4>
 <!-- index Subclassing --><p>When subclassing a form it is helpful to use a naming convention to help us identify which files are generated from <em>TQt Designer</em>'s<!-- index .ui --> <tt>.ui</tt> files and which are hand coded.</p>
diff --git a/doc/html/qcanvas-h.html b/doc/html/qcanvas-h.html
index 07a88d961..d60e217c3 100644
--- a/doc/html/qcanvas-h.html
+++ b/doc/html/qcanvas-h.html
@@ -111,7 +111,7 @@ class TQCanvasItem;
 class TQCanvasView;
 class TQCanvasPixmap;
 
-#if defined(Q_TEMPLATEDLL) &amp;&amp; ( !defined(Q_CC_BOR) || !defined(QT_MAKEDLL) || defined(TQ_EXPORT_TEMPLATES) )
+#if defined(Q_TEMPLATEDLL) &amp;&amp; ( !defined(QT_MAKEDLL) || defined(TQ_EXPORT_TEMPLATES) )
 // MOC_SKIP_BEGIN
 TQM_TEMPLATE_EXTERN_CANVAS template class TQM_EXPORT_CANVAS TQValueListIterator&lt; TQCanvasItem* &gt;;
 TQM_TEMPLATE_EXTERN_CANVAS template class TQM_EXPORT_CANVAS TQValueList&lt; TQCanvasItem* &gt;;
diff --git a/doc/html/qglobal-h.html b/doc/html/qglobal-h.html
index 95ae1ea77..5af4af6d0 100644
--- a/doc/html/qglobal-h.html
+++ b/doc/html/qglobal-h.html
@@ -233,7 +233,6 @@ body { background: #ffffff; color: black; }
      MPW	- MPW C++
      MWERKS	- Metrowerks CodeWarrior
      MSVC	- Microsoft Visual C/C++, Intel C++ for Windows
-     BOR	- Borland/Turbo C++
      WAT	- Watcom C++
      GNU	- GNU C++
      COMEAU	- Comeau C++
@@ -300,14 +299,6 @@ body { background: #ffffff; color: black; }
 #    define Q_NO_USING_KEYWORD /* ### check "using" status */
 #  endif
 
-#elif defined(__BORLANDC__) || defined(__TURBOC__)
-#  define Q_CC_BOR
-#  if __BORLANDC__ &lt; 0x502
-#    define Q_NO_BOOL_TYPE
-#    define Q_NO_EXPLICIT_KEYWORD
-#  endif
-#  define Q_NO_USING_KEYWORD /* ### check "using" status */
-
 #elif defined(__WATCOMC__)
 #  define Q_CC_WAT
 #  if defined(Q_OS_QNX4)
@@ -882,17 +873,6 @@ class TQDataStream;
 #    endif
 #    undef  TQ_DISABLE_COPY	/* avoid unresolved externals */
 #  endif
-#elif defined(Q_OS_LINUX) &amp;&amp; defined(Q_CC_BOR)
-#  if defined(QT_SHARED)	/* create a TQt shared library */
-#    define TQ_EXPORT  __declspec(dllexport)
-#    define Q_TEMPLATEDLL
-#    define Q_TEMPLATE_EXTERN
-#    undef  TQ_DISABLE_COPY	/* avoid unresolved externals */
-#  else
-#    define Q_TEMPLATEDLL
-#    define Q_TEMPLATE_EXTERN
-#    undef  TQ_DISABLE_COPY 	/* avoid unresolved externals */
-#  endif
 #else
 #  undef QT_MAKEDLL		/* ignore these for other platforms */
 #  undef QT_DLL
@@ -1102,14 +1082,6 @@ TQ_EXPORT const char *tqInstallPathSysconf();
 #    pragma warning(disable: 4355) // 'this' : used in base member initializer list
 #    pragma warning(disable: 4231) // nonstandard extension used : 'extern' before template explicit instantiation
 #    pragma warning(disable: 4710) // function not inlined
-#  elif defined(Q_CC_BOR)
-#    pragma option -w-inl
-#    pragma option -w-aus
-#    pragma warn -inl
-#    pragma warn -pia
-#    pragma warn -ccc
-#    pragma warn -rch
-#    pragma warn -sig
 #  endif
 #endif
 
diff --git a/doc/html/qmake-manual-2.html b/doc/html/qmake-manual-2.html
index 4ee0895bd..a9158c45f 100644
--- a/doc/html/qmake-manual-2.html
+++ b/doc/html/qmake-manual-2.html
@@ -38,7 +38,7 @@ body { background: #ffffff; color: black; }
 <p>Before building TQt manually the following environment variables must be set:</p>
 <ul><li><p>QMAKESPEC <br> This must be set to the platform and compiler combination that you are using on your system. <br> For example, if you are using Windows and Microsoft Visual Studio, you would set this environment variable to <em>win32-msvc</em>. If you are using Solaris and g++, you would set this environment variable to <em>solaris-g++</em>.</p>
 <p>The following is a list of environment variables available to choose from when setting QMAKESPEC:</p>
-<p>aix-64 hpux-cc irix-032 netbsd-g++ solaris-cc unixware7-g++ aix-g++ hpux-g++ linux-cxx openbsd-g++ solaris-g++ win32-borland aix-xlc hpux-n64 linux-g++ openunix-cc sunos-g++ win32-g++ bsdi-g++ hpux-o64 linux-icc qnx-g++ tru64-cxx win32-msvc dgux-g++ hurd-g++ linux-kcc reliant-64 tru64-g++ win32-watc freebsd-g++ irix-64 macx-pbuilder reliant-cds ultrix-g++ win32-visa hpux-acc irix-g++ macx-g++ sco-g++ unixware-g hpux-acc irix-n32 solaris-64 unixware7-cc</p>
+<p>aix-64 hpux-cc irix-032 netbsd-g++ solaris-cc unixware7-g++ aix-g++ hpux-g++ linux-cxx openbsd-g++ solaris-g++ aix-xlc hpux-n64 linux-g++ openunix-cc sunos-g++ win32-g++ bsdi-g++ hpux-o64 linux-icc qnx-g++ tru64-cxx win32-msvc dgux-g++ hurd-g++ linux-kcc reliant-64 tru64-g++ win32-watc freebsd-g++ irix-64 macx-pbuilder reliant-cds ultrix-g++ win32-visa hpux-acc irix-g++ macx-g++ sco-g++ unixware-g hpux-acc irix-n32 solaris-64 unixware7-cc</p>
 <p>The environment variable should be set to qws/envvar where envvar is one of the following:</p>
 <p>linux-arm-g++ linux-generic-g++ linux-mips-g++ linux-x86-g++ linux-freebsd-g++ linux-ipaq-g++ linux-solaris-g++ qnx-rtp-g++</p>
 <li><p>TQTDIR <br> This must be set to where TQt is (or will be) installed. For example, <em>c:\qt</em> and <em>\local\qt</em></p>
diff --git a/doc/html/qmake-manual-8.html b/doc/html/qmake-manual-8.html
index b22e6dce5..b9bc83b4d 100644
--- a/doc/html/qmake-manual-8.html
+++ b/doc/html/qmake-manual-8.html
@@ -453,9 +453,6 @@ app {
 <p>This variable contains all the libraries needed to link against if OpenGL support is turned on. The value of this variable is typically handled by <em>qmake</em> or <a href="qmake-manual-8.html#QMAKESPEC">qmake.conf</a> and rarely needs to be modified.</p>
 <h5><a name="4-2-73"></a>QMAKE_LIBS_QT_THREAD</h5>
 <p>This variable contains all the libraries needed to link against if thread support is turned on. The value of this variable is typically handled by <em>qmake</em> or <a href="qmake-manual-8.html#QMAKESPEC">qmake.conf</a> and rarely needs to be modified.</p>
-<h5><a name="4-2-74"></a>QMAKE_LIBS_RT</h5>
-<p><em>This is used with Borland compilers only</em></p>
-<p>This variable contains the runtime library needed to link against when building an application. The value of this variable is typically handled by <em>qmake</em> or <a href="qmake-manual-8.html#QMAKESPEC">qmake.conf</a> and rarely needs to be modified.</p>
 <h5><a name="4-2-75"></a>QMAKE_LIBS_RTMT</h5>
 <p><em>This is used with Borland compilers only</em></p>
 <p>This variable contains the runtime library needed to link against when building a multi-threaded application. The value of this variable is typically handled by <em>qmake</em> or <a href="qmake-manual-8.html#QMAKESPEC">qmake.conf</a> and rarely needs to be modified.</p>
diff --git a/mkspecs/win32-borland/qmake.conf b/mkspecs/win32-borland/qmake.conf
deleted file mode 100644
index e0bfac62f..000000000
--- a/mkspecs/win32-borland/qmake.conf
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-#
-# qmake configuration for win32-borland
-#
-# Written for Borland C++.
-#
-
-MAKEFILE_GENERATOR	= BMAKE
-TEMPLATE		= app
-CONFIG			+= qt warn_on release link_prl
-DEFINES			+= UNICODE
-QMAKE_NOFORCE		= 1
-
-exists( $(TQTDIR)\.qtwinconfig ) {
-	include( $(TQTDIR)\.qtwinconfig )
-}
-
-QMAKE_CC		= bcc32
-QMAKE_LEX		= flex
-QMAKE_LEXFLAGS		= 
-QMAKE_YACC		= byacc
-QMAKE_YACCFLAGS		= -d
-QMAKE_CFLAGS		= -tWR
-QMAKE_CFLAGS_WARN_ON	= -w -w-hid
-QMAKE_CFLAGS_WARN_OFF	= -w-
-QMAKE_CFLAGS_RELEASE	= -O2
-QMAKE_CFLAGS_DEBUG	= -v
-QMAKE_CFLAGS_MT		= -tWM
-QMAKE_CFLAGS_MT_DBG	= -tWM
-QMAKE_CFLAGS_MT_DLL	= -tWM
-QMAKE_CFLAGS_MT_DLLDBG	= -tWM
-QMAKE_CFLAGS_YACC	=
-QMAKE_CFLAGS_CONSOLE	= -tWC
-QMAKE_CFLAGS_STL_ON	=
-QMAKE_CFLAGS_STL_OFF	=
-QMAKE_CFLAGS_RTTI_ON	=
-QMAKE_CFLAGS_RTTI_OFF	= -RT-
-QMAKE_CFLAGS_EXCEPTIONS_ON =
-QMAKE_CFLAGS_EXCEPTIONS_OFF = -x-
-
-QMAKE_CXX		= $$QMAKE_CC
-QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
-QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_MT	= $$QMAKE_CFLAGS_MT
-QMAKE_CXXFLAGS_MT_DBG	= $$QMAKE_CFLAGS_MT_DBG
-QMAKE_CXXFLAGS_MT_DLL	= $$QMAKE_CFLAGS_MT_DLL
-QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG
-QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_CONSOLE	= $$QMAKE_CFLAGS_CONSOLE
-QMAKE_CXXFLAGS_STL_ON	= $$QMAKE_CFLAGS_STL_ON
-QMAKE_CXXFLAGS_STL_OFF	= $$QMAKE_CFLAGS_STL_OFF
-QMAKE_CXXFLAGS_RTTI_ON	= $$QMAKE_CFLAGS_RTTI_ON
-QMAKE_CXXFLAGS_RTTI_OFF	= $$QMAKE_CFLAGS_RTTI_OFF
-QMAKE_CXXFLAGS_EXCEPTIONS_ON = $$QMAKE_CFLAGS_EXCEPTIONS_ON
-QMAKE_CXXFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF
-
-QMAKE_INCDIR		=
-QMAKE_INCDIR_TQT		= $(TQTDIR)\include
-QMAKE_LIBDIR		= $(BCB)\lib
-QMAKE_LIBDIR_TQT		= $(TQTDIR)\lib
-
-QMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -o$obj $src
-QMAKE_RUN_CC_IMP	= $(CC) -c $(CFLAGS) $(INCPATH) -o$@ $<
-QMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$obj $src
-QMAKE_RUN_CXX_IMP	= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$@ $<
-
-QMAKE_LINK		= ilink32
-QMAKE_LFLAGS		= -c -x -Gn
-QMAKE_LFLAGS_RELEASE	=
-QMAKE_LFLAGS_DEBUG	= -v
-QMAKE_LFLAGS_CONSOLE	= -ap -Tpe c0x32.obj
-QMAKE_LFLAGS_WINDOWS	= -aa -Tpe c0w32.obj
-QMAKE_LFLAGS_CONSOLE_DLL= -Gi -ap -Tpd c0d32.obj
-QMAKE_LFLAGS_WINDOWS_DLL= -Gi -aa -Tpd c0d32.obj
-
-QMAKE_LIBS		= import32.lib
-QMAKE_LIBS_RT		= cw32i.lib
-QMAKE_LIBS_RTMT		= cw32mti.lib
-QMAKE_LIBS_CONSOLE	=
-QMAKE_LIBS_WINDOWS	=
-QMAKE_LIBS_QT		= qt.lib
-QMAKE_LIBS_QT_THREAD	= qtmt.lib
-QMAKE_LIBS_QT_ENTRY	= qtmain.lib
-
-QMAKE_LIBS_OPENGL	=
-QMAKE_LFLAGS_OPENGL	= /dopengl32.dll
-
-QMAKE_MOC		= $(TQTDIR)\bin\moc.exe
-QMAKE_UIC		= $(TQTDIR)\bin\uic.exe
-QMAKE_IDC		= $(TQTDIR)\bin\idc.exe
-
-QMAKE_IDL		= midl
-QMAKE_LIB		= tlib /C /P256
-QMAKE_RC		= brcc32 -dQ_CC_BOR
-
-QMAKE_ZIP		= zip -r -9
-
-QMAKE_COPY		= copy
-QMAKE_MOVE		= move
-QMAKE_DEL_FILE		= del
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= if not exist
-QMAKE_MKDIR		= mkdir
diff --git a/mkspecs/win32-borland/qplatformdefs.h b/mkspecs/win32-borland/qplatformdefs.h
deleted file mode 100644
index 6cad4a676..000000000
--- a/mkspecs/win32-borland/qplatformdefs.h
+++ /dev/null
@@ -1,154 +0,0 @@
-#ifndef TQPLATFORMDEFS_H
-#define TQPLATFORMDEFS_H
-
-#ifdef UNICODE
-#ifndef _UNICODE
-#define _UNICODE
-#endif
-#endif
-
-// Get TQt defines/settings
-
-#include "ntqglobal.h"
-#define Q_FS_FAT
-
-#define _POSIX_
-#include <limits.h>
-#undef _POSIX_
-
-#include <tchar.h>
-#include <io.h>
-#include <direct.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <dos.h>
-#include <stdlib.h>
-#include <windows.h>
-
-#if __BORLANDC__ >= 0x550
-// Borland Builder 6
-
-#ifdef QT_LARGEFILE_SUPPORT
-#  define QT_STATBUF		struct stati64		// non-ANSI defs
-#  define QT_STATBUF4TSTAT	struct stati64		// non-ANSI defs
-#  define QT_STAT		::_stati64
-#  define QT_FSTAT		::fstati64
-#  define QT_LSEEK		::_lseeki64
-#  define QT_TSTAT		::_tstati64
-#else
-#  define QT_STATBUF		struct stat		// non-ANSI defs
-#  define QT_STATBUF4TSTAT	struct _stat		// non-ANSI defs
-#  define QT_STAT		::stat
-#  define QT_FSTAT		::fstat
-#  define QT_LSEEK		::_lseek
-#  define QT_TSTAT		::_tstat
-#endif
-
-#define QT_STAT_REG		_S_IFREG
-#define QT_STAT_DIR		_S_IFDIR
-#define QT_STAT_MASK		_S_IFMT
-
-#if defined(_S_IFLNK)
-#  define QT_STAT_LNK		_S_IFLNK
-#endif
-
-#define QT_FILENO		_fileno
-#define QT_OPEN			::open
-#define QT_CLOSE		::_close
-
-#define QT_READ			::_read
-#define QT_WRITE		::_write
-#define QT_ACCESS		::_access
-#define QT_GETCWD		::_getcwd
-#define QT_CHDIR		::chdir
-#define QT_MKDIR		::_mkdir
-#define QT_RMDIR		::_rmdir
-#define QT_OPEN_RDONLY		_O_RDONLY
-#define QT_OPEN_WRONLY		_O_WRONLY
-#define QT_OPEN_RDWR		_O_RDWR
-#define QT_OPEN_CREAT		_O_CREAT
-#define QT_OPEN_TRUNC		_O_TRUNC
-#define QT_OPEN_APPEND		_O_APPEND
-
-#if defined(O_TEXT)
-#  define QT_OPEN_TEXT		_O_TEXT
-#  define QT_OPEN_BINARY	_O_BINARY
-#endif
-
-#else
-// Borland Builder 5
-
-#ifdef QT_LARGEFILE_SUPPORT
-#  define QT_STATBUF		struct stati64		// non-ANSI defs
-#  define QT_STATBUF4TSTAT	struct stati64		// non-ANSI defs
-#  define QT_STAT		::stati64
-#  define QT_FSTAT		::fstati64
-#  define QT_LSEEK		::lseeki64
-#  define QT_TSTAT		::tstati64
-#else
-#  define QT_STATBUF		struct stat		// non-ANSI defs
-#  define QT_STATBUF4TSTAT	struct stat		// non-ANSI defs
-#  define QT_STAT		::stat
-#  define QT_FSTAT		::fstat
-#  define QT_LSEEK		::lseek
-#  define QT_TSTAT		::tstat
-#endif
-
-#define QT_STAT_REG		S_IFREG
-#define QT_STAT_DIR		S_IFDIR
-#define QT_STAT_MASK		S_IFMT
-
-#if defined(S_IFLNK)
-#  define QT_STAT_LNK		S_IFLNK
-#endif
-
-#define QT_FILENO		fileno
-#define QT_OPEN			::open
-#define QT_CLOSE		::close
-
-#define QT_READ			::read
-#define QT_WRITE		::write
-#define QT_ACCESS		::access
-
-#if defined(Q_OS_OS2EMX)
-    // This is documented in the un*x to OS/2-EMX Porting FAQ:
-    // http://homepages.tu-darmstadt.de/~st002279/os2/porting.html
-#  define QT_GETCWD		::_getcwd2
-#  define QT_CHDIR		::_chdir2
-#else
-#  define QT_GETCWD		::getcwd
-#  define QT_CHDIR		::chdir
-#endif
-
-#define QT_MKDIR		::mkdir
-#define QT_RMDIR		::rmdir
-#define QT_OPEN_RDONLY		O_RDONLY
-#define QT_OPEN_WRONLY		O_WRONLY
-#define QT_OPEN_RDWR		O_RDWR
-#define QT_OPEN_CREAT		O_CREAT
-#define QT_OPEN_TRUNC		O_TRUNC
-#define QT_OPEN_APPEND		O_APPEND
-
-#if defined(O_TEXT)
-#  define QT_OPEN_TEXT		O_TEXT
-#  define QT_OPEN_BINARY	O_BINARY
-#endif
-
-#endif // __BORLANDC__ >= 0x550
-
-// Borland Builder 5 and 6
-
-#define QT_SIGNAL_ARGS		int
-
-#define QT_VSNPRINTF		::_vsnprintf
-#define QT_SNPRINTF		::_snprintf
-
-# define F_OK	0
-# define X_OK	1
-# define W_OK	2
-# define R_OK	4
-
-
-#endif // TQPLATFORMDEFS_H
diff --git a/plugins/src/imageformats/mng/mng.pro b/plugins/src/imageformats/mng/mng.pro
index 2c39f9412..ad3ee3612 100644
--- a/plugins/src/imageformats/mng/mng.pro
+++ b/plugins/src/imageformats/mng/mng.pro
@@ -9,10 +9,6 @@ REQUIRES = !no-mng !mng
 
 SOURCES += main.cpp
 
-win32-borland {
-	QMAKE_CFLAGS_WARN_ON	+= -w-par
-	QMAKE_CXXFLAGS_WARN_ON	+= -w-par
-}
 win32: CONFIG-=zlib system-zlib jpeg system-jpeg
 
 system-mng {
diff --git a/plugins/src/sqldrivers/ibase/ibase.pro b/plugins/src/sqldrivers/ibase/ibase.pro
index 942d8abc7..5fc4a2449 100644
--- a/plugins/src/sqldrivers/ibase/ibase.pro
+++ b/plugins/src/sqldrivers/ibase/ibase.pro
@@ -17,8 +17,7 @@ unix {
 }
 win32 {
 	OBJECTS_DIR = obj
-	!win32-borland:LIBS *= gds32_ms.lib
-	win32-borland:LIBS  += gds32.lib
+	LIBS *= gds32_ms.lib
 }
 
 REQUIRES	= sql
diff --git a/plugins/src/sqldrivers/mysql/mysql.pro b/plugins/src/sqldrivers/mysql/mysql.pro
index 9100edaf5..28a17ad5b 100644
--- a/plugins/src/sqldrivers/mysql/mysql.pro
+++ b/plugins/src/sqldrivers/mysql/mysql.pro
@@ -22,9 +22,6 @@ win32 {
 #		LIBS *= delayimp.lib
 #		QMAKE_LFLAGS += /DELAYLOAD:libmysql.dll
 #	}
-#	win32-borland: {
-#		QMAKE_LFLAGS += /dlibmysql.dll
-#	}
 }
 
 REQUIRES	= sql
diff --git a/plugins/src/sqldrivers/odbc/odbc.pro b/plugins/src/sqldrivers/odbc/odbc.pro
index 36d35b51c..1a6556e39 100644
--- a/plugins/src/sqldrivers/odbc/odbc.pro
+++ b/plugins/src/sqldrivers/odbc/odbc.pro
@@ -23,8 +23,7 @@ unix {
 
 win32 {
 	OBJECTS_DIR		= obj
-	!win32-borland:LIBS	*= -lodbc32
-    	win32-borland:LIBS	*= $(BCB)/lib/PSDK/odbc32.lib
+	LIBS	*= -lodbc32
 }
 
 REQUIRES	= sql
diff --git a/plugins/src/sqldrivers/psql/psql.pro b/plugins/src/sqldrivers/psql/psql.pro
index ad94ccd71..52049cc62 100644
--- a/plugins/src/sqldrivers/psql/psql.pro
+++ b/plugins/src/sqldrivers/psql/psql.pro
@@ -21,9 +21,6 @@ win32 {
 #		LIBS *= delayimp.lib
 #		QMAKE_LFLAGS += /DELAYLOAD:libpq.dll
 #	}
-#	win32-borland: {
-#		QMAKE_LFLAGS += /dlibpq.dll
-#	}
 }
 
 REQUIRES	= sql
diff --git a/plugins/src/sqldrivers/sqlite/sqlite.pro b/plugins/src/sqldrivers/sqlite/sqlite.pro
index 6234b0d31..9c50a577b 100644
--- a/plugins/src/sqldrivers/sqlite/sqlite.pro
+++ b/plugins/src/sqldrivers/sqlite/sqlite.pro
@@ -18,9 +18,6 @@ win32 {
 #		LIBS *= delayimp.lib
 #		QMAKE_LFLAGS += /DELAYLOAD:libsqlite.dll
 #	}
-#	win32-borland: {
-#		QMAKE_LFLAGS += /dlibsqlite.dll
-#	}
 }
 
 !contains( LIBS, .*sqlite.* ) {
diff --git a/plugins/src/sqldrivers/sqlite3/sqlite3.pro b/plugins/src/sqldrivers/sqlite3/sqlite3.pro
index c3184f937..c05fa0966 100644
--- a/plugins/src/sqldrivers/sqlite3/sqlite3.pro
+++ b/plugins/src/sqldrivers/sqlite3/sqlite3.pro
@@ -22,9 +22,6 @@ win32 {
 #		LIBS *= delayimp.lib
 #		QMAKE_LFLAGS += /DELAYLOAD:sqlite3.dll
 #	}
-#	win32-borland: {
-#		QMAKE_LFLAGS += /dsqlite3.dll
-#	}
 }
 
 REQUIRES	= sql
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
index 8e94d388a..bb2c4df0f 100644
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
@@ -1,6 +1,6 @@
 #tqmake code
 OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o msvc_nmake.o \
-     borland_bmake.o mingw_make.o msvc_dsp.o msvc_vcproj.o option.o \
+     mingw_make.o msvc_dsp.o msvc_vcproj.o option.o \
      winmakefile.o projectgenerator.o metrowerks_xml.o  pbuilder_pbx.o \
      msvc_objectmodel.o meta.o qtmd5.o
 
@@ -13,7 +13,7 @@ QOBJS=qstring.o qtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o \
 
 #all sources, used for the depend target
 DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp qtmd5.cpp generators/makefile.cpp generators/unix/unixmake2.cpp \
-           generators/unix/unixmake.cpp generators/win32/msvc_nmake.cpp generators/win32/borland_bmake.cpp \
+           generators/unix/unixmake.cpp generators/win32/msvc_nmake.cpp \
 	   generators/win32/winmakefile.cpp generators/projectgenerator.cpp generators/mac/metrowerks_xml.cpp \
 	   generators/mac/pbuilder_pbx.cpp generators/win32/msvc_objectmodel.cpp \
 	   @SOURCE_PATH@/src/tools/qstring.cpp @SOURCE_PATH@/src/tools/qtextstream.cpp \
@@ -183,9 +183,6 @@ unixmake.o: generators/unix/unixmake.cpp
 unixmake2.o: generators/unix/unixmake2.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) generators/unix/unixmake2.cpp
 
-borland_bmake.o: generators/win32/borland_bmake.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) generators/win32/borland_bmake.cpp
-
 mingw_make.o: generators/win32/mingw_make.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) generators/win32/mingw_make.cpp
 
diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++
index a25b8f35f..eb6cacda0 100644
--- a/qmake/Makefile.win32-g++
+++ b/qmake/Makefile.win32-g++
@@ -14,7 +14,7 @@ ADDCLEAN    =
 
 
 #tqmake code
-OBJS=project.o main.o makefile.o unixmake.o unixmake2.o borland_bmake.o mingw_make.o \
+OBJS=project.o main.o makefile.o unixmake.o unixmake2.o mingw_make.o \
 	msvc_nmake.o msvc_dsp.o msvc_vcproj.o option.o winmakefile.o projectgenerator.o \
  	metrowerks_xml.o pbuilder_pbx.o msvc_objectmodel.o property.o meta.o qtmd5.o
 
@@ -154,9 +154,6 @@ unixmake2.o: generators\unix\unixmake2.cpp
 winmakefile.o: generators/win32/winmakefile.cpp
 	$(CXX) $(CXXFLAGS) generators/win32/winmakefile.cpp
 
-borland_bmake.o: generators/win32/borland_bmake.cpp
-	$(CXX) $(CXXFLAGS) generators/win32/borland_bmake.cpp
-
 mingw_make.o: generators/win32/mingw_make.cpp
 	$(CXX) $(CXXFLAGS) generators/win32/mingw_make.cpp
 
diff --git a/qmake/book/qmake-commandreference.leaf b/qmake/book/qmake-commandreference.leaf
index 3cc198b0b..8cc9d6e92 100644
--- a/qmake/book/qmake-commandreference.leaf
+++ b/qmake/book/qmake-commandreference.leaf
@@ -1378,30 +1378,6 @@ value of this variable is typically handled by \e qmake or
 
 
 
-\section3 QMAKE_LIBS_RT
-
-\e {This is used with Borland compilers only}
-
-This variable contains the runtime library needed to link against when
-building an application.  The 
-value of this variable is typically handled by \e qmake or
- \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
-
-
-
-
-
-\section3 QMAKE_LIBS_RTMT
-
-\e {This is used with Borland compilers only}
-
-This variable contains the runtime library needed to link against when
-building a multi-threaded application.  The 
-value of this variable is typically handled by \e qmake or
- \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
-
-
-
 \section3 QMAKE_LIBS_THREAD
 
 \e {This is used on Unix platforms only}
diff --git a/qmake/book/qmake-install.leaf b/qmake/book/qmake-install.leaf
index b988713e1..864f5c669 100644
--- a/qmake/book/qmake-install.leaf
+++ b/qmake/book/qmake-install.leaf
@@ -23,7 +23,7 @@ The following is a list of environment variables available to choose
 from when setting QMAKESPEC:
 
 aix-64       hpux-cc    irix-032      netbsd-g++  solaris-cc   unixware7-g++
-aix-g++      hpux-g++   linux-cxx     openbsd-g++ solaris-g++  win32-borland    
+aix-g++      hpux-g++   linux-cxx     openbsd-g++ solaris-g++
 aix-xlc      hpux-n64   linux-g++     openunix-cc sunos-g++    win32-g++ 
 bsdi-g++     hpux-o64   linux-icc     qnx-g++     tru64-cxx    win32-msvc 
 dgux-g++     hurd-g++   linux-kcc     reliant-64  tru64-g++    win32-watc
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index f31c7e085..d5ee47d7b 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -1809,10 +1809,6 @@ MakefileGenerator::writeImageSrc(TQTextStream &t, const TQString &src)
 	    t << (*it) << ": " << findDependencies((*it)).join(" \\\n\t\t") << "\n\t"
 		<< "$(UIC)  -o " << (*it) << " -embed " << project->first("QMAKE_ORIG_TARGET")
 		<< " -f <<\n" << findDependencies((*it)).join(" ") << "\n<<" << endl << endl;
-	} else if ( gen == "BMAKE" ) {
-	    t << (*it) << ": " << findDependencies((*it)).join(" \\\n\t\t") << "\n\t"
-		<< "$(UIC) " << " -embed " << project->first("QMAKE_ORIG_TARGET")
-		<< " -f &&|\n" << findDependencies((*it)).join(" ") << "\n| -o " << (*it) << endl << endl;
 	} else {
 	    t << (*it) << ": " << findDependencies((*it)).join(" \\\n\t\t") << "\n\t"
 		<< "$(UIC) " << " -embed " << project->first("QMAKE_ORIG_TARGET")
@@ -2447,7 +2443,6 @@ MakefileGenerator::openOutput(TQFile &file) const
 //Factory thing
 #include "unixmake.h"
 #include "msvc_nmake.h"
-#include "borland_bmake.h"
 #include "mingw_make.h"
 #include "msvc_dsp.h"
 #include "msvc_vcproj.h"
@@ -2480,8 +2475,6 @@ MakefileGenerator::create(TQMakeProject *proj)
 	    mkfile = new VcprojGenerator(proj);
 	else
 	    mkfile = new NmakeMakefileGenerator(proj);
-    } else if(gen == "BMAKE") {
-	mkfile = new BorlandMakefileGenerator(proj);
     } else if(gen == "MINGW") {
 	mkfile = new MingwMakefileGenerator(proj);
     } else if(gen == "METROWERKS") {
diff --git a/qmake/generators/win32/borland_bmake.cpp b/qmake/generators/win32/borland_bmake.cpp
deleted file mode 100644
index 9d8dc7cb6..000000000
--- a/qmake/generators/win32/borland_bmake.cpp
+++ /dev/null
@@ -1,664 +0,0 @@
-/****************************************************************************
-**
-** NmakeMakefileGenerator of BorlandMakefileGenerator class.
-**
-** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
-**
-** This file is part of qmake.
-**
-** This file may be used under the terms of the GNU General
-** Public License versions 2.0 or 3.0 as published by the Free
-** Software Foundation and appearing in the files LICENSE.GPL2
-** and LICENSE.GPL3 included in the packaging of this file.
-** Alternatively you may (at your option) use any later version
-** of the GNU General Public License if such license has been
-** publicly approved by Trolltech ASA (or its successors, if any)
-** and the KDE Free TQt Foundation.
-**
-** Please review the following information to ensure GNU General
-** Public Licensing requirements will be met:
-** http://trolltech.com/products/qt/licenses/licensing/opensource/.
-** If you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
-** or contact the sales department at sales@trolltech.com.
-**
-** This file may be used under the terms of the Q Public License as
-** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
-** included in the packaging of this file.  Licensees holding valid TQt
-** Commercial licenses may use this file in accordance with the TQt
-** Commercial License Agreement provided with the Software.
-**
-** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
-** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
-** herein.
-**
-**********************************************************************/
-
-#include "borland_bmake.h"
-#include "option.h"
-#include <ntqdir.h>
-#include <ntqregexp.h>
-#include <time.h>
-#include <stdlib.h>
-
-
-BorlandMakefileGenerator::BorlandMakefileGenerator(TQMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE)
-{
-
-}
-
-bool
-BorlandMakefileGenerator::writeMakefile(TQTextStream &t)
-{
-    writeHeader(t);
-    if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) {
-	t << "all clean:" << "\n\t"
-	  << "@echo \"Some of the required modules ("
-	  << var("QMAKE_FAILED_REQUIREMENTS") << ") are not available.\"" << "\n\t"
-	  << "@echo \"Skipped.\"" << endl << endl;
-	return TRUE;
-    }
-
-    if(project->first("TEMPLATE") == "app" ||
-       project->first("TEMPLATE") == "lib") {
-	writeBorlandParts(t);
-	return MakefileGenerator::writeMakefile(t);
-    }
-    else if(project->first("TEMPLATE") == "subdirs") {
-	writeSubDirs(t);
-	return TRUE;
-    }
-    return FALSE;
-}
-
-void
-BorlandMakefileGenerator::writeBorlandParts(TQTextStream &t)
-{
-    t << "!if !$d(BCB)" << endl;
-    t << "BCB = $(MAKEDIR)\\.." << endl;
-    t << "!endif" << endl << endl;
-    t << "####### Compiler, tools and options" << endl << endl;
-    t << "CC	=	" << var("QMAKE_CC") << endl;
-    t << "CXX	=	" << var("QMAKE_CXX") << endl;
-    t << "LEX     = " << var("QMAKE_LEX") << endl;
-    t << "YACC    = " << var("QMAKE_YACC") << endl;
-    t << "CFLAGS	=	" << var("QMAKE_CFLAGS") << " "
-      << varGlue("PRL_EXPORT_DEFINES","-D"," -D","") << " "
-      <<  varGlue("DEFINES","-D"," -D","") << endl;
-    t << "CXXFLAGS=	" << var("QMAKE_CXXFLAGS") << " "
-      << varGlue("PRL_EXPORT_DEFINES","-D"," -D","") << " "
-      << varGlue("DEFINES","-D"," -D","") << endl;
-    t << "LEXFLAGS=" << var("QMAKE_LEXFLAGS") << endl;
-    t << "YACCFLAGS=" << var("QMAKE_YACCFLAGS") << endl;
-
-    t << "INCPATH	=	";
-    TQStringList &incs = project->variables()["INCLUDEPATH"];
-    for(TQStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) {
-	TQString inc = (*incit);
-	inc.replace(TQRegExp("\\\\*$"), "");
-	inc.replace("\"", "");
-	t << " -I\"" << inc << "\"";
-    }
-    t << " -I\"" << specdir() << "\""
-      << endl;
-
-    if(!project->variables()["QMAKE_APP_OR_DLL"].isEmpty()) {
-	t << "LINK	=	" << var("QMAKE_LINK") << endl;
-	t << "LFLAGS	=	";
-	if ( !project->variables()["QMAKE_LIBDIR"].isEmpty() )
-	    t << varGlue("QMAKE_LIBDIR","-L",";","") << " ";
-	t << var("QMAKE_LFLAGS") << endl;
-	t << "LIBS	=	" << var("QMAKE_LIBS") << endl;
-    }
-    else {
-	t << "LIB	=	" << var("QMAKE_LIB") << endl;
-    }
-    t << "MOC	=	" << (project->isEmpty("QMAKE_MOC") ? TQString("moc") :
-			      Option::fixPathToTargetOS(var("QMAKE_MOC"), FALSE)) << endl;
-    t << "UIC	=	" << (project->isEmpty("QMAKE_UIC") ? TQString("uic") :
-			      Option::fixPathToTargetOS(var("QMAKE_UIC"), FALSE)) << endl;
-    t << "QMAKE =       " << (project->isEmpty("QMAKE_QMAKE") ? TQString("qmake") :
-			      Option::fixPathToTargetOS(var("QMAKE_QMAKE"), FALSE)) << endl;
-    t << "IDC		=	" << (project->isEmpty("QMAKE_IDC") ? TQString("idc") :
-			      Option::fixPathToTargetOS(var("QMAKE_IDC"), FALSE)) << endl;
-    t << "IDL		=	" << (project->isEmpty("QMAKE_IDL") ? TQString("midl") :
-			      Option::fixPathToTargetOS(var("QMAKE_IDL"), FALSE)) << endl;
-    t << "ZIP	=	" << var("QMAKE_ZIP") << endl;
-    t << "DEF_FILE =	" << varList("DEF_FILE") << endl;
-    t << "RES_FILE =	" << varList("RES_FILE") << endl;
-    t << "COPY_FILE  =       " << var("QMAKE_COPY") << endl;
-    t << "COPY_DIR  =       " << var("QMAKE_COPY") << endl;
-    t << "DEL_FILE   =       " << var("QMAKE_DEL_FILE") << endl;
-    t << "DEL_DIR    =       " << var("QMAKE_DEL_DIR") << endl;
-    t << "MOVE  =       " << var("QMAKE_MOVE") << endl;
-    t << "CHK_DIR_EXISTS =	" << var("QMAKE_CHK_DIR_EXISTS") << endl;
-    t << "MKDIR		=	" << var("QMAKE_MKDIR") << endl;
-    t << "INSTALL_FILE= " << var("QMAKE_INSTALL_FILE") << endl;
-    t << "INSTALL_DIR = " << var("QMAKE_INSTALL_DIR") << endl;
-    t << endl;
-
-    t << "####### Files" << endl << endl;
-    t << "HEADERS =	" << varList("HEADERS") << endl;
-    t << "SOURCES =	" << varList("SOURCES") << endl;
-    t << "OBJECTS =	" << varList("OBJECTS") << endl;
-    t << "FORMS =	" << varList("FORMS") << endl;
-    t << "UICDECLS =	" << varList("UICDECLS") << endl;
-    t << "UICIMPLS =	" << varList("UICIMPLS") << endl;
-    t << "SRCMOC	=	" << varList("SRCMOC") << endl;
-    t << "OBJMOC	=	" << varList("OBJMOC") << endl;
-
-    TQString extraCompilerDeps;
-    if(!project->isEmpty("QMAKE_EXTRA_WIN_COMPILERS")) {
-	t << "OBJCOMP = " << varList("OBJCOMP") << endl;
-	extraCompilerDeps += " $(OBJCOMP) ";
-
-	TQStringList &comps = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"];
-	for(TQStringList::Iterator compit = comps.begin(); compit != comps.end(); ++compit) {
-	    TQStringList &vars = project->variables()[(*compit) + ".variables"];
-	    for(TQStringList::Iterator varit = vars.begin(); varit != vars.end(); ++varit) {
-		TQStringList vals = project->variables()[(*varit)];
-		if(!vals.isEmpty())
-		    t << "QMAKE_COMP_" << (*varit) << " = " << valList(vals) << endl;
-	    }
-	}
-    }
-
-    t << "DIST	=	" << varList("DISTFILES") << endl;
-    t << "TARGET	=	"
-      << varGlue("TARGET",project->first("DESTDIR"),"",project->first("TARGET_EXT"))
-      << endl;
-    t << endl;
-
-    t << "####### Implicit rules" << endl << endl;
-    t << ".SUFFIXES: .c";
-    TQStringList::Iterator cppit;
-    for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit)
-	t << " " << (*cppit);
-    t << endl << endl;
-    for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit)
-	t << (*cppit) << Option::obj_ext << ":\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl;
-    t << ".c" << Option::obj_ext << ":\n\t" << var("QMAKE_RUN_CC_IMP") << endl << endl;
-
-    t << "####### Build rules" << endl << endl;
-    t << "all: " << fileFixify(Option::output.name()) << " " << varGlue("ALL_DEPS"," "," "," ") << " $(TARGET)" << endl << endl;
-    t << "$(TARGET): " << var("PRE_TARGETDEPS") << " $(UICDECLS) $(OBJECTS) $(OBJMOC) "
-      << extraCompilerDeps << var("POST_TARGETDEPS");
-    if(!project->variables()["QMAKE_APP_OR_DLL"].isEmpty()) {
-	t << "\n\t" << "$(LINK) @&&|" << "\n\t"
-	  << "$(LFLAGS) $(OBJECTS) $(OBJMOC),$(TARGET),,$(LIBS),$(DEF_FILE),$(RES_FILE)";
-    } else {
-	t << "\n\t-$(DEL_FILE) $(TARGET)"
-	  << "\n\t" << "$(LIB) $(TARGET) @&&|" << " \n+"
-	  << project->variables()["OBJECTS"].join(" \\\n+") << " \\\n+"
-	  << project->variables()["OBJMOC"].join(" \\\n+");
-    }
-    t << extraCompilerDeps;
-    t << endl << "|" << endl;
-
-    if ( !project->variables()["QMAKE_POST_LINK"].isEmpty() )
-	t << "\t" <<var("QMAKE_POST_LINK") << endl;
-
-    if(project->isActiveConfig("dll") && !project->variables()["DLLDESTDIR"].isEmpty()) {
-	TQStringList dlldirs = project->variables()["DLLDESTDIR"];
-	for ( TQStringList::Iterator dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir ) {
-	    t << "\n\t" << "-$(COPY_FILE) \"$(TARGET)\" " << *dlldir;
-	}
-    }
-    TQString targetfilename = project->variables()["TARGET"].first();
-    if(project->isActiveConfig("activeqt")) {
-	TQString version = project->variables()["VERSION"].first();
-	if ( version.isEmpty() )
-	    version = "1.0";
-
-	if ( project->isActiveConfig("dll")) {
-	    t << "\n\t" << ("-$(IDC) $(TARGET) /idl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version);
-	    t << "\n\t" << ("-$(IDL) /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb");
-	    t << "\n\t" << ("-$(IDC) $(TARGET) /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb");
-	    t << "\n\t" << ("-$(IDC) $(TARGET) /regserver" );
-	} else {
-	    t << "\n\t" << ("-$(TARGET) -dumpidl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version);
-	    t << "\n\t" << ("-$(IDL) /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb");
-	    t << "\n\t" << ("-$(IDC) $(TARGET) /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb");
-	    t << "\n\t" << ("-$(TARGET) -regserver");
-	}
-    }
-    t << endl << endl;
-
-    if(!project->variables()["RC_FILE"].isEmpty()) {
-	t << var("RES_FILE") << ": " << var("RC_FILE") << "\n\t"
-	  << var("QMAKE_RC") << " " << var("RC_FILE") << endl << endl;
-    }
-    t << "mocables: $(SRCMOC)" << endl
-      << "uicables: $(UICIMPLS) $(UICDECLS)" << endl << endl;
-
-    writeMakeQmake(t);
-
-    TQStringList dist_files = Option::mkfile::project_files;
-    if(!project->isEmpty("QMAKE_INTERNAL_INCLUDED_FILES"))
-	dist_files += project->variables()["QMAKE_INTERNAL_INCLUDED_FILES"];
-    if(!project->isEmpty("TRANSLATIONS"))
-	dist_files << var("TRANSLATIONS");
-    if(!project->isEmpty("FORMS")) {
-	TQStringList &forms = project->variables()["FORMS"];
-	for(TQStringList::Iterator formit = forms.begin(); formit != forms.end(); ++formit) {
-	    TQString ui_h = fileFixify((*formit) + Option::h_ext.first());
-	    if(TQFile::exists(ui_h) )
-		dist_files << ui_h;
-	}
-    }
-    t << "dist:" << "\n\t"
-      << "$(ZIP) " << var("QMAKE_ORIG_TARGET") << ".zip " << "$(SOURCES) $(HEADERS) $(DIST) $(FORMS) "
-      << dist_files.join(" ") << " " << var("TRANSLATIONS") << " " << var("IMAGES") << endl << endl;
-
-    t << "uiclean:";
-    TQString uiclean = varGlue("UICDECLS" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") + varGlue("UICIMPLS" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","");
-    if ( uiclean.isEmpty() ) {
-	// Borland make does not like an empty command section
-	uiclean = "\n\t@cd .";
-    }
-    t << uiclean << endl;
-
-    t << "mocclean:";
-    TQString mocclean = varGlue("SRCMOC" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") + varGlue("OBJMOC" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","");
-    if ( mocclean.isEmpty() ) {
-	// Borland make does not like an empty command section
-	mocclean = "\n\t@cd .";
-    }
-    t << mocclean << endl;
-
-    t << "clean: uiclean mocclean"
-      << varGlue("OBJECTS","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","")
-      << varGlue("QMAKE_CLEAN","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","")
-      << varGlue("CLEAN_FILES","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","");
-    if ( project->isActiveConfig("activeqt")) {
-	t << ("\n\t-$(DEL_FILE) " + var("OBJECTS_DIR") + targetfilename + ".idl");
-	t << ("\n\t-$(DEL_FILE) " + var("OBJECTS_DIR") + targetfilename + ".tlb");
-    }
-    if(!project->isEmpty("IMAGES"))
-	t << varGlue("QMAKE_IMAGE_COLLECTION", "\n\t-$(DEL_FILE) ", "\n\t-$(DEL_FILE) ", "");
-    t << endl;
-
-    // user defined targets
-    TQStringList::Iterator it;
-    TQStringList &qut = project->variables()["QMAKE_EXTRA_WIN_TARGETS"];
-    for(it = qut.begin(); it != qut.end(); ++it) {
-	TQString targ = var((*it) + ".target"),
-		 cmd = var((*it) + ".commands"), deps;
-	if(targ.isEmpty())
-	    targ = (*it);
-	TQStringList &deplist = project->variables()[(*it) + ".depends"];
-	for(TQStringList::Iterator dep_it = deplist.begin(); dep_it != deplist.end(); ++dep_it) {
-	    TQString dep = var((*dep_it) + ".target");
-	    if(dep.isEmpty())
-		dep = (*dep_it);
-	    deps += " " + dep;
-	}
-	if(!project->variables()["QMAKE_NOFORCE"].isEmpty() &&
-	   project->variables()[(*it) + ".CONFIG"].findIndex("phony") != -1)
-	    deps += TQString(" ") + "FORCE";
-	t << "\n\n" << targ << ":" << deps << "\n\t"
-	  << cmd;
-    }
-
-    t << endl << endl;
-
-    TQStringList &quc = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"];
-    for(it = quc.begin(); it != quc.end(); ++it) {
-	TQString tmp_out = project->variables()[(*it) + ".output"].first();
-	TQString tmp_cmd = project->variables()[(*it) + ".commands"].join(" ");
-	TQString tmp_dep = project->variables()[(*it) + ".depends"].join(" ");
-	TQStringList &vars = project->variables()[(*it) + ".variables"];
-	if(tmp_out.isEmpty() || tmp_cmd.isEmpty())
-	    continue;
-	TQStringList &tmp = project->variables()[(*it) + ".input"];
-	for(TQStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) {
-	    TQStringList &inputs = project->variables()[(*it2)];
-	    for(TQStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
-		TQFileInfo fi(Option::fixPathToLocalOS((*input)));
-		TQString in = Option::fixPathToTargetOS((*input), FALSE),
-		       out = tmp_out, cmd = tmp_cmd, deps;
-		out.replace("${QMAKE_FILE_BASE}", fi.baseName());
-		out.replace("${QMAKE_FILE_NAME}", fi.filePath());
-		cmd.replace("${QMAKE_FILE_BASE}", fi.baseName());
-		cmd.replace("${QMAKE_FILE_OUT}", out);
-		cmd.replace("${QMAKE_FILE_NAME}", fi.filePath());
-		for(TQStringList::Iterator it3 = vars.begin(); it3 != vars.end(); ++it3)
-		    cmd.replace("$(" + (*it3) + ")", "$(QMAKE_COMP_" + (*it3)+")");
-		if(!tmp_dep.isEmpty()) {
-		    char buff[256];
-		    TQString dep_cmd = tmp_dep;
-		    dep_cmd.replace("${QMAKE_FILE_NAME}", fi.filePath());
-		    if(FILE *proc = QT_POPEN(dep_cmd.latin1(), "r")) {
-			while(!feof(proc)) {
-			    int read_in = int(fread(buff, 1, 255, proc));
-			    if(!read_in)
-				break;
-			    int l = 0;
-			    for(int i = 0; i < read_in; i++) {
-				if(buff[i] == '\n' || buff[i] == ' ') {
-				    deps += " " + TQCString(buff+l, (i - l) + 1);
-				    l = i;
-				}
-			    }
-			}
-			fclose(proc);
-		    }
-		}
-		t << out << ": " << in << deps << "\n\t"
-		  << cmd << endl << endl;
-	    }
-	}
-    }
-    t << endl;
-
-    t << "distclean: clean"
-      << "\n\t-$(DEL_FILE) $(TARGET)"
-      << endl << endl;
-}
-
-void
-BorlandMakefileGenerator::init()
-{
-    if(init_flag)
-	return;
-    init_flag = TRUE;
-
-    project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"];
-
-    /* this should probably not be here, but I'm using it to wrap the .t files */
-    if(project->first("TEMPLATE") == "app")
-	project->variables()["QMAKE_APP_FLAG"].append("1");
-    else if(project->first("TEMPLATE") == "lib")
-	project->variables()["QMAKE_LIB_FLAG"].append("1");
-    else if(project->first("TEMPLATE") == "subdirs") {
-	MakefileGenerator::init();
-	if(project->variables()["MAKEFILE"].isEmpty())
-	    project->variables()["MAKEFILE"].append("Makefile");
-	if(project->variables()["QMAKE"].isEmpty())
-	    project->variables()["QMAKE"].append("qmake");
-	return;
-    }
-
-    if(project->isEmpty("QMAKE_INSTALL_FILE"))
-	project->variables()["QMAKE_INSTALL_FILE"].append("$(COPY_FILE)");
-    if(project->isEmpty("QMAKE_INSTALL_DIR"))
-	project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_DIR)");
-
-    bool is_qt = (project->first("TARGET") == "qt" TQTDLL_POSTFIX || project->first("TARGET") == "qtmt" TQTDLL_POSTFIX);
-    TQStringList &configs = project->variables()["CONFIG"];
-    if (project->isActiveConfig("shared"))
-	project->variables()["DEFINES"].append("QT_DLL");
-    if (project->isActiveConfig("qt_dll"))
-	if(configs.findIndex("qt") == -1) configs.append("qt");
-    if ( project->isActiveConfig("qtopia") ) {
-	if(configs.findIndex("qtopialib") == -1)
-	    configs.append("qtopialib");
-	if(configs.findIndex("qtopiainc") == -1)
-	    configs.append("qtopiainc");
-    }
-    if ( project->isActiveConfig("qt") ) {
-	if ( project->isActiveConfig("plugin") ) {
-	    project->variables()["CONFIG"].append("dll");
-	    project->variables()["DEFINES"].append("QT_PLUGIN");
-	}
-	if ( (project->variables()["DEFINES"].findIndex("QT_NODLL") == -1) &&
-	     ((project->variables()["DEFINES"].findIndex("QT_MAKEDLL") != -1 ||
-	       project->variables()["DEFINES"].findIndex("QT_DLL") != -1) ||
-	      (getenv("QT_DLL") && !getenv("QT_NODLL"))) ) {
-	    project->variables()["QMAKE_QT_DLL"].append("1");
-	    if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() )
-		project->variables()["CONFIG"].append("dll");
-	}
-    }
-    if ( project->isActiveConfig("dll") || !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) {
-	project->variables()["CONFIG"].remove("staticlib");
-	project->variables()["QMAKE_APP_OR_DLL"].append("1");
-    } else {
-	project->variables()["CONFIG"].append("staticlib");
-    }
-    if ( project->isActiveConfig("warn_off") ) {
-	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_WARN_OFF"];
-	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_WARN_OFF"];
-    } else if ( project->isActiveConfig("warn_on") ) {
-	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_WARN_ON"];
-	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_WARN_ON"];
-    }
-    if(project->isActiveConfig("qt")) {
-	if ( project->isActiveConfig("thread") )
-	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_THREAD_SUPPORT");
-	if ( project->isActiveConfig("accessibility" ) )
-	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT");
-	if ( project->isActiveConfig("tablet") )
-	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_TABLET_SUPPORT");
-    }
-
-    if ( project->isActiveConfig("debug") ) {
-        if ( project->isActiveConfig("thread") ) {
-	    if ( project->isActiveConfig("dll") ) {
-		project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DLLDBG"];
-		project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DLLDBG"];
-	    } else {
-		project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DBG"];
-		project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DBG"];
-	    }
-        }
-	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_DEBUG"];
-	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_DEBUG"];
-	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_DEBUG"];
-    } else {
-	if ( project->isActiveConfig("thread") ) {
-	    if ( project->isActiveConfig("dll") ) {
-		project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DLL"];
-		project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DLL"];
-	    } else {
-		project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT"];
-		project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT"];
-	    }
-	}
-	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RELEASE"];
-	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RELEASE"];
-	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_RELEASE"];
-    }
-
-    if ( !project->variables()["QMAKE_INCDIR"].isEmpty()) {
-	project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR"];
-    }
-    if ( project->isActiveConfig("qt") || project->isActiveConfig("opengl") ) {
-	project->variables()["CONFIG"].append("windows");
-    }
-    if ( project->isActiveConfig("qtopiainc") )
-	project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_TQTOPIA"];
-    if ( project->isActiveConfig("qtopialib") ) {
-	if(!project->isEmpty("QMAKE_LIBDIR_TQTOPIA"))
-	    project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_TQTOPIA"];
-	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QTOPIA"];
-    }
-    if ( project->isActiveConfig("qt") ) {
-	project->variables()["CONFIG"].append("moc");
-	project->variables()["INCLUDEPATH"] +=	project->variables()["QMAKE_INCDIR_TQT"];
-	project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_TQT"];
-	if ( !project->isActiveConfig("debug") )
-	    project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_NO_DEBUG");
-	if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) {
-	    if ( !project->variables()["QMAKE_QT_DLL"].isEmpty()) {
-		project->variables()["DEFINES"].append("QT_MAKEDLL");
-		project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_QT_DLL"];
-	    }
-	} else {
-	    if(project->isActiveConfig("thread"))
-		project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"];
-	    else
-		project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"];
-	    if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) {
-		int hver = findHighestVersion(project->first("QMAKE_LIBDIR_TQT"), "qt");
-		if ( hver == -1 )
-		    hver = findHighestVersion(project->first("QMAKE_LIBDIR_TQT"), "qtmt");
-		if(hver != -1) {
-		    TQString ver;
-		    ver.sprintf("qt%s" TQTDLL_POSTFIX "%d.lib", (project->isActiveConfig("thread") ? "mt" : ""), hver);
-		    TQStringList &libs = project->variables()["QMAKE_LIBS"];
-		    for(TQStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit)
-			(*libit).replace(TQRegExp("qt(mt)?\\.lib"), ver);
-		}
-	    }
-	    if ( project->isActiveConfig( "activeqt" ) ) {
-		project->variables().remove("QMAKE_LIBS_QT_ENTRY");
-		project->variables()["QMAKE_LIBS_QT_ENTRY"] = "qaxserver.lib";
-		if ( project->isActiveConfig( "dll" ) )
-		    project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_ENTRY"];
-	    }
-	    if ( !project->isActiveConfig("dll") && !project->isActiveConfig("plugin") ) {
-		project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_ENTRY"];
-	    }
-	}
-    }
-    if ( project->isActiveConfig("opengl") ) {
-	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_OPENGL"];
-	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_OPENGL"];
-    }
-    if ( project->isActiveConfig("dll") ) {
-	project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CFLAGS_CONSOLE_DLL"];
-	project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CXXFLAGS_CONSOLE_DLL"];
-	project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_LFLAGS_CONSOLE_DLL"];
-	project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["QMAKE_LFLAGS_WINDOWS_DLL"];
-	if ( !project->variables()["QMAKE_LIB_FLAG"].isEmpty()) {
-	    project->variables()["TARGET_EXT"].append(
-		TQStringList::split('.',project->first("VERSION")).join("") + ".dll");
-	} else {
-	    project->variables()["TARGET_EXT"].append(".dll");
-	}
-    } else {
-	project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CFLAGS_CONSOLE"];
-	project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CXXFLAGS_CONSOLE"];
-	project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_LFLAGS_CONSOLE"];
-	project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["QMAKE_LFLAGS_WINDOWS"];
-	if ( !project->variables()["QMAKE_APP_FLAG"].isEmpty()) {
-	    project->variables()["TARGET_EXT"].append(".exe");
-	} else {
-	    project->variables()["TARGET_EXT"].append(".lib");
-	}
-    }
-    if ( project->isActiveConfig("windows") ) {
-	if ( project->isActiveConfig("console") ) {
-	    project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"];
-	    project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"];
-	    project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"];
-	    project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_CONSOLE"];
-	} else {
-	    project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"];
-	}
-	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_WINDOWS"];
-    } else {
-	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"];
-	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"];
-	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"];
-	project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_CONSOLE"];
-    }
-    if ( project->isActiveConfig("stl") ) {
-	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_ON"];
-	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_ON"];
-    } else {
-	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_OFF"];
-	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_OFF"];
-    }
-    if ( project->isActiveConfig("exceptions") ) {
-	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_ON"];
-	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_ON"];
-    } else {
-	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_OFF"];
-	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_OFF"];
-    }
-    if ( project->isActiveConfig("rtti") ) {
-	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_ON"];
-	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_ON"];
-    } else {
-	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_OFF"];
-	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_OFF"];
-    }
-
-    if ( project->isActiveConfig("thread") ) {
-        project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_RTMT"];
-    } else {
-        project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_RT"];
-    }
-    if ( project->isActiveConfig("moc") ) {
-	setMocAware(TRUE);
-    }
-    project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"];
-    // Update -lname to name.lib, and -Ldir to
-    TQStringList &libList = project->variables()["QMAKE_LIBS"];
-    for( TQStringList::Iterator stIt = libList.begin(); stIt != libList.end(); ) {
-	TQString s = *stIt;
-	if( s.startsWith( "-l" ) ) {
-	    stIt = libList.remove( stIt );
-	    stIt = libList.insert( stIt, s.mid( 2 ) + ".lib" );
-        } else if( s.startsWith( "-L" ) ) {
-	    stIt = libList.remove( stIt );
-	    project->variables()["QMAKE_LIBDIR"].append(TQDir::convertSeparators(s.mid( 2 )));
-	} else {
-	    stIt++;
-	}
-    }
-    project->variables()["QMAKE_FILETAGS"] += TQStringList::split(' ',
-	"HEADERS SOURCES DEF_FILE RC_FILE TARGET QMAKE_LIBS DESTDIR DLLDESTDIR INCLUDEPATH");
-    TQStringList &l = project->variables()["QMAKE_FILETAGS"];
-    TQStringList::Iterator it;
-    for(it = l.begin(); it != l.end(); ++it) {
-	TQStringList &gdmf = project->variables()[(*it)];
-	for(TQStringList::Iterator inner = gdmf.begin(); inner != gdmf.end(); ++inner)
-	    (*inner) = Option::fixPathToTargetOS((*inner), FALSE);
-    }
-
-    if ( !project->variables()["RC_FILE"].isEmpty()) {
-	if ( !project->variables()["RES_FILE"].isEmpty()) {
-	    fprintf(stderr, "Both .rc and .res file specified.\n");
-	    fprintf(stderr, "Please specify one of them, not both.");
-	    exit(666);
-	}
-	project->variables()["RES_FILE"] = project->variables()["RC_FILE"];
-	project->variables()["RES_FILE"].first().replace(".rc",".res");
-	project->variables()["POST_TARGETDEPS"] += project->variables()["RES_FILE"];
-	project->variables()["CLEAN_FILES"] += project->variables()["RES_FILE"];
-    }
-    MakefileGenerator::init();
-    if ( !project->variables()["VERSION"].isEmpty()) {
-	TQStringList l = TQStringList::split('.', project->first("VERSION"));
-	project->variables()["VER_MAJ"].append(l[0]);
-	project->variables()["VER_MIN"].append(l[1]);
-    }
-
-    if ( project->isActiveConfig("dll") || !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) {
-	// bcc does not generate a .tds file for static libs
-	TQString tdsPostfix;
-	if ( !project->variables()["VERSION"].isEmpty() ) {
-	    tdsPostfix = TQStringList::split( '.', project->first("VERSION") ).join("")
-		+ ".tds";
-	} else {
-	    tdsPostfix = ".tds";
-	}
-	project->variables()["QMAKE_CLEAN"].append(
-		project->first("DESTDIR") + project->first("TARGET") + tdsPostfix );
-    }
-
-    TQStringList &quc = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"];
-    for(it = quc.begin(); it != quc.end(); ++it) {
-	TQString tmp_out = project->variables()[(*it) + ".output"].first();
-	if(tmp_out.isEmpty())
-	    continue;
-	TQStringList &tmp = project->variables()[(*it) + ".input"];
-	for(TQStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) {
-	    TQStringList &inputs = project->variables()[(*it2)];
-	    for(TQStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
-		TQFileInfo fi(Option::fixPathToLocalOS((*input)));
-		TQString in = Option::fixPathToTargetOS((*input), FALSE),
-		    out = tmp_out;
-		out.replace("${QMAKE_FILE_BASE}", fi.baseName());
-		out.replace("${QMAKE_FILE_NAME}", fi.filePath());
-		if(project->variables()[(*it) + ".CONFIG"].findIndex("no_link") == -1)
-		    project->variables()["OBJCOMP"] += out;
-	    }
-	}
-    }
-}
diff --git a/qmake/generators/win32/borland_bmake.h b/qmake/generators/win32/borland_bmake.h
deleted file mode 100644
index 73af89b76..000000000
--- a/qmake/generators/win32/borland_bmake.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
-**
-** Definition of BorlandMakefileGenerator class.
-**
-** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
-**
-** This file is part of qmake.
-**
-** This file may be used under the terms of the GNU General
-** Public License versions 2.0 or 3.0 as published by the Free
-** Software Foundation and appearing in the files LICENSE.GPL2
-** and LICENSE.GPL3 included in the packaging of this file.
-** Alternatively you may (at your option) use any later version
-** of the GNU General Public License if such license has been
-** publicly approved by Trolltech ASA (or its successors, if any)
-** and the KDE Free TQt Foundation.
-**
-** Please review the following information to ensure GNU General
-** Public Licensing requirements will be met:
-** http://trolltech.com/products/qt/licenses/licensing/opensource/.
-** If you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
-** or contact the sales department at sales@trolltech.com.
-**
-** This file may be used under the terms of the Q Public License as
-** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
-** included in the packaging of this file.  Licensees holding valid TQt
-** Commercial licenses may use this file in accordance with the TQt
-** Commercial License Agreement provided with the Software.
-**
-** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
-** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
-** herein.
-**
-**********************************************************************/
-
-#ifndef __BORLAND_BMAKE_H__
-#define __BORLAND_BMAKE_H__
-
-#include "winmakefile.h"
-
-class BorlandMakefileGenerator : public Win32MakefileGenerator
-{
-    bool init_flag;
-    void writeBorlandParts(TQTextStream &);
-
-    bool writeMakefile(TQTextStream &);
-    void init();
-
-public:
-    BorlandMakefileGenerator(TQMakeProject *p);
-    ~BorlandMakefileGenerator();
-};
-
-inline BorlandMakefileGenerator::~BorlandMakefileGenerator()
-{ }
-
-#endif /* __BORLAND_BMAKE_H__ */
diff --git a/qmake/main.cpp b/qmake/main.cpp
index 2371db7ad..d9095ef0a 100644
--- a/qmake/main.cpp
+++ b/qmake/main.cpp
@@ -50,8 +50,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-// for Borland, main is defined to qMain which breaks qmake
-#undef main
 #ifdef Q_OS_MAC
 // for qurl
 bool tqt_resolve_symlinks = FALSE;
diff --git a/src/3rdparty/libmng/libmng.h b/src/3rdparty/libmng/libmng.h
index 924f40dbf..bbcbe6dc4 100644
--- a/src/3rdparty/libmng/libmng.h
+++ b/src/3rdparty/libmng/libmng.h
@@ -231,10 +231,6 @@
 /* *                                                                        * */
 /* ************************************************************************** */
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 #ifndef _libmng_h_
 #define _libmng_h_
 
diff --git a/src/3rdparty/libmng/libmng_callback_xs.c b/src/3rdparty/libmng/libmng_callback_xs.c
index 690b3a817..b8d64a2e4 100644
--- a/src/3rdparty/libmng/libmng_callback_xs.c
+++ b/src/3rdparty/libmng/libmng_callback_xs.c
@@ -49,13 +49,6 @@
 #include "libmng_data.h"
 #include "libmng_error.h"
 #include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
 
 /* ************************************************************************** */
 /* *                                                                        * */
diff --git a/src/3rdparty/libmng/libmng_chunk_io.c b/src/3rdparty/libmng/libmng_chunk_io.c
index 0f61a708e..6c1be77c4 100644
--- a/src/3rdparty/libmng/libmng_chunk_io.c
+++ b/src/3rdparty/libmng/libmng_chunk_io.c
@@ -153,9 +153,6 @@
 #include "libmng_data.h"
 #include "libmng_error.h"
 #include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
 #include "libmng_objects.h"
 #include "libmng_object_prc.h"
 #include "libmng_chunks.h"
@@ -168,10 +165,6 @@
 #include "libmng_pixels.h"
 #include "libmng_chunk_io.h"
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 /* ************************************************************************** */
 /* *                                                                        * */
 /* * CRC - Cyclic Redundancy Check                                          * */
diff --git a/src/3rdparty/libmng/libmng_chunk_io.h b/src/3rdparty/libmng/libmng_chunk_io.h
index d9056017c..b6f01810f 100644
--- a/src/3rdparty/libmng/libmng_chunk_io.h
+++ b/src/3rdparty/libmng/libmng_chunk_io.h
@@ -32,10 +32,6 @@
 /* *                                                                        * */
 /* ************************************************************************** */
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 #ifndef _libmng_chunk_io_h_
 #define _libmng_chunk_io_h_
 
diff --git a/src/3rdparty/libmng/libmng_chunk_prc.c b/src/3rdparty/libmng/libmng_chunk_prc.c
index f3c27f486..d9274d658 100644
--- a/src/3rdparty/libmng/libmng_chunk_prc.c
+++ b/src/3rdparty/libmng/libmng_chunk_prc.c
@@ -42,17 +42,10 @@
 #include "libmng_data.h"
 #include "libmng_error.h"
 #include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
 #include "libmng_memory.h"
 #include "libmng_chunks.h"
 #include "libmng_chunk_prc.h"
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 /* ************************************************************************** */
 /* *                                                                        * */
 /* * General chunk routines                                                 * */
diff --git a/src/3rdparty/libmng/libmng_chunk_prc.h b/src/3rdparty/libmng/libmng_chunk_prc.h
index a1054d419..bb69033ac 100644
--- a/src/3rdparty/libmng/libmng_chunk_prc.h
+++ b/src/3rdparty/libmng/libmng_chunk_prc.h
@@ -28,10 +28,6 @@
 /* *                                                                        * */
 /* ************************************************************************** */
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 #ifndef _libmng_chunk_prc_h_
 #define _libmng_chunk_prc_h_
 
diff --git a/src/3rdparty/libmng/libmng_chunk_xs.c b/src/3rdparty/libmng/libmng_chunk_xs.c
index 8ca3f472b..5edc01bfc 100644
--- a/src/3rdparty/libmng/libmng_chunk_xs.c
+++ b/src/3rdparty/libmng/libmng_chunk_xs.c
@@ -58,18 +58,11 @@
 #include "libmng_data.h"
 #include "libmng_error.h"
 #include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
 #include "libmng_memory.h"
 #include "libmng_chunks.h"
 #include "libmng_chunk_prc.h"
 #include "libmng_chunk_io.h"
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 /* ************************************************************************** */
 
 #ifdef MNG_ACCESS_CHUNKS
diff --git a/src/3rdparty/libmng/libmng_chunks.h b/src/3rdparty/libmng/libmng_chunks.h
index 0fe787135..9b458d654 100644
--- a/src/3rdparty/libmng/libmng_chunks.h
+++ b/src/3rdparty/libmng/libmng_chunks.h
@@ -42,10 +42,6 @@
 /* *                                                                        * */
 /* ************************************************************************** */
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 #ifndef _libmng_chunks_h_
 #define _libmng_chunks_h_
 
diff --git a/src/3rdparty/libmng/libmng_cms.c b/src/3rdparty/libmng/libmng_cms.c
index d072e3717..ad64e7326 100644
--- a/src/3rdparty/libmng/libmng_cms.c
+++ b/src/3rdparty/libmng/libmng_cms.c
@@ -61,16 +61,9 @@
 #include "libmng_data.h"
 #include "libmng_error.h"
 #include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
 #include "libmng_objects.h"
 #include "libmng_cms.h"
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 /* ************************************************************************** */
 
 #ifdef MNG_INCLUDE_DISPLAY_PROCS
diff --git a/src/3rdparty/libmng/libmng_cms.h b/src/3rdparty/libmng/libmng_cms.h
index 02d6c330d..31e0cea03 100644
--- a/src/3rdparty/libmng/libmng_cms.h
+++ b/src/3rdparty/libmng/libmng_cms.h
@@ -30,10 +30,6 @@
 /* *                                                                        * */
 /* ************************************************************************** */
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 #ifndef _libmng_cms_h_
 #define _libmng_cms_h_
 
diff --git a/src/3rdparty/libmng/libmng_conf.h b/src/3rdparty/libmng/libmng_conf.h
index c910786ff..31d512c41 100644
--- a/src/3rdparty/libmng/libmng_conf.h
+++ b/src/3rdparty/libmng/libmng_conf.h
@@ -38,10 +38,6 @@
 /* ************************************************************************** */
 
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 #ifndef _libmng_conf_h_
 #define _libmng_conf_h_
 
@@ -90,16 +86,6 @@
 /* #define MNG_SUPPORT_JPEG12 */
 #endif
 
-/* The following is required to export the IJG routines from the DLL in
-   the Windows-standard calling convention;
-   currently this only works for Borland C++ !!! */
-
-#if defined(MNG_BUILD_DLL) || defined(MNG_USE_DLL)
-#if defined(MNG_SUPPORT_IJG6B) && defined(__BORLANDC__)
-#define MNG_DEFINE_JPEG_STDCALL
-#endif
-#endif
-
 /* ************************************************************************** */
 
 /* enable required high-level functions */
diff --git a/src/3rdparty/libmng/libmng_data.h b/src/3rdparty/libmng/libmng_data.h
index e881ce1a6..79509e9a6 100644
--- a/src/3rdparty/libmng/libmng_data.h
+++ b/src/3rdparty/libmng/libmng_data.h
@@ -109,10 +109,6 @@
 /* *                                                                        * */
 /* ************************************************************************** */
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 #ifndef _libmng_data_h_
 #define _libmng_data_h_
 
diff --git a/src/3rdparty/libmng/libmng_display.c b/src/3rdparty/libmng/libmng_display.c
index d2e460cd7..e177bd832 100644
--- a/src/3rdparty/libmng/libmng_display.c
+++ b/src/3rdparty/libmng/libmng_display.c
@@ -151,9 +151,6 @@
 #include "libmng_data.h"
 #include "libmng_error.h"
 #include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
 #include "libmng_objects.h"
 #include "libmng_object_prc.h"
 #include "libmng_memory.h"
@@ -163,10 +160,6 @@
 #include "libmng_pixels.h"
 #include "libmng_display.h"
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 /* ************************************************************************** */
 
 #ifdef MNG_INCLUDE_DISPLAY_PROCS
diff --git a/src/3rdparty/libmng/libmng_display.h b/src/3rdparty/libmng/libmng_display.h
index 32d3b5cc6..816630d72 100644
--- a/src/3rdparty/libmng/libmng_display.h
+++ b/src/3rdparty/libmng/libmng_display.h
@@ -41,10 +41,6 @@
 /* *                                                                        * */
 /* ************************************************************************** */
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 #ifndef _libmng_display_h_
 #define _libmng_display_h_
 
diff --git a/src/3rdparty/libmng/libmng_dither.c b/src/3rdparty/libmng/libmng_dither.c
index 4f308e5d8..88d6e45ca 100644
--- a/src/3rdparty/libmng/libmng_dither.c
+++ b/src/3rdparty/libmng/libmng_dither.c
@@ -27,15 +27,8 @@
 #include "libmng_data.h"
 #include "libmng_error.h"
 #include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
 #include "libmng_dither.h"
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 /* ************************************************************************** */
 
 mng_retcode dither_a_row (mng_datap  pData,
diff --git a/src/3rdparty/libmng/libmng_dither.h b/src/3rdparty/libmng/libmng_dither.h
index 7c8ab8a29..b860a6e52 100644
--- a/src/3rdparty/libmng/libmng_dither.h
+++ b/src/3rdparty/libmng/libmng_dither.h
@@ -23,10 +23,6 @@
 /* *                                                                        * */
 /* ************************************************************************** */
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 #ifndef _libmng_dither_h_
 #define _libmng_dither_h_
 
diff --git a/src/3rdparty/libmng/libmng_error.c b/src/3rdparty/libmng/libmng_error.c
index 237f4671f..7870bf06f 100644
--- a/src/3rdparty/libmng/libmng_error.c
+++ b/src/3rdparty/libmng/libmng_error.c
@@ -59,13 +59,6 @@
 #include "libmng_data.h"
 #include "libmng_error.h"
 #include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
 
 /* ************************************************************************** */
 
diff --git a/src/3rdparty/libmng/libmng_error.h b/src/3rdparty/libmng/libmng_error.h
index 9ea9316c7..712a76374 100644
--- a/src/3rdparty/libmng/libmng_error.h
+++ b/src/3rdparty/libmng/libmng_error.h
@@ -43,10 +43,6 @@
 /* *                                                                        * */
 /* ************************************************************************** */
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 #ifndef _libmng_error_h_
 #define _libmng_error_h_
 
diff --git a/src/3rdparty/libmng/libmng_filter.c b/src/3rdparty/libmng/libmng_filter.c
index a055f5cbb..541db749d 100644
--- a/src/3rdparty/libmng/libmng_filter.c
+++ b/src/3rdparty/libmng/libmng_filter.c
@@ -32,15 +32,8 @@
 #include "libmng_data.h"
 #include "libmng_error.h"
 #include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
 #include "libmng_filter.h"
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 /* ************************************************************************** */
 
 #ifdef MNG_INCLUDE_FILTERS
diff --git a/src/3rdparty/libmng/libmng_filter.h b/src/3rdparty/libmng/libmng_filter.h
index 2c8c61d7d..9f87166c4 100644
--- a/src/3rdparty/libmng/libmng_filter.h
+++ b/src/3rdparty/libmng/libmng_filter.h
@@ -26,10 +26,6 @@
 /* *                                                                        * */
 /* ************************************************************************** */
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 #ifndef _libmng_filter_h_
 #define _libmng_filter_h_
 
diff --git a/src/3rdparty/libmng/libmng_hlapi.c b/src/3rdparty/libmng/libmng_hlapi.c
index 9a897ffaf..50418c4c1 100644
--- a/src/3rdparty/libmng/libmng_hlapi.c
+++ b/src/3rdparty/libmng/libmng_hlapi.c
@@ -140,9 +140,6 @@
 #include "libmng_data.h"
 #include "libmng_error.h"
 #include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
 #include "libmng_objects.h"
 #include "libmng_object_prc.h"
 #include "libmng_chunks.h"
@@ -155,10 +152,6 @@
 #include "libmng_cms.h"
 #include "libmng_pixels.h"
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 /* ************************************************************************** */
 /* *                                                                        * */
 /* * local routines                                                         * */
diff --git a/src/3rdparty/libmng/libmng_jpeg.c b/src/3rdparty/libmng/libmng_jpeg.c
index dba8bf56e..872f8a9c0 100644
--- a/src/3rdparty/libmng/libmng_jpeg.c
+++ b/src/3rdparty/libmng/libmng_jpeg.c
@@ -49,17 +49,10 @@
 #include "libmng_data.h"
 #include "libmng_error.h"
 #include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
 #include "libmng_memory.h"
 #include "libmng_pixels.h"
 #include "libmng_jpeg.h"
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 /* ************************************************************************** */
 
 #ifdef MNG_INCLUDE_JNG
diff --git a/src/3rdparty/libmng/libmng_jpeg.h b/src/3rdparty/libmng/libmng_jpeg.h
index 0f1aa6f11..8f987a7a8 100644
--- a/src/3rdparty/libmng/libmng_jpeg.h
+++ b/src/3rdparty/libmng/libmng_jpeg.h
@@ -26,10 +26,6 @@
 /* *                                                                        * */
 /* ************************************************************************** */
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 #ifndef _libmng_jpeg_h_
 #define _libmng_jpeg_h_
 
diff --git a/src/3rdparty/libmng/libmng_memory.h b/src/3rdparty/libmng/libmng_memory.h
index 568d32411..c4eceb93f 100644
--- a/src/3rdparty/libmng/libmng_memory.h
+++ b/src/3rdparty/libmng/libmng_memory.h
@@ -28,10 +28,6 @@
 /* *                                                                        * */
 /* ************************************************************************** */
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 #ifndef _libmng_memory_h_
 #define _libmng_memory_h_
 
diff --git a/src/3rdparty/libmng/libmng_object_prc.c b/src/3rdparty/libmng/libmng_object_prc.c
index 6915db85d..937bc6c4e 100644
--- a/src/3rdparty/libmng/libmng_object_prc.c
+++ b/src/3rdparty/libmng/libmng_object_prc.c
@@ -86,19 +86,12 @@
 #include "libmng_data.h"
 #include "libmng_error.h"
 #include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
 #include "libmng_memory.h"
 #include "libmng_objects.h"
 #include "libmng_display.h"
 #include "libmng_pixels.h"
 #include "libmng_object_prc.h"
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 /* ************************************************************************** */
 
 #ifdef MNG_INCLUDE_DISPLAY_PROCS
diff --git a/src/3rdparty/libmng/libmng_object_prc.h b/src/3rdparty/libmng/libmng_object_prc.h
index 7a1c78687..397764c96 100644
--- a/src/3rdparty/libmng/libmng_object_prc.h
+++ b/src/3rdparty/libmng/libmng_object_prc.h
@@ -41,10 +41,6 @@
 /* *                                                                        * */
 /* ************************************************************************** */
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 #ifndef _libmng_object_prc_h_
 #define _libmng_object_prc_h_
 
diff --git a/src/3rdparty/libmng/libmng_objects.h b/src/3rdparty/libmng/libmng_objects.h
index 67647f361..71458275d 100644
--- a/src/3rdparty/libmng/libmng_objects.h
+++ b/src/3rdparty/libmng/libmng_objects.h
@@ -52,10 +52,6 @@
 /* *                                                                        * */
 /* ************************************************************************** */
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 #ifndef _libmng_objects_h_
 #define _libmng_objects_h_
 
diff --git a/src/3rdparty/libmng/libmng_pixels.c b/src/3rdparty/libmng/libmng_pixels.c
index 737921722..75a7e7254 100644
--- a/src/3rdparty/libmng/libmng_pixels.c
+++ b/src/3rdparty/libmng/libmng_pixels.c
@@ -114,19 +114,12 @@
 #include "libmng_data.h"
 #include "libmng_error.h"
 #include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
 #include "libmng_objects.h"
 #include "libmng_memory.h"
 #include "libmng_cms.h"
 #include "libmng_filter.h"
 #include "libmng_pixels.h"
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 /* ************************************************************************** */
 
 #ifdef MNG_INCLUDE_DISPLAY_PROCS
diff --git a/src/3rdparty/libmng/libmng_pixels.h b/src/3rdparty/libmng/libmng_pixels.h
index aa97c700e..54283c4fc 100644
--- a/src/3rdparty/libmng/libmng_pixels.h
+++ b/src/3rdparty/libmng/libmng_pixels.h
@@ -48,10 +48,6 @@
 /* *                                                                        * */
 /* ************************************************************************** */
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 #ifndef _libmng_pixels_h_
 #define _libmng_pixels_h_
 
diff --git a/src/3rdparty/libmng/libmng_prop_xs.c b/src/3rdparty/libmng/libmng_prop_xs.c
index cd4ec7e0e..cd6337d70 100644
--- a/src/3rdparty/libmng/libmng_prop_xs.c
+++ b/src/3rdparty/libmng/libmng_prop_xs.c
@@ -82,15 +82,8 @@
 #include "libmng_data.h"
 #include "libmng_error.h"
 #include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
 #include "libmng_cms.h"
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 /* ************************************************************************** */
 /* *                                                                        * */
 /* *  Property set functions                                                * */
diff --git a/src/3rdparty/libmng/libmng_read.c b/src/3rdparty/libmng/libmng_read.c
index d93da7a19..fe68a9f5a 100644
--- a/src/3rdparty/libmng/libmng_read.c
+++ b/src/3rdparty/libmng/libmng_read.c
@@ -67,9 +67,6 @@
 #include "libmng_data.h"
 #include "libmng_error.h"
 #include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
 #include "libmng_memory.h"
 #include "libmng_objects.h"
 #include "libmng_object_prc.h"
@@ -79,10 +76,6 @@
 #include "libmng_display.h"
 #include "libmng_read.h"
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 /* ************************************************************************** */
 
 #ifdef MNG_INCLUDE_READ_PROCS
diff --git a/src/3rdparty/libmng/libmng_read.h b/src/3rdparty/libmng/libmng_read.h
index 280043dab..1d62e6d9e 100644
--- a/src/3rdparty/libmng/libmng_read.h
+++ b/src/3rdparty/libmng/libmng_read.h
@@ -23,10 +23,6 @@
 /* *                                                                        * */
 /* ************************************************************************** */
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 #ifndef _libmng_read_h_
 #define _libmng_read_h_
 
diff --git a/src/3rdparty/libmng/libmng_trace.c b/src/3rdparty/libmng/libmng_trace.c
index 68a8fa264..b2c14b48c 100644
--- a/src/3rdparty/libmng/libmng_trace.c
+++ b/src/3rdparty/libmng/libmng_trace.c
@@ -109,13 +109,6 @@
 #include "libmng_data.h"
 #include "libmng_error.h"
 #include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
 
 /* ************************************************************************** */
 
diff --git a/src/3rdparty/libmng/libmng_trace.h b/src/3rdparty/libmng/libmng_trace.h
index 0a5da86ce..c8070869d 100644
--- a/src/3rdparty/libmng/libmng_trace.h
+++ b/src/3rdparty/libmng/libmng_trace.h
@@ -114,10 +114,6 @@
 /* *                                                                        * */
 /* ************************************************************************** */
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 #ifndef _libmng_trace_h_
 #define _libmng_trace_h_
 
diff --git a/src/3rdparty/libmng/libmng_types.h b/src/3rdparty/libmng/libmng_types.h
index a5bd852b1..271354058 100644
--- a/src/3rdparty/libmng/libmng_types.h
+++ b/src/3rdparty/libmng/libmng_types.h
@@ -107,10 +107,6 @@
 
 /* ************************************************************************** */
 
-#ifdef __BORLANDC__
-#pragma option -AT                     /* turn off strict ANSI-C for the moment */
-#endif
-
 #ifndef WIN32
 #if defined(_WIN32) || defined(__WIN32__) || defined(_Windows) || defined(_WINDOWS)
 #define WIN32                          /* gather them into a single define */
@@ -181,13 +177,7 @@
 #include <limits.h>                    /* get proper integer widths */
 
 #ifdef WIN32
-/* B003 */
-#if defined __BORLANDC__
-#include <mem.h>                       /* defines "memcpy" for BCB */
-#else
 #include <memory.h>                    /* defines "memcpy" for other win32 platforms */
-#endif
-/* B003 */
 #ifdef MNG_CHECK_BAD_ICCP
 #include <string.h>                    /* strncmp() */
 #endif
@@ -235,10 +225,6 @@
 #define MNG_EXT
 #endif /* MNG_DLL && WIN32 */
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* now force ANSI-C from here on */
-#endif
-
 /* ************************************************************************** */
 
 #if USHRT_MAX == 0xffffffffU                     /* get the proper 32-bit width !!! */
diff --git a/src/3rdparty/libmng/libmng_write.c b/src/3rdparty/libmng/libmng_write.c
index 07a530f83..52d5a1675 100644
--- a/src/3rdparty/libmng/libmng_write.c
+++ b/src/3rdparty/libmng/libmng_write.c
@@ -35,18 +35,11 @@
 #include "libmng_data.h"
 #include "libmng_error.h"
 #include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
 #include "libmng_memory.h"
 #include "libmng_chunks.h"
 #include "libmng_chunk_io.h"
 #include "libmng_write.h"
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 /* ************************************************************************** */
 
 #ifdef MNG_INCLUDE_WRITE_PROCS
diff --git a/src/3rdparty/libmng/libmng_write.h b/src/3rdparty/libmng/libmng_write.h
index df72396c6..d3d9af4cd 100644
--- a/src/3rdparty/libmng/libmng_write.h
+++ b/src/3rdparty/libmng/libmng_write.h
@@ -23,10 +23,6 @@
 /* *                                                                        * */
 /* ************************************************************************** */
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 #ifndef _libmng_write_h_
 #define _libmng_write_h_
 
diff --git a/src/3rdparty/libmng/libmng_zlib.c b/src/3rdparty/libmng/libmng_zlib.c
index 0730b2fbe..f5eacb3aa 100644
--- a/src/3rdparty/libmng/libmng_zlib.c
+++ b/src/3rdparty/libmng/libmng_zlib.c
@@ -45,18 +45,11 @@
 #include "libmng_data.h"
 #include "libmng_error.h"
 #include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
 #include "libmng_memory.h"
 #include "libmng_pixels.h"
 #include "libmng_filter.h"
 #include "libmng_zlib.h"
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 /* ************************************************************************** */
 
 #ifdef MNG_INCLUDE_ZLIB
diff --git a/src/3rdparty/libmng/libmng_zlib.h b/src/3rdparty/libmng/libmng_zlib.h
index e5bfbdba9..7a299ae87 100644
--- a/src/3rdparty/libmng/libmng_zlib.h
+++ b/src/3rdparty/libmng/libmng_zlib.h
@@ -23,10 +23,6 @@
 /* *                                                                        * */
 /* ************************************************************************** */
 
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A                      /* force ANSI-C */
-#endif
-
 #ifndef _libmng_zlib_h_
 #define _libmng_zlib_h_
 
diff --git a/src/3rdparty/libmng/makefiles/README b/src/3rdparty/libmng/makefiles/README
index 366100293..e71b584c5 100644
--- a/src/3rdparty/libmng/makefiles/README
+++ b/src/3rdparty/libmng/makefiles/README
@@ -15,7 +15,6 @@ libmng.com) and I'll be happy to include it in the next release!
 
 Current files:
 
-makefile.bcb3 - Borland C++ Builder
 makefile.vcwin32 - Microsoft Visual C++
 makefile.unix - generic Unix
 makefile.linux - Linux ELF (builds shared library)
diff --git a/src/3rdparty/libmng/makefiles/makefile.bcb3 b/src/3rdparty/libmng/makefiles/makefile.bcb3
deleted file mode 100644
index 5c4e43477..000000000
--- a/src/3rdparty/libmng/makefiles/makefile.bcb3
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-# For conditions of distribution and use, see copyright notice in libmng.h
-#
-# makefile for libmng - THE MNG library
-# this makefile is suitable for Borland C++ Builder.
-# it works (at least) with Borland C++ Builder v3
-
-# Configuration options are now in mng_conf.h
-# this option forces dll compatibility
-MNGOPT = -DMNG_BUILD_DLL
-
-# The name of your C compiler:
-CC= bcc32
-
-# compiler options:
-CFLAGS= -WD -O2 -Hc -w-par -k -y -v -vi -c -tWD \
-	-wuse -wucp -wstv -wstu -wsig -wpin -wnod -wnak -wdef -wcln -wbbf -wasm -wamp \
-	-wamb -Tkh30000 -ff -5 -I.;..\zlib;..\jpgsrc6b;..\lcms\include $(MNGOPT)
-
-# source files
-SOURCES= libmng_hlapi.c libmng_callback_xs.c libmng_prop_xs.c libmng_chunk_xs.c \
-	libmng_read.c libmng_write.c libmng_display.c \
-	libmng_object_prc.c libmng_chunk_prc.c libmng_chunk_io.c libmng_error.c \
-    libmng_trace.c libmng_pixels.c libmng_filter.c libmng_dither.c \
-    libmng_zlib.c libmng_jpeg.c libmng_cms.c
-
-# object files
-OBJECTS= libmng_hlapi.obj libmng_callback_xs.obj libmng_prop_xs.obj libmng_chunk_xs.obj \
-	libmng_read.obj libmng_write.obj libmng_display.obj \
-	libmng_object_prc.obj libmng_chunk_prc.obj libmng_chunk_io.obj libmng_error.obj \
-    libmng_trace.obj libmng_pixels.obj libmng_filter.obj libmng_dither.obj \
-    libmng_zlib.obj libmng_jpeg.obj libmng_cms.obj
-
-# type dependancies
-.c.obj:
-	$(CC) $(CFLAGS) -c{ $<}
-
-# make options
-all: libmng.lib
-
-clean:
-	- del *.obj
-	- del libmng.lib
-
-# file dependancies
-libmng.lib: $(OBJECTS)
-	- del libmng.lib
-	tlib libmng.lib /E /C @&&|
-+libmng_hlapi.obj +libmng_callback_xs.obj +libmng_prop_xs.obj +libmng_chunk_xs.obj &
-+libmng_read.obj +libmng_write.obj +libmng_display.obj &
-+libmng_object_prc.obj +libmng_chunk_prc.obj +libmng_chunk_io.obj +libmng_error.obj &
-+libmng_trace.obj +libmng_pixels.obj +libmng_filter.obj +libmng_dither.obj &
-+libmng_zlib.obj +libmng_jpeg.obj +libmng_cms.obj
-|
-
-libmng_hlapi.obj: libmng_hlapi.c libmng.h libmng_conf.h libmng_types.h \
-	libmng_data.h libmng_objects.h libmng_object_prc.h \
-	libmng_chunks.h libmng_memory.h libmng_error.h libmng_trace.h libmng_read.h \
-        libmng_write.h libmng_display.h libmng_zlib.h libmng_cms.h libmng_zlib.h
-libmng_callback_xs.obj: libmng_callback_xs.c libmng.h libmng_conf.h libmng_types.h \
-	libmng_data.h libmng_error.h libmng_trace.h
-libmng_prop_xs.obj: libmng_prop_xs.c libmng.h libmng_conf.h libmng_types.h \
-	libmng_data.h libmng_error.h libmng_trace.h libmng_cms.h
-libmng_chunk_xs.obj: libmng_chunk_xs.c libmng.h libmng_conf.h libmng_types.h \
-	libmng_data.h libmng_chunks.h libmng_chunk_prc.h libmng_error.h libmng_trace.h
-libmng_read.obj: libmng_read.c libmng.h libmng_conf.h libmng_types.h \
-	libmng_data.h libmng_objects.h libmng_object_prc.h \
-	libmng_chunks.h libmng_chunk_prc.h libmng_chunk_io.h libmng_memory.h \
-        libmng_error.h libmng_trace.h libmng_read.h libmng_display.h
-libmng_write.obj: libmng_write.c libmng.h libmng_conf.h libmng_types.h \
-	libmng_data.h libmng_error.h libmng_trace.h libmng_write.h
-libmng_display.obj: libmng_display.c libmng.h libmng_conf.h libmng_types.h \
-	libmng_data.h libmng_objects.h libmng_object_prc.h libmng_memory.h \
-	libmng_error.h libmng_trace.h libmng_zlib.h libmng_cms.h \
-        libmng_pixels.h libmng_display.h
-libmng_object_prc.obj: libmng_object_prc.c libmng.h libmng_conf.h libmng_types.h \
-	libmng_data.h libmng_objects.h libmng_object_prc.h libmng_memory.h \
-        libmng_error.h libmng_trace.h libmng_display.h libmng_pixels.h
-libmng_chunk_prc.obj: libmng_chunk_prc.c libmng.h libmng_conf.h libmng_types.h \
-	libmng_data.h libmng_chunks.h libmng_chunk_prc.h libmng_memory.h \
-        libmng_error.h libmng_trace.h
-libmng_chunk_io.obj: libmng_chunk_io.c libmng.h libmng_conf.h libmng_types.h \
-	libmng_data.h libmng_objects.h libmng_object_prc.h libmng_chunks.h \
-        libmng_chunk_io.h libmng_chunk_prc libmng_memory.h libmng_error.h \
-        libmng_trace.h libmng_display.h libmng_zlib.h libmng_pixels.h
-libmng_error.obj: libmng_error.c libmng.h libmng_conf.h libmng_types.h \
-	libmng_data.h libmng_error.h libmng_trace.h
-libmng_trace.obj: libmng_trace.c libmng.h libmng_conf.h libmng_types.h \
-	libmng_data.h libmng_error.h libmng_trace.h
-libmng_pixels.obj: libmng_pixels.c libmng.h libmng_conf.h libmng_types.h \
-	libmng_data.h libmng_objects.h libmng_memory.h libmng_error.h libmng_trace.h \
-        libmng_cms.h libmng_filter.h libmng_pixels.h
-libmng_filter.obj: libmng_filter.c libmng.h libmng_conf.h libmng_types.h \
-	libmng_data.h libmng_error.h libmng_trace.h libmng_filter.h
-libmng_dither.obj: libmng_dither.c libmng.h libmng_conf.h libmng_types.h \
-	libmng_data.h libmng_error.h libmng_trace.h libmng_dither.h
-libmng_zlib.obj: libmng_zlib.c libmng.h libmng_conf.h libmng_types.h \
-	libmng_data.h libmng_memory.h libmng_error.h libmng_trace.h libmng_pixels.h \
-        libmng_filter.h libmng_zlib.h
-libmng_jpeg.obj: libmng_jpeg.c libmng.h libmng_conf.h libmng_types.h \
-	libmng_data.h libmng_memory.h libmng_error.h libmng_trace.h \
-        libmng_pixels.h libmng_jpeg.h
-libmng_cms.obj: libmng_cms.c libmng.h libmng_conf.h libmng_types.h \
-	libmng_data.h libmng_objects.h libmng_error.h libmng_trace.h libmng_cms.h
-
diff --git a/src/3rdparty/libpng/INSTALL b/src/3rdparty/libpng/INSTALL
index 1d6dfc5f0..7a7a0a11d 100644
--- a/src/3rdparty/libpng/INSTALL
+++ b/src/3rdparty/libpng/INSTALL
@@ -29,7 +29,6 @@ Your directory structure should look like this:
              visupng
           projects
              beos
-             borland
              msvc
              netware.txt
              wince.txt
@@ -101,10 +100,6 @@ include
                        (Requires SCOPTIONS, copied from scripts/SCOPTIONS.ppc)
  makefile.atari    =>  Atari makefile
  makefile.beos     =>  BEOS makefile for X86
- makefile.bor      =>  Borland makefile (uses bcc)
- makefile.bc32     =>  32-bit Borland C++ (all modules compiled in C mode)
- makefile.bd32     =>  To make a png32bd.dll with Borland C++ 4.5
- makefile.tc3      =>  Turbo C 3.0 makefile
  makefile.dj2      =>  DJGPP 2 makefile
  makefile.msc      =>  Microsoft C makefile
  makefile.vcawin32 =>  makefile for Microsoft Visual C++ 5.0 and later (uses
@@ -116,7 +111,6 @@ include
  makefile.watcom   =>  Watcom 10a+ Makefile, 32-bit flat memory model
  makevms.com       =>  VMS build script
  descrip.mms       =>  VMS makefile for MMS or MMK
- pngdef.pas        =>  Defines for a png32bd.dll with Borland C++ 4.5
  SCOPTIONS.ppc     =>  Used with smakefile.ppc
 
 Copy the file (or files) that you need from the
diff --git a/src/3rdparty/libpng/README b/src/3rdparty/libpng/README
index 199190848..a939432ae 100644
--- a/src/3rdparty/libpng/README
+++ b/src/3rdparty/libpng/README
@@ -173,8 +173,6 @@ Files in this distribution:
        visupng      =>  Contains a MSVC workspace for VisualPng
       projects      =>  Contains project files and workspaces for building DLL
        beos             =>  Contains a Beos workspace for building libpng
-       borland          =>  Contains a Borland workspace for building libpng
-                            and zlib
        msvc             =>  Contains a Microsoft Visual C++ (MSVC) workspace
                             for building libpng and zlib
        netware.txt      =>  Contains instructions for downloading a set of
@@ -227,10 +225,6 @@ Files in this distribution:
                             scripts/SCOPTIONS.ppc)
        makefile.atari   =>  Atari makefile
        makefile.beos    =>  BEOS makefile for X86
-       makefile.bor     =>  Borland makefile (uses bcc)
-       makefile.bc32    =>  32-bit Borland C++ (all modules compiled in C mode)
-       makefile.bd32    =>  To make a png32bd.dll with Borland C++ 4.5
-       makefile.tc3     =>  Turbo C 3.0 makefile
        makefile.dj2     =>  DJGPP 2 makefile
        makefile.msc     =>  Microsoft C makefile
        makefile.vcawin32 => makefile for Microsoft Visual C++ 5.0 and
@@ -242,7 +236,6 @@ Files in this distribution:
        pngos2.def       =>  OS/2 module definition file used by makefile.os2
        makefile.watcom  =>  Watcom 10a+ Makefile, 32-bit flat memory model
        makevms.com      =>  VMS build script
-       pngdef.pas       =>  Defines for a png32bd.dll with Borland C++ 4.5
        SCOPTIONS.ppc    =>  Used with smakefile.ppc
       mangle        =>  Directory containing scripts to build libpng12m.so:
        mangle.in        =>  Function-decoration macros added to png.h by the
diff --git a/src/3rdparty/libpng/png.h b/src/3rdparty/libpng/png.h
index 55f9b650d..52811591c 100644
--- a/src/3rdparty/libpng/png.h
+++ b/src/3rdparty/libpng/png.h
@@ -1174,15 +1174,6 @@ struct png_struct_def
 
 #endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
 
-#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
-/* for the Borland special 64K segment handler */
-   png_bytepp offset_table_ptr;
-   png_bytep offset_table;
-   png_uint_16 offset_table_number;
-   png_uint_16 offset_table_count;
-   png_uint_16 offset_table_count_free;
-#endif
-
 #if defined(PNG_READ_DITHER_SUPPORTED)
    png_bytep palette_lookup;         /* lookup table for dithering */
    png_bytep dither_index;           /* index translation for palette files */
diff --git a/src/3rdparty/libpng/pngconf.h b/src/3rdparty/libpng/pngconf.h
index 19ccaf1e0..6c07bceab 100644
--- a/src/3rdparty/libpng/pngconf.h
+++ b/src/3rdparty/libpng/pngconf.h
@@ -299,14 +299,6 @@
 #  define PNG_ALWAYS_EXTERN
 #endif
 
-/* For some reason, Borland C++ defines memcmp, etc. in mem.h, not
- * stdlib.h like it should (I think).  Or perhaps this is a C++
- * "feature"?
- */
-#ifdef __TURBOC__
-#  include <mem.h>
-#endif
-
 #if defined(_MSC_VER) && (defined(WIN32) || defined(_Windows) || \
     defined(_WINDOWS) || defined(_WIN32) || defined(__WIN32__))
 #  include <malloc.h>
@@ -982,41 +974,6 @@ typedef unsigned char png_byte;
    change (I'm not sure if you will or not, so I thought I'd be safe) */
 typedef size_t png_size_t;
 
-/* The following is needed for medium model support.  It cannot be in the
- * PNG_INTERNAL section.  Needs modification for other compilers besides
- * MSC.  Model independent support declares all arrays and pointers to be
- * large using the far keyword.  The zlib version used must also support
- * model independent data.  As of version zlib 1.0.4, the necessary changes
- * have been made in zlib.  The USE_FAR_KEYWORD define triggers other
- * changes that are needed. (Tim Wegner)
- */
-
-/* Separate compiler dependencies (problem here is that zlib.h always
-   defines FAR. (SJT) */
-#ifdef __BORLANDC__
-#  if defined(__LARGE__) || defined(__HUGE__) || defined(__COMPACT__)
-#    define LDATA 1
-#  else
-#    define LDATA 0
-#  endif
-   /* GRR:  why is Cygwin in here?  Cygwin is not Borland C... */
-#  if !defined(__WIN32__) && !defined(__FLAT__) && !defined(__CYGWIN__)
-#    define PNG_MAX_MALLOC_64K
-#    if (LDATA != 1)
-#      ifndef FAR
-#        define FAR __far
-#      endif
-#      define USE_FAR_KEYWORD
-#    endif   /* LDATA != 1 */
-     /* Possibly useful for moving data out of default segment.
-      * Uncomment it if you want. Could also define FARDATA as
-      * const if your compiler supports it. (SJT)
-#    define FARDATA FAR
-      */
-#  endif  /* __WIN32__, __FLAT__, __CYGWIN__ */
-#endif   /* __BORLANDC__ */
-
-
 /* Suggest testing for specific compiler first before testing for
  * FAR.  The Watcom compiler defines both __MEDIUM__ and M_I86MM,
  * making reliance oncertain keywords suspect. (SJT)
@@ -1195,9 +1152,9 @@ typedef z_stream FAR *  png_zstreamp;
 #     define PNG_EXPORT_TYPE1(type,symbol)  PNG_IMPEXP type PNGAPI symbol
 #     define PNG_EXPORT_TYPE2(type,symbol)  type PNG_IMPEXP PNGAPI symbol
 
-      /* Borland/Microsoft */
-#     if defined(_MSC_VER) || defined(__BORLANDC__)
-#        if (_MSC_VER >= 800) || (__BORLANDC__ >= 0x500)
+      /* Microsoft */
+#     if defined(_MSC_VER)
+#        if (_MSC_VER >= 800)
 #           define PNG_EXPORT PNG_EXPORT_TYPE1
 #        else
 #           define PNG_EXPORT PNG_EXPORT_TYPE2
@@ -1206,8 +1163,7 @@ typedef z_stream FAR *  png_zstreamp;
 #           else
 #              define PNG_IMPEXP /*__import */ /* doesn't exist AFAIK in
                                                  VC++ */
-#           endif                             /* Exists in Borland C++ for
-                                                 C++ classes (== huge) */
+#           endif
 #        endif
 #     endif
 
diff --git a/src/3rdparty/libpng/pngmem.c b/src/3rdparty/libpng/pngmem.c
index 66eec0b09..7348c3b09 100644
--- a/src/3rdparty/libpng/pngmem.c
+++ b/src/3rdparty/libpng/pngmem.c
@@ -17,293 +17,6 @@
 #define PNG_INTERNAL
 #include "png.h"
 
-/* Borland DOS special memory handler */
-#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
-/* if you change this, be sure to change the one in png.h also */
-
-/* Allocate memory for a png_struct.  The malloc and memset can be replaced
-   by a single call to calloc() if this is thought to improve performance. */
-png_voidp /* PRIVATE */
-png_create_struct(int type)
-{
-#ifdef PNG_USER_MEM_SUPPORTED
-   return (png_create_struct_2(type, png_malloc_ptr_NULL, png_voidp_NULL));
-}
-
-/* Alternate version of png_create_struct, for use with user-defined malloc. */
-png_voidp /* PRIVATE */
-png_create_struct_2(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr)
-{
-#endif /* PNG_USER_MEM_SUPPORTED */
-   png_size_t size;
-   png_voidp struct_ptr;
-
-   if (type == PNG_STRUCT_INFO)
-     size = sizeof(png_info);
-   else if (type == PNG_STRUCT_PNG)
-     size = sizeof(png_struct);
-   else
-     return (png_get_copyright());
-
-#ifdef PNG_USER_MEM_SUPPORTED
-   if(malloc_fn != NULL)
-   {
-      png_struct dummy_struct;
-      png_structp png_ptr = &dummy_struct;
-      png_ptr->mem_ptr=mem_ptr;
-      struct_ptr = (*(malloc_fn))(png_ptr, (png_uint_32)size);
-   }
-   else
-#endif /* PNG_USER_MEM_SUPPORTED */
-      struct_ptr = (png_voidp)farmalloc(size));
-   if (struct_ptr != NULL)
-      png_memset(struct_ptr, 0, size);
-   return (struct_ptr);
-}
-
-/* Free memory allocated by a png_create_struct() call */
-void /* PRIVATE */
-png_destroy_struct(png_voidp struct_ptr)
-{
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_destroy_struct_2(struct_ptr, png_free_ptr_NULL, png_voidp_NULL);
-}
-
-/* Free memory allocated by a png_create_struct() call */
-void /* PRIVATE */
-png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,
-    png_voidp mem_ptr)
-{
-#endif
-   if (struct_ptr != NULL)
-   {
-#ifdef PNG_USER_MEM_SUPPORTED
-      if(free_fn != NULL)
-      {
-         png_struct dummy_struct;
-         png_structp png_ptr = &dummy_struct;
-         png_ptr->mem_ptr=mem_ptr;
-         (*(free_fn))(png_ptr, struct_ptr);
-         return;
-      }
-#endif /* PNG_USER_MEM_SUPPORTED */
-      farfree (struct_ptr);
-   }
-}
-
-/* Allocate memory.  For reasonable files, size should never exceed
- * 64K.  However, zlib may allocate more then 64K if you don't tell
- * it not to.  See zconf.h and png.h for more information. zlib does
- * need to allocate exactly 64K, so whatever you call here must
- * have the ability to do that.
- *
- * Borland seems to have a problem in DOS mode for exactly 64K.
- * It gives you a segment with an offset of 8 (perhaps to store its
- * memory stuff).  zlib doesn't like this at all, so we have to
- * detect and deal with it.  This code should not be needed in
- * Windows or OS/2 modes, and only in 16 bit mode.  This code has
- * been updated by Alexander Lehmann for version 0.89 to waste less
- * memory.
- *
- * Note that we can't use png_size_t for the "size" declaration,
- * since on some systems a png_size_t is a 16-bit quantity, and as a
- * result, we would be truncating potentially larger memory requests
- * (which should cause a fatal error) and introducing major problems.
- */
-
-png_voidp PNGAPI
-png_malloc(png_structp png_ptr, png_uint_32 size)
-{
-   png_voidp ret;
-
-   if (png_ptr == NULL || size == 0)
-      return (NULL);
-
-#ifdef PNG_USER_MEM_SUPPORTED
-   if(png_ptr->malloc_fn != NULL)
-   {
-       ret = ((png_voidp)(*(png_ptr->malloc_fn))(png_ptr, (png_size_t)size));
-       if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-          png_error(png_ptr, "Out of memory!");
-       return (ret);
-   }
-   else
-       return png_malloc_default(png_ptr, size);
-}
-
-png_voidp PNGAPI
-png_malloc_default(png_structp png_ptr, png_uint_32 size)
-{
-   png_voidp ret;
-#endif /* PNG_USER_MEM_SUPPORTED */
-
-#ifdef PNG_MAX_MALLOC_64K
-   if (size > (png_uint_32)65536L)
-      png_error(png_ptr, "Cannot Allocate > 64K");
-#endif
-
-   if (size == (png_uint_32)65536L)
-   {
-      if (png_ptr->offset_table == NULL)
-      {
-         /* try to see if we need to do any of this fancy stuff */
-         ret = farmalloc(size);
-         if (ret == NULL || ((png_size_t)ret & 0xffff))
-         {
-            int num_blocks;
-            png_uint_32 total_size;
-            png_bytep table;
-            int i;
-            png_byte huge * hptr;
-
-            if (ret != NULL)
-            {
-               farfree(ret);
-               ret = NULL;
-            }
-
-            if(png_ptr->zlib_window_bits > 14)
-               num_blocks = (int)(1 << (png_ptr->zlib_window_bits - 14));
-            else
-               num_blocks = 1;
-            if (png_ptr->zlib_mem_level >= 7)
-               num_blocks += (int)(1 << (png_ptr->zlib_mem_level - 7));
-            else
-               num_blocks++;
-
-            total_size = ((png_uint_32)65536L) * (png_uint_32)num_blocks+16;
-
-            table = farmalloc(total_size);
-
-            if (table == NULL)
-            {
-               if (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-                  png_error(png_ptr, "Out Of Memory."); /* Note "O" and "M" */
-               else
-                  png_warning(png_ptr, "Out Of Memory.");
-               return (NULL);
-            }
-
-            if ((png_size_t)table & 0xfff0)
-            {
-               if (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-                  png_error(png_ptr,
-                    "Farmalloc didn't return normalized pointer");
-               else
-                  png_warning(png_ptr,
-                    "Farmalloc didn't return normalized pointer");
-               return (NULL);
-            }
-
-            png_ptr->offset_table = table;
-            png_ptr->offset_table_ptr = farmalloc(num_blocks *
-               sizeof (png_bytep));
-
-            if (png_ptr->offset_table_ptr == NULL)
-            {
-               if (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-                  png_error(png_ptr, "Out Of memory."); /* Note "O" and "M" */
-               else
-                  png_warning(png_ptr, "Out Of memory.");
-               return (NULL);
-            }
-
-            hptr = (png_byte huge *)table;
-            if ((png_size_t)hptr & 0xf)
-            {
-               hptr = (png_byte huge *)((long)(hptr) & 0xfffffff0L);
-               hptr = hptr + 16L;  /* "hptr += 16L" fails on Turbo C++ 3.0 */
-            }
-            for (i = 0; i < num_blocks; i++)
-            {
-               png_ptr->offset_table_ptr[i] = (png_bytep)hptr;
-               hptr = hptr + (png_uint_32)65536L;  /* "+=" fails on TC++3.0 */
-            }
-
-            png_ptr->offset_table_number = num_blocks;
-            png_ptr->offset_table_count = 0;
-            png_ptr->offset_table_count_free = 0;
-         }
-      }
-
-      if (png_ptr->offset_table_count >= png_ptr->offset_table_number)
-      {
-         if (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-            png_error(png_ptr, "Out of Memory."); /* Note "o" and "M" */
-         else
-            png_warning(png_ptr, "Out of Memory.");
-         return (NULL);
-      }
-
-      ret = png_ptr->offset_table_ptr[png_ptr->offset_table_count++];
-   }
-   else
-      ret = farmalloc(size);
-
-   if (ret == NULL)
-   {
-      if (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-         png_error(png_ptr, "Out of memory."); /* Note "o" and "m" */
-      else
-         png_warning(png_ptr, "Out of memory."); /* Note "o" and "m" */
-   }
-
-   return (ret);
-}
-
-/* free a pointer allocated by png_malloc().  In the default
-   configuration, png_ptr is not used, but is passed in case it
-   is needed.  If ptr is NULL, return without taking any action. */
-void PNGAPI
-png_free(png_structp png_ptr, png_voidp ptr)
-{
-   if (png_ptr == NULL || ptr == NULL)
-      return;
-
-#ifdef PNG_USER_MEM_SUPPORTED
-   if (png_ptr->free_fn != NULL)
-   {
-      (*(png_ptr->free_fn))(png_ptr, ptr);
-      return;
-   }
-   else png_free_default(png_ptr, ptr);
-}
-
-void PNGAPI
-png_free_default(png_structp png_ptr, png_voidp ptr)
-{
-#endif /* PNG_USER_MEM_SUPPORTED */
-
-   if (png_ptr->offset_table != NULL)
-   {
-      int i;
-
-      for (i = 0; i < png_ptr->offset_table_count; i++)
-      {
-         if (ptr == png_ptr->offset_table_ptr[i])
-         {
-            ptr = NULL;
-            png_ptr->offset_table_count_free++;
-            break;
-         }
-      }
-      if (png_ptr->offset_table_count_free == png_ptr->offset_table_count)
-      {
-         farfree(png_ptr->offset_table);
-         farfree(png_ptr->offset_table_ptr);
-         png_ptr->offset_table = NULL;
-         png_ptr->offset_table_ptr = NULL;
-      }
-   }
-
-   if (ptr != NULL)
-   {
-      farfree(ptr);
-   }
-}
-
-#else /* Not the Borland DOS special memory handler */
-
 /* Allocate memory for a png_struct or a png_info.  The malloc and
    memset can be replaced by a single call to calloc() if this is thought
    to improve performance noticably. */
@@ -344,14 +57,10 @@ png_create_struct_2(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr)
    }
 #endif /* PNG_USER_MEM_SUPPORTED */
 
-#if defined(__TURBOC__) && !defined(__FLAT__)
-   if ((struct_ptr = (png_voidp)farmalloc(size)) != NULL)
-#else
-# if defined(_MSC_VER) && defined(MAXSEG_64K)
+#if defined(_MSC_VER) && defined(MAXSEG_64K)
    if ((struct_ptr = (png_voidp)halloc(size,1)) != NULL)
-# else
+#else
    if ((struct_ptr = (png_voidp)malloc(size)) != NULL)
-# endif
 #endif
    {
       png_memset(struct_ptr, 0, size);
@@ -387,14 +96,10 @@ png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,
          return;
       }
 #endif /* PNG_USER_MEM_SUPPORTED */
-#if defined(__TURBOC__) && !defined(__FLAT__)
-      farfree(struct_ptr);
-#else
-# if defined(_MSC_VER) && defined(MAXSEG_64K)
+#if defined(_MSC_VER) && defined(MAXSEG_64K)
       hfree(struct_ptr);
-# else
+#else
       free(struct_ptr);
-# endif
 #endif
    }
 }
@@ -441,14 +146,10 @@ png_malloc_default(png_structp png_ptr, png_uint_32 size)
    }
 #endif
 
-#if defined(__TURBOC__) && !defined(__FLAT__)
-   ret = farmalloc(size);
-#else
-# if defined(_MSC_VER) && defined(MAXSEG_64K)
+#if defined(_MSC_VER) && defined(MAXSEG_64K)
    ret = halloc(size, 1);
-# else
+#else
    ret = malloc((size_t)size);
-# endif
 #endif
 
    if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
@@ -481,19 +182,13 @@ png_free_default(png_structp png_ptr, png_voidp ptr)
 
 #endif /* PNG_USER_MEM_SUPPORTED */
 
-#if defined(__TURBOC__) && !defined(__FLAT__)
-   farfree(ptr);
-#else
-# if defined(_MSC_VER) && defined(MAXSEG_64K)
+#if defined(_MSC_VER) && defined(MAXSEG_64K)
    hfree(ptr);
-# else
+#else
    free(ptr);
-# endif
 #endif
 }
 
-#endif /* Not Borland DOS special memory handler */
-
 #if defined(PNG_1_0_X)
 #  define png_malloc_warn png_malloc
 #else
diff --git a/src/3rdparty/libpng/pngtest.c b/src/3rdparty/libpng/pngtest.c
index cc8209e3d..ccd7094d0 100644
--- a/src/3rdparty/libpng/pngtest.c
+++ b/src/3rdparty/libpng/pngtest.c
@@ -103,10 +103,6 @@ static int verbose = 0;
 
 int test_one_file PNGARG((PNG_CONST char *inname, PNG_CONST char *outname));
 
-#ifdef __TURBOC__
-#include <mem.h>
-#endif
-
 /* defined so I can write to a file on gui/windowing platforms */
 /*  #define STDERR stderr  */
 #define STDERR stdout   /* for DOS */
diff --git a/src/3rdparty/libpng/projects/borland/libpng.bpf b/src/3rdparty/libpng/projects/borland/libpng.bpf
deleted file mode 100644
index e796e3c6f..000000000
--- a/src/3rdparty/libpng/projects/borland/libpng.bpf
+++ /dev/null
@@ -1,22 +0,0 @@
-USEUNIT("libpng.cpp");
-USEUNIT("..\..\pngwutil.c");
-USEUNIT("..\..\pngerror.c");
-USEUNIT("..\..\pngget.c");
-USEUNIT("..\..\pngmem.c");
-USEUNIT("..\..\pngpread.c");
-USEUNIT("..\..\pngread.c");
-USEUNIT("..\..\pngrio.c");
-USEUNIT("..\..\pngrtran.c");
-USEUNIT("..\..\pngrutil.c");
-USEUNIT("..\..\pngset.c");
-USEUNIT("..\..\pngtrans.c");
-USEUNIT("..\..\pngwio.c");
-USEUNIT("..\..\pngwrite.c");
-USEUNIT("..\..\pngwtran.c");
-USEUNIT("..\..\png.c");
-USELIB("zlib.lib");
-//---------------------------------------------------------------------------
-This file is used by the project manager only and should be treated like the project file
-
-
-DllEntryPoint
\ No newline at end of file
diff --git a/src/3rdparty/libpng/projects/borland/libpng.bpg b/src/3rdparty/libpng/projects/borland/libpng.bpg
deleted file mode 100644
index 80c197719..000000000
--- a/src/3rdparty/libpng/projects/borland/libpng.bpg
+++ /dev/null
@@ -1,25 +0,0 @@
-#------------------------------------------------------------------------------
-VERSION = BWS.01
-#------------------------------------------------------------------------------
-!ifndef ROOT
-ROOT = $(MAKEDIR)\..
-!endif
-#------------------------------------------------------------------------------
-MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
-DCC = $(ROOT)\bin\dcc32.exe $**
-BRCC = $(ROOT)\bin\brcc32.exe $**
-#------------------------------------------------------------------------------
-PROJECTS = libpngstat.lib libpng.dll
-#------------------------------------------------------------------------------
-default: $(PROJECTS)
-#------------------------------------------------------------------------------
-
-libpngstat.lib: libpngstat.bpr
-  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
-  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-libpng.dll: libpng.bpr
-  $(ROOT)\bin\bpr2mak $**
-  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-
diff --git a/src/3rdparty/libpng/projects/borland/libpng.bpr b/src/3rdparty/libpng/projects/borland/libpng.bpr
deleted file mode 100644
index f5f062b12..000000000
--- a/src/3rdparty/libpng/projects/borland/libpng.bpr
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
-  <MACROS>
-    <VERSION value="BCB.05.03"/>
-    <PROJECT value="libpng.dll"/>
-    <OBJFILES value="libpng.obj ..\..\pngwutil.obj ..\..\pngerror.obj ..\..\pngget.obj 
-      ..\..\pngmem.obj ..\..\pngpread.obj ..\..\pngread.obj ..\..\pngrio.obj 
-      ..\..\pngrtran.obj ..\..\pngrutil.obj ..\..\pngset.obj ..\..\pngtrans.obj 
-      ..\..\pngwio.obj ..\..\pngwrite.obj ..\..\pngwtran.obj ..\..\png.obj"/>
-    <RESFILES value=""/>
-    <DEFFILE value=""/>
-    <RESDEPEN value="$(RESFILES)"/>
-    <LIBFILES value="zlib.lib"/>
-    <LIBRARIES value="bcbsmp50.lib dclocx50.lib NMFast50.lib Tee50.lib Vclx50.lib Vcl50.lib"/>
-    <SPARELIBS value="Vcl50.lib Vclx50.lib Tee50.lib NMFast50.lib dclocx50.lib bcbsmp50.lib"/>
-    <PACKAGES value="Vcl50.bpi Vclx50.bpi bcbsmp50.bpi Qrpt50.bpi Vcldb50.bpi Vclbde50.bpi 
-      ibsmp50.bpi vcldbx50.bpi TeeUI50.bpi TeeDB50.bpi Tee50.bpi TeeQR50.bpi 
-      VCLIB50.bpi bcbie50.bpi vclie50.bpi Inetdb50.bpi Inet50.bpi NMFast50.bpi 
-      dclocx50.bpi bcb97axserver50.bpi SIMULUSCOMPONENTS.bpi Simulus2.bpi"/>
-    <PATHCPP value=".;..\.."/>
-    <PATHPAS value=".;"/>
-    <PATHRC value=".;"/>
-    <PATHASM value=".;"/>
-    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
-    <RELEASELIBPATH value="$(BCB)\lib\release"/>
-    <LINKER value="tlink32"/>
-    <USERDEFINES value="ZLIB_DLL;Z_PREFIX;PNG_BUILD_DLL;PNG_NO_MODULEDEF"/>
-    <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL"/>
-    <MAINSOURCE value="libpng.bpf"/>
-    <INCLUDEPATH value="..\..;..\..\..\zlib;$(BCB)\include"/>
-    <LIBPATH value="..\..;$(BCB)\lib\obj;$(BCB)\lib"/>
-    <WARNINGS value="-w8092 -w8091 -w8090 -w8089 -w8087 -wprc -wucp -wstv -wstu -wsig -wpin 
-      -wnod -wnak -wdef -wcln -wbbf -wasm -wamp -wamb"/>
-  </MACROS>
-  <OPTIONS>
-    <CFLAG1 value="-WD -O2 -w -Vx -Ve -x- -RT- -X- -a8 -5 -b- -d -k- -vi -tWD -tWM -c"/>
-    <PFLAGS value="-$Y- -$L- -$D- -$C- -v -JPHNE -M"/>
-    <RFLAGS value=""/>
-    <AFLAGS value="/mx /w2 /zn"/>
-    <LFLAGS value="-D&quot;&quot; -aa -Tpd -x -Gn -Gi -w"/>
-  </OPTIONS>
-  <LINKER>
-    <ALLOBJ value="c0d32.obj $(OBJFILES)"/>
-    <ALLRES value="$(RESFILES)"/>
-    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mti.lib"/>
-  </LINKER>
-  <IDEOPTIONS>
-[Version Info]
-IncludeVerInfo=0
-AutoIncBuild=0
-MajorVer=1
-MinorVer=0
-Release=0
-Build=0
-Debug=0
-PreRelease=0
-Special=0
-Private=0
-DLL=1
-Locale=2057
-CodePage=1252
-
-[Version Info Keys]
-CompanyName=
-FileDescription=
-FileVersion=1.0.0.0
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=
-ProductName=
-ProductVersion=
-Comments=
-
-[HistoryLists\hlIncludePath]
-Count=18
-Item0=..\..;..\..\..\zlib;$(BCB)\include
-Item1=..\..;P:\My Documents\Source\PNG+ZLib\zlib;$(BCB)\include
-Item2=..\..;..\Source\ThirdParty\PortableNetworkGraphics\external;..\Source\ThirdParty\PortableNetworkGraphics;..\Source\ThirdParty\ZLibCompression\external;$(BCB)\include
-Item3=..\Source\ThirdParty\PortableNetworkGraphics\external;..\Source\ThirdParty\PortableNetworkGraphics;..\Source\ThirdParty\ZLibCompression\external;$(BCB)\include
-Item4=..\Source\ThirdParty\PortableNetworkGraphics\external;..\Source\ThirdParty\PortableNetworkGraphics;..\Source\ThirdParty\ZLibCompression;$(BCB)\include
-Item5=..\Source\ThirdParty\PortableNetworkGraphics;..\Source\ThirdParty\ZLibCompression;$(BCB)\include
-Item6=..\Source\ThirdParty\PortableNetworkGraphics;P:\Development\Source\ThirdParty\ZLibCompression;$(BCB)\include
-Item7=..\Source\ThirdParty\PortableNetworkGraphics;$(BCB)\include
-Item8=$(BCB)\include
-Item9=..\Source;..\Source\General\Templates;..\Source\SIMUtilities;$(BCB)\include;$(BCB)\include\vcl
-Item10=P:\Development\Source\;P:\Development\Source\General\Templates\;P:\Development\Source\SIMUtilities\;$(BCB)\include;$(BCB)\include\vcl
-Item11=P:\Development\Source;P:\Development\Source\General\Templates\;P:\Development\Source\SIMUtilities\;$(BCB)\include;$(BCB)\include\vcl
-Item12=P:\Development\Source\General\Templates\;P:\Development\Source\SIMUtilities\;$(BCB)\include;$(BCB)\include\vcl
-Item13=P:\Development\Source\General\Templates\;P:\Development\Source\SIMUtilities;$(BCB)\include;$(BCB)\include\vcl
-Item14=P:\Development\Source\General\Templates\;$(BCB)\include;$(BCB)\include\vcl
-Item15=P:\Development\Source\General\Templates;$(BCB)\include;$(BCB)\include\vcl
-Item16=P:\Development\Source;$(BCB)\include;$(BCB)\include\vcl
-Item17=$(BCB)\include;$(BCB)\include\vcl
-
-[HistoryLists\hlLibraryPath]
-Count=10
-Item0=..\..;$(BCB)\lib\obj;$(BCB)\lib
-Item1=..\..;..\Source\ThirdParty\PortableNetworkGraphics\external;..\Source\ThirdParty\PortableNetworkGraphics;$(BCB)\lib\obj;$(BCB)\lib
-Item2=..\Source\ThirdParty\PortableNetworkGraphics\external;..\Source\ThirdParty\PortableNetworkGraphics;$(BCB)\lib\obj;$(BCB)\lib
-Item3=..\Source\ThirdParty\PortableNetworkGraphics;$(BCB)\lib\obj;$(BCB)\lib
-Item4=$(BCB)\lib\obj;$(BCB)\lib
-Item5=..\Source\SIMUtilities;..\Source;$(BCB)\lib\obj;$(BCB)\lib
-Item6=P:\Development\Source\SIMUtilities\;P:\Development\Source\;$(BCB)\lib\obj;$(BCB)\lib
-Item7=P:\Development\Source\SIMUtilities;P:\Development\Source\;$(BCB)\lib\obj;$(BCB)\lib
-Item8=P:\Development\Source\;$(BCB)\lib\obj;$(BCB)\lib
-Item9=P:\Development\Source;$(BCB)\lib\obj;$(BCB)\lib
-
-[HistoryLists\hlDebugSourcePath]
-Count=1
-Item0=$(BCB)\source\vcl
-
-[HistoryLists\hlConditionals]
-Count=20
-Item0=ZLIB_DLL;Z_PREFIX;PNG_BUILD_DLL;PNG_NO_MODULEDEF
-Item1=_DEBUG;ZLIB_DLL;Z_PREFIX;PNG_BUILD_DLL;PNG_NO_MODULEDEF
-Item2=PNG_BUILD_DLL;ZLIB_DLL;_DEBUG;PNG_NO_MODULEDEF
-Item3=PNG_BUILD_DLL;ZLIB_DLL;_DEBUG;PNG_DEBUG=5;PNG_NO_MODULEDEF;PNG_NO_GLOBAL_ARRAYS
-Item4=PNG_BUILD_DLL;ZLIB_DLL;_DEBUG;PNG_DEBUG=5;PNG_NO_MODULEDEF;PNG_SETJMP_NOT_SUPPORTED;PNG_DEBUG_FILE=stderr
-Item5=PNG_BUILD_DLL;ZLIB_DLL;_DEBUG;PNG_DEBUG;PNG_NO_MODULEDEF;PNG_SETJMP_NOT_SUPPORTED
-Item6=PNG_BUILD_DLL;ZLIB_DLL;_DEBUG;PNG_DEBUG=5;PNG_NO_MODULEDEF;PNG_SETJMP_NOT_SUPPORTED
-Item7=PNG_BUILD_DLL;ZLIB_DLL;_DEBUG;PNG_DEBUG=5;PNG_NO_MODULEDEF
-Item8=PNG_BUILD_DLL;ZLIB_DLL;_DEBUG;PNG_DEBUG=5
-Item9=PNG_BUILD_DLL;ZLIB_DLL;_DEBUG
-Item10=PNG_BUILD_DLL;ZLIB_DLL
-Item11=PNG_BUILD_DLL
-Item12=PNG_DLL;PNG_BUILD_DLL;ZLIB_DLL
-Item13=PNG_DLL;PNG_BUILD_DLL;PNG_NO_GLOBAL_ARRAYS;ZLIB_DLL
-Item14=PNG_DLL;PNG_BUILD_DLL;PNG_NO_GLOBAL_ARRAYS
-Item15=PNG_DLL;PNG_BUILD_DLL
-Item16=PNG_DLL;PNG_BUILD_DLL;PNG_MODULEDEF
-Item17=_HTML_FORM
-Item18=_DEBUG;_HTML_FORM
-Item19=_DEBUG
-
-[HistoryLists\hlIntOutputDir]
-Count=2
-Item0=..\Obj
-Item1=P:\Development\Obj
-
-[Debugging]
-DebugSourceDirs=
-
-[Parameters]
-RunParams=
-HostApplication=P:\Development\Executables\LibPNGTestApp.exe
-RemoteHost=
-RemotePath=
-RemoteDebug=0
-
-[Compiler]
-ShowInfoMsgs=0
-LinkDebugVcl=0
-LinkCGLIB=0
-  </IDEOPTIONS>
-</PROJECT>
\ No newline at end of file
diff --git a/src/3rdparty/libpng/projects/borland/libpng.cpp b/src/3rdparty/libpng/projects/borland/libpng.cpp
deleted file mode 100644
index 2708ad421..000000000
--- a/src/3rdparty/libpng/projects/borland/libpng.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-//---------------------------------------------------------------------------
-#include <windows.h>
-//---------------------------------------------------------------------------
-//   Important note about DLL memory management when your DLL uses the
-//   static version of the RunTime Library:
-//
-//   If your DLL exports any functions that pass String objects (or structs/
-//   classes containing nested Strings) as parameter or function results,
-//   you will need to add the library MEMMGR.LIB to both the DLL project and
-//   any other projects that use the DLL.  You will also need to use MEMMGR.LIB
-//   if any other projects which use the DLL will be performing new or delete
-//   operations on any non-TObject-derived classes which are exported from the
-//   DLL. Adding MEMMGR.LIB to your project will change the DLL and its calling
-//   EXE's to use the BORLNDMM.DLL as their memory manager.  In these cases,
-//   the file BORLNDMM.DLL should be deployed along with your DLL.
-//
-//   To avoid using BORLNDMM.DLL, pass string information using "char *" or
-//   ShortString parameters.
-//
-//   If your DLL uses the dynamic version of the RTL, you do not need to
-//   explicitly add MEMMGR.LIB as this will be done implicitly for you
-//---------------------------------------------------------------------------
-
-int WINAPI DllEntryPoint(HINSTANCE, unsigned long, void*)
-{
-    return 1;
-}
-//---------------------------------------------------------------------------
diff --git a/src/3rdparty/libpng/projects/borland/libpng.readme.txt b/src/3rdparty/libpng/projects/borland/libpng.readme.txt
deleted file mode 100644
index efe7cbdc6..000000000
--- a/src/3rdparty/libpng/projects/borland/libpng.readme.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Project files to build libpng using Borland C++ Builder v5.0
-
-To use this dll, you will need to:
-
-1) add the following conditional defines to your project
-
-PNG_USE_DLL
-Z_PREFIX
-
-2) add the paths to png.h and zlib.h to your include path
-
-3) add libpng.lib or libpngstat.lib to the project.
-
-If you are using libpng.dll, libpng.dll and zlib.dll will be required for the code to run.
-
-Alternatively, the libpng.dll can be built using zlibstat.lib to produce one dll containing both the zlib and png code.
-
-See the libpng documentation for instructions on how to use the code.
-
diff --git a/src/3rdparty/libpng/projects/borland/libpngstat.bpf b/src/3rdparty/libpng/projects/borland/libpngstat.bpf
deleted file mode 100644
index 9159d02b7..000000000
--- a/src/3rdparty/libpng/projects/borland/libpngstat.bpf
+++ /dev/null
@@ -1,22 +0,0 @@
-USELIB("zlibstat.lib");
-USEUNIT("..\..\pngerror.c");
-USEUNIT("..\..\png.c");
-USEUNIT("..\..\pngwutil.c");
-USEUNIT("..\..\pngmem.c");
-USEUNIT("..\..\pngpread.c");
-USEUNIT("..\..\pngread.c");
-USEUNIT("..\..\pngrio.c");
-USEUNIT("..\..\pngrtran.c");
-USEUNIT("..\..\pngrutil.c");
-USEUNIT("..\..\pngset.c");
-USEUNIT("..\..\pngtrans.c");
-USEUNIT("..\..\pngwio.c");
-USEUNIT("..\..\pngwrite.c");
-USEUNIT("..\..\pngwtran.c");
-USEUNIT("..\..\pngget.c");
-//---------------------------------------------------------------------------
-#define Library
-
-// To add a file to the library use the Project menu 'Add to Project'.
-
- 
\ No newline at end of file
diff --git a/src/3rdparty/libpng/projects/borland/libpngstat.bpr b/src/3rdparty/libpng/projects/borland/libpngstat.bpr
deleted file mode 100644
index 0b97981b4..000000000
--- a/src/3rdparty/libpng/projects/borland/libpngstat.bpr
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
-  <MACROS>
-    <VERSION value="BCB.05.03"/>
-    <PROJECT value="libpngstat.lib"/>
-    <OBJFILES value="..\..\pngerror.obj ..\..\png.obj ..\..\pngwutil.obj ..\..\pngmem.obj 
-      ..\..\pngpread.obj ..\..\pngread.obj ..\..\pngrio.obj ..\..\pngrtran.obj 
-      ..\..\pngrutil.obj ..\..\pngset.obj ..\..\pngtrans.obj ..\..\pngwio.obj 
-      ..\..\pngwrite.obj ..\..\pngwtran.obj ..\..\pngget.obj"/>
-    <RESFILES value=""/>
-    <DEFFILE value=""/>
-    <RESDEPEN value="$(RESFILES)"/>
-    <LIBFILES value="zlibstat.lib"/>
-    <LIBRARIES value=""/>
-    <PACKAGES value=""/>
-    <PATHCPP value=".;..\.."/>
-    <PATHPAS value=".;"/>
-    <PATHRC value=".;"/>
-    <PATHASM value=".;"/>
-    <LINKER value="TLib"/>
-    <USERDEFINES value=""/>
-    <SYSDEFINES value="_RTLDLL;NO_STRICT"/>
-    <MAINSOURCE value="libpngstat.bpf"/>
-    <INCLUDEPATH value="..\..;..\..\..\zlib;$(BCB)\include"/>
-    <LIBPATH value="..\..;$(BCB)\lib\obj;$(BCB)\lib"/>
-    <WARNINGS value="-w-par"/>
-    <LISTFILE value=""/>
-  </MACROS>
-  <OPTIONS>
-    <CFLAG1 value="-O2 -w -Vx -Ve -X- -a8 -5 -b- -d -k- -vi -c -tW -tWM"/>
-    <PFLAGS value="-$Y- -$L- -$D- -$C- -v -JPHNE -M"/>
-    <AFLAGS value="/mx /w2 /zn"/>
-    <LFLAGS value=""/>
-  </OPTIONS>
-  <LINKER>
-    <ALLOBJ value="$(OBJFILES)"/>
-    <ALLLIB value=""/>
-  </LINKER>
-  <IDEOPTIONS>
-[Version Info]
-IncludeVerInfo=0
-AutoIncBuild=0
-MajorVer=1
-MinorVer=0
-Release=0
-Build=0
-Debug=0
-PreRelease=0
-Special=0
-Private=0
-DLL=0
-Locale=2057
-CodePage=1252
-
-[Version Info Keys]
-CompanyName=
-FileDescription=
-FileVersion=1.0.0.0
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=
-ProductName=
-ProductVersion=1.0.0.0
-Comments=
-
-[HistoryLists\hlIncludePath]
-Count=2
-Item0=..\..;P:\My Documents\Source\PNG+ZLib\zlib;$(BCB)\include
-Item1=..\..;$(BCB)\include;$(BCB)\include\vcl
-
-[HistoryLists\hlLibraryPath]
-Count=1
-Item0=..\..;$(BCB)\lib\obj;$(BCB)\lib
-
-[HistoryLists\hlDebugSourcePath]
-Count=1
-Item0=$(BCB)\source\vcl
-
-[HistoryLists\hlConditionals]
-Count=1
-Item0=_DEBUG
-
-[HistoryLists\hlTlibPageSize]
-Count=1
-Item0=0x0010
-
-[Debugging]
-DebugSourceDirs=$(BCB)\source\vcl
-
-[Parameters]
-RunParams=
-HostApplication=
-RemoteHost=
-RemotePath=
-RemoteDebug=0
-
-[Compiler]
-ShowInfoMsgs=0
-LinkDebugVcl=0
-LinkCGLIB=0
-
-[Language]
-ActiveLang=
-ProjectLang=
-RootDir=
-  </IDEOPTIONS>
-</PROJECT>
\ No newline at end of file
diff --git a/src/3rdparty/libpng/projects/borland/zlib+libpng.bpg b/src/3rdparty/libpng/projects/borland/zlib+libpng.bpg
deleted file mode 100644
index f8f470276..000000000
--- a/src/3rdparty/libpng/projects/borland/zlib+libpng.bpg
+++ /dev/null
@@ -1,33 +0,0 @@
-#------------------------------------------------------------------------------
-VERSION = BWS.01
-#------------------------------------------------------------------------------
-!ifndef ROOT
-ROOT = $(MAKEDIR)\..
-!endif
-#------------------------------------------------------------------------------
-MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
-DCC = $(ROOT)\bin\dcc32.exe $**
-BRCC = $(ROOT)\bin\brcc32.exe $**
-#------------------------------------------------------------------------------
-PROJECTS = zlibstat.lib libpngstat.lib zlib.dll libpng.dll
-#------------------------------------------------------------------------------
-default: $(PROJECTS)
-#------------------------------------------------------------------------------
-
-libpng.dll: libpng.bpr
-  $(ROOT)\bin\bpr2mak $**
-  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-zlibstat.lib: zlibstat.bpr
-  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
-  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-zlib.dll: zlib.bpr
-  $(ROOT)\bin\bpr2mak $**
-  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-libpngstat.lib: libpngstat.bpr
-  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
-  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-
diff --git a/src/3rdparty/libpng/projects/borland/zlib.bpf b/src/3rdparty/libpng/projects/borland/zlib.bpf
deleted file mode 100644
index 7dca899e1..000000000
--- a/src/3rdparty/libpng/projects/borland/zlib.bpf
+++ /dev/null
@@ -1,20 +0,0 @@
-USEUNIT("zlib.cpp");
-USEUNIT("..\..\..\zlib\zutil.c");
-USEUNIT("..\..\..\zlib\compress.c");
-USEUNIT("..\..\..\zlib\crc32.c");
-USEUNIT("..\..\..\zlib\deflate.c");
-USEUNIT("..\..\..\zlib\gzio.c");
-USEUNIT("..\..\..\zlib\infblock.c");
-USEUNIT("..\..\..\zlib\infcodes.c");
-USEUNIT("..\..\..\zlib\inffast.c");
-USEUNIT("..\..\..\zlib\inflate.c");
-USEUNIT("..\..\..\zlib\inftrees.c");
-USEUNIT("..\..\..\zlib\infutil.c");
-USEUNIT("..\..\..\zlib\trees.c");
-USEUNIT("..\..\..\zlib\uncompr.c");
-USEUNIT("..\..\..\zlib\adler32.c");
-//---------------------------------------------------------------------------
-This file is used by the project manager only and should be treated like the project file
-
-
-DllEntryPoint
\ No newline at end of file
diff --git a/src/3rdparty/libpng/projects/borland/zlib.bpg b/src/3rdparty/libpng/projects/borland/zlib.bpg
deleted file mode 100644
index 0292b4835..000000000
--- a/src/3rdparty/libpng/projects/borland/zlib.bpg
+++ /dev/null
@@ -1,25 +0,0 @@
-#------------------------------------------------------------------------------
-VERSION = BWS.01
-#------------------------------------------------------------------------------
-!ifndef ROOT
-ROOT = $(MAKEDIR)\..
-!endif
-#------------------------------------------------------------------------------
-MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
-DCC = $(ROOT)\bin\dcc32.exe $**
-BRCC = $(ROOT)\bin\brcc32.exe $**
-#------------------------------------------------------------------------------
-PROJECTS = zlibstat.lib zlib.dll
-#------------------------------------------------------------------------------
-default: $(PROJECTS)
-#------------------------------------------------------------------------------
-
-zlibstat.lib: zlibstat.bpr
-  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
-  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-zlib.dll: zlib.bpr
-  $(ROOT)\bin\bpr2mak $**
-  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-
diff --git a/src/3rdparty/libpng/projects/borland/zlib.bpr b/src/3rdparty/libpng/projects/borland/zlib.bpr
deleted file mode 100644
index b3dda391e..000000000
--- a/src/3rdparty/libpng/projects/borland/zlib.bpr
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
-  <MACROS>
-    <VERSION value="BCB.05.03"/>
-    <PROJECT value="zlib.dll"/>
-    <OBJFILES value="zlib.obj ..\..\..\zlib\zutil.obj ..\..\..\zlib\compress.obj 
-      ..\..\..\zlib\crc32.obj ..\..\..\zlib\deflate.obj ..\..\..\zlib\gzio.obj 
-      ..\..\..\zlib\infblock.obj ..\..\..\zlib\infcodes.obj 
-      ..\..\..\zlib\inffast.obj ..\..\..\zlib\inflate.obj 
-      ..\..\..\zlib\inftrees.obj ..\..\..\zlib\infutil.obj 
-      ..\..\..\zlib\trees.obj ..\..\..\zlib\uncompr.obj ..\..\..\zlib\adler32.obj"/>
-    <RESFILES value=""/>
-    <DEFFILE value=""/>
-    <RESDEPEN value="$(RESFILES)"/>
-    <LIBFILES value=""/>
-    <LIBRARIES value="bcbsmp50.lib dclocx50.lib NMFast50.lib Tee50.lib Vclx50.lib Vcl50.lib"/>
-    <SPARELIBS value="Vcl50.lib Vclx50.lib Tee50.lib NMFast50.lib dclocx50.lib bcbsmp50.lib"/>
-    <PACKAGES value="Vcl50.bpi Vclx50.bpi bcbsmp50.bpi Qrpt50.bpi Vcldb50.bpi Vclbde50.bpi 
-      ibsmp50.bpi vcldbx50.bpi TeeUI50.bpi TeeDB50.bpi Tee50.bpi TeeQR50.bpi 
-      VCLIB50.bpi bcbie50.bpi vclie50.bpi Inetdb50.bpi Inet50.bpi NMFast50.bpi 
-      dclocx50.bpi bcb97axserver50.bpi SIMULUSCOMPONENTS.bpi Simulus2.bpi"/>
-    <PATHCPP value=".;..\..\..\zlib"/>
-    <PATHPAS value=".;"/>
-    <PATHRC value=".;"/>
-    <PATHASM value=".;"/>
-    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
-    <RELEASELIBPATH value="$(BCB)\lib\release"/>
-    <LINKER value="tlink32"/>
-    <USERDEFINES value="ZLIB_DLL;Z_PREFIX"/>
-    <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL"/>
-    <MAINSOURCE value="zlib.bpf"/>
-    <INCLUDEPATH value="..\..\..\zlib;$(BCB)\include"/>
-    <LIBPATH value="..\..\..\zlib;$(BCB)\lib\obj;$(BCB)\lib"/>
-    <WARNINGS value="-w8092 -w8091 -w8090 -w8089 -w8087 -wprc -wuse -wucp -wstv -wstu -wpin 
-      -w-par -wnod -wnak -wdef -wcln -wbbf -w-aus -wasm -wamp -wamb"/>
-  </MACROS>
-  <OPTIONS>
-    <CFLAG1 value="-WD -O2 -w -Vx -Ve -x- -RT- -ff -X- -a8 -5 -b- -d -k- -vi -tWD -tWM -c"/>
-    <PFLAGS value="-$Y- -$L- -$D- -$C- -v -JPHNE -M"/>
-    <RFLAGS value=""/>
-    <AFLAGS value="/mx /w2 /zn"/>
-    <LFLAGS value="-D&quot;&quot; -aa -Tpd -x -Gn -Gi -w"/>
-  </OPTIONS>
-  <LINKER>
-    <ALLOBJ value="c0d32.obj $(OBJFILES)"/>
-    <ALLRES value="$(RESFILES)"/>
-    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mti.lib"/>
-  </LINKER>
-  <IDEOPTIONS>
-[Version Info]
-IncludeVerInfo=0
-AutoIncBuild=0
-MajorVer=1
-MinorVer=0
-Release=0
-Build=0
-Debug=0
-PreRelease=0
-Special=0
-Private=0
-DLL=1
-Locale=2057
-CodePage=1252
-
-[Version Info Keys]
-CompanyName=
-FileDescription=
-FileVersion=1.0.0.0
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=
-ProductName=
-ProductVersion=1.0.0.0
-Comments=
-
-[HistoryLists\hlIncludePath]
-Count=16
-Item0=..\..\..\zlib;$(BCB)\include
-Item1=..\..\..;..\Source\ThirdParty\ZLibCompression\external;..\Source\ThirdParty\ZLibCompression;..\..\..\zlib;$(BCB)\include
-Item2=..\Source\ThirdParty\ZLibCompression\external;..\Source\ThirdParty\ZLibCompression;..\..\..\zlib;$(BCB)\include
-Item3=P:\My Documents\Source\PNG+ZLib\zlib;$(BCB)\include
-Item4=..\Source\ThirdParty\ZLibCompression\external;..\Source\ThirdParty\ZLibCompression;$(BCB)\include
-Item5=..\Source\ThirdParty\ZLibCompression;$(BCB)\include
-Item6=$(BCB)\include
-Item7=..\Source;..\Source\General\Templates;..\Source\SIMUtilities;$(BCB)\include;$(BCB)\include\vcl
-Item8=P:\Development\Source\;P:\Development\Source\General\Templates\;P:\Development\Source\SIMUtilities\;$(BCB)\include;$(BCB)\include\vcl
-Item9=P:\Development\Source;P:\Development\Source\General\Templates\;P:\Development\Source\SIMUtilities\;$(BCB)\include;$(BCB)\include\vcl
-Item10=P:\Development\Source\General\Templates\;P:\Development\Source\SIMUtilities\;$(BCB)\include;$(BCB)\include\vcl
-Item11=P:\Development\Source\General\Templates\;P:\Development\Source\SIMUtilities;$(BCB)\include;$(BCB)\include\vcl
-Item12=P:\Development\Source\General\Templates\;$(BCB)\include;$(BCB)\include\vcl
-Item13=P:\Development\Source\General\Templates;$(BCB)\include;$(BCB)\include\vcl
-Item14=P:\Development\Source;$(BCB)\include;$(BCB)\include\vcl
-Item15=$(BCB)\include;$(BCB)\include\vcl
-
-[HistoryLists\hlLibraryPath]
-Count=12
-Item0=..\..\..\zlib;$(BCB)\lib\obj;$(BCB)\lib
-Item1=..\..\..;..\Source\ThirdParty\ZLibCompression\external;..\Source\ThirdParty\ZLibCompression;..\..\..\zlib;$(BCB)\lib\obj;$(BCB)\lib
-Item2=..\Source\ThirdParty\ZLibCompression\external;..\Source\ThirdParty\ZLibCompression;..\..\..\zlib;$(BCB)\lib\obj;$(BCB)\lib
-Item3=P:\My Documents\Source\PNG+ZLib\zlib;$(BCB)\lib\obj;$(BCB)\lib
-Item4=..\Source\ThirdParty\ZLibCompression\external;..\Source\ThirdParty\ZLibCompression;$(BCB)\lib\obj;$(BCB)\lib
-Item5=$(BCB)\lib\obj;$(BCB)\lib
-Item6=..\Source\ThirdParty\ZLibCompression;$(BCB)\lib\obj;$(BCB)\lib
-Item7=..\Source\SIMUtilities;..\Source;$(BCB)\lib\obj;$(BCB)\lib
-Item8=P:\Development\Source\SIMUtilities\;P:\Development\Source\;$(BCB)\lib\obj;$(BCB)\lib
-Item9=P:\Development\Source\SIMUtilities;P:\Development\Source\;$(BCB)\lib\obj;$(BCB)\lib
-Item10=P:\Development\Source\;$(BCB)\lib\obj;$(BCB)\lib
-Item11=P:\Development\Source;$(BCB)\lib\obj;$(BCB)\lib
-
-[HistoryLists\hlDebugSourcePath]
-Count=1
-Item0=$(BCB)\source\vcl
-
-[HistoryLists\hlConditionals]
-Count=8
-Item0=ZLIB_DLL;Z_PREFIX
-Item1=ZLIB_DLL;_DEBUG;Z_PREFIX
-Item2=ZLIB_DLL;_DEBUG
-Item3=ZLIB_DLL
-Item4=_WINDOWS;ZLIB_DLL
-Item5=_HTML_FORM
-Item6=_DEBUG;_HTML_FORM
-Item7=_DEBUG
-
-[HistoryLists\hlIntOutputDir]
-Count=2
-Item0=..\Obj
-Item1=P:\Development\Obj
-
-[Debugging]
-DebugSourceDirs=
-
-[Parameters]
-RunParams=
-HostApplication=
-RemoteHost=
-RemotePath=
-RemoteDebug=0
-
-[Compiler]
-ShowInfoMsgs=0
-LinkDebugVcl=0
-LinkCGLIB=0
-  </IDEOPTIONS>
-</PROJECT>
\ No newline at end of file
diff --git a/src/3rdparty/libpng/projects/borland/zlib.cpp b/src/3rdparty/libpng/projects/borland/zlib.cpp
deleted file mode 100644
index 3df153257..000000000
--- a/src/3rdparty/libpng/projects/borland/zlib.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-//---------------------------------------------------------------------------
-
-#include <windows.h>
-//---------------------------------------------------------------------------
-//   Important note about DLL memory management when your DLL uses the
-//   static version of the RunTime Library:
-//
-//   If your DLL exports any functions that pass String objects (or structs/
-//   classes containing nested Strings) as parameter or function results,
-//   you will need to add the library MEMMGR.LIB to both the DLL project and
-//   any other projects that use the DLL.  You will also need to use MEMMGR.LIB
-//   if any other projects which use the DLL will be performing new or delete
-//   operations on any non-TObject-derived classes which are exported from the
-//   DLL. Adding MEMMGR.LIB to your project will change the DLL and its calling
-//   EXE's to use the BORLNDMM.DLL as their memory manager.  In these cases,
-//   the file BORLNDMM.DLL should be deployed along with your DLL.
-//
-//   To avoid using BORLNDMM.DLL, pass string information using "char *" or
-//   ShortString parameters.
-//
-//   If your DLL uses the dynamic version of the RTL, you do not need to
-//   explicitly add MEMMGR.LIB as this will be done implicitly for you
-//---------------------------------------------------------------------------
-
-int WINAPI DllEntryPoint(HINSTANCE, unsigned long, void*)
-{
-    return 1;
-}
-//---------------------------------------------------------------------------
diff --git a/src/3rdparty/libpng/projects/borland/zlibstat.bpf b/src/3rdparty/libpng/projects/borland/zlibstat.bpf
deleted file mode 100644
index 14c36bcbb..000000000
--- a/src/3rdparty/libpng/projects/borland/zlibstat.bpf
+++ /dev/null
@@ -1,20 +0,0 @@
-USEUNIT("..\..\..\zlib\zutil.c");
-USEUNIT("..\..\..\zlib\compress.c");
-USEUNIT("..\..\..\zlib\crc32.c");
-USEUNIT("..\..\..\zlib\deflate.c");
-USEUNIT("..\..\..\zlib\gzio.c");
-USEUNIT("..\..\..\zlib\infblock.c");
-USEUNIT("..\..\..\zlib\infcodes.c");
-USEUNIT("..\..\..\zlib\inffast.c");
-USEUNIT("..\..\..\zlib\inflate.c");
-USEUNIT("..\..\..\zlib\inftrees.c");
-USEUNIT("..\..\..\zlib\infutil.c");
-USEUNIT("..\..\..\zlib\trees.c");
-USEUNIT("..\..\..\zlib\uncompr.c");
-USEUNIT("..\..\..\zlib\adler32.c");
-//---------------------------------------------------------------------------
-#define Library
-
-// To add a file to the library use the Project menu 'Add to Project'.
-
- 
\ No newline at end of file
diff --git a/src/3rdparty/libpng/projects/borland/zlibstat.bpr b/src/3rdparty/libpng/projects/borland/zlibstat.bpr
deleted file mode 100644
index 9e0903891..000000000
--- a/src/3rdparty/libpng/projects/borland/zlibstat.bpr
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
-  <MACROS>
-    <VERSION value="BCB.05.03"/>
-    <PROJECT value="zlibstat.lib"/>
-    <OBJFILES value="..\..\..\zlib\zutil.obj ..\..\..\zlib\compress.obj ..\..\..\zlib\crc32.obj 
-      ..\..\..\zlib\deflate.obj ..\..\..\zlib\gzio.obj 
-      ..\..\..\zlib\infblock.obj ..\..\..\zlib\infcodes.obj 
-      ..\..\..\zlib\inffast.obj ..\..\..\zlib\inflate.obj 
-      ..\..\..\zlib\inftrees.obj ..\..\..\zlib\infutil.obj 
-      ..\..\..\zlib\trees.obj ..\..\..\zlib\uncompr.obj ..\..\..\zlib\adler32.obj"/>
-    <RESFILES value=""/>
-    <DEFFILE value=""/>
-    <RESDEPEN value="$(RESFILES)"/>
-    <LIBFILES value=""/>
-    <LIBRARIES value=""/>
-    <PACKAGES value=""/>
-    <PATHCPP value=".;..\..\..\zlib"/>
-    <PATHPAS value=".;"/>
-    <PATHRC value=".;"/>
-    <PATHASM value=".;"/>
-    <LINKER value="TLib"/>
-    <USERDEFINES value="Z_PREFIX"/>
-    <SYSDEFINES value="_RTLDLL;NO_STRICT"/>
-    <MAINSOURCE value="zlibstat.bpf"/>
-    <INCLUDEPATH value="..\..\..\zlib;$(BCB)\include"/>
-    <LIBPATH value="..\..\..\zlib;$(BCB)\lib\obj;$(BCB)\lib"/>
-    <WARNINGS value="-w8092 -w8091 -w8090 -w8089 -w8087 -wprc -wuse -wucp -wstv -wstu -wpin 
-      -wnod -wnak -wdef -wcln -wbbf -w-aus -wasm -wamp -wamb"/>
-    <LISTFILE value=""/>
-  </MACROS>
-  <OPTIONS>
-    <CFLAG1 value="-O2 -w -Vx -Ve -x- -RT- -X- -a8 -5 -b- -d -k- -vi -c -tW -tWM"/>
-    <PFLAGS value="-$Y- -$L- -$D- -$C- -v -JPHNE -M"/>
-    <AFLAGS value="/mx /w2 /zn"/>
-    <LFLAGS value=""/>
-  </OPTIONS>
-  <LINKER>
-    <ALLOBJ value="$(OBJFILES)"/>
-    <ALLLIB value=""/>
-  </LINKER>
-  <IDEOPTIONS>
-[Version Info]
-IncludeVerInfo=0
-AutoIncBuild=0
-MajorVer=1
-MinorVer=0
-Release=0
-Build=0
-Debug=0
-PreRelease=0
-Special=0
-Private=0
-DLL=0
-Locale=2057
-CodePage=1252
-
-[Version Info Keys]
-CompanyName=
-FileDescription=
-FileVersion=1.0.0.0
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=
-ProductName=
-ProductVersion=1.0.0.0
-Comments=
-
-[HistoryLists\hlIncludePath]
-Count=8
-Item0=..\..\..\zlib;$(BCB)\include
-Item1=..\Source\ThirdParty\ZLibCompression\external;..\..\..\zlib;$(BCB)\include
-Item2=P:\My Documents\Source\PNG+ZLib\zlib;$(BCB)\include
-Item3=..\Source\ThirdParty\ZLibCompression\external;$(BCB)\include
-Item4=..\Source\ThirdParty\ZLibCompression\external;..\Source\ThirdParty\ZLibCompression\ext;..\Source\ThirdParty\ZLibCompression;$(BCB)\include
-Item5=..\Source\ThirdParty\ZLibCompression;$(BCB)\include
-Item6=$(BCB)\include
-Item7=$(BCB)\include;$(BCB)\include\vcl
-
-[HistoryLists\hlLibraryPath]
-Count=7
-Item0=..\..\..\zlib;$(BCB)\lib\obj;$(BCB)\lib
-Item1=$(BCB)\lib\obj;$(BCB)\lib
-Item2=..\Source\ThirdParty\ZLibCompression\external;..\..\..\zlib;$(BCB)\lib\obj;$(BCB)\lib
-Item3=P:\My Documents\Source\PNG+ZLib\zlib;$(BCB)\lib\obj;$(BCB)\lib
-Item4=..\Source\ThirdParty\ZLibCompression\external;$(BCB)\lib\obj;$(BCB)\lib
-Item5=..\Source\ThirdParty\ZLibCompression\external;..\Source\ThirdParty\ZLibCompression\ext;..\Source\ThirdParty\ZLibCompression;$(BCB)\lib\obj;$(BCB)\lib
-Item6=..\Source\ThirdParty\ZLibCompression;$(BCB)\lib\obj;$(BCB)\lib
-
-[HistoryLists\hlDebugSourcePath]
-Count=1
-Item0=$(BCB)\source\vcl
-
-[HistoryLists\hlConditionals]
-Count=3
-Item0=Z_PREFIX
-Item1=ZLIB_DLL
-Item2=_WINDOWS;ZLIB_DLL
-
-[HistoryLists\hlIntOutputDir]
-Count=2
-Item0=..\Obj
-Item1=P:\Development\Obj
-
-[HistoryLists\hlTlibPageSize]
-Count=1
-Item0=0x0010
-
-[Debugging]
-DebugSourceDirs=
-
-[Parameters]
-RunParams=
-HostApplication=
-RemoteHost=
-RemotePath=
-RemoteDebug=0
-
-[Compiler]
-ShowInfoMsgs=0
-LinkDebugVcl=0
-LinkCGLIB=0
-
-[Language]
-ActiveLang=
-ProjectLang=
-RootDir=
-  </IDEOPTIONS>
-</PROJECT>
\ No newline at end of file
diff --git a/src/3rdparty/libpng/scripts/makefile.bc32 b/src/3rdparty/libpng/scripts/makefile.bc32
deleted file mode 100644
index 90b178bc7..000000000
--- a/src/3rdparty/libpng/scripts/makefile.bc32
+++ /dev/null
@@ -1,151 +0,0 @@
-# Makefile for libpng
-# 32-bit Borland C++ (Note: All modules are compiled in C mode)
-# To build the library, do:
-#       "make -fmakefile.bc32"
-#
-# -------------------- 32-bit Borland C++ --------------------
-
-### Absolutely necessary for this makefile to work
-.AUTODEPEND
-
-## Where zlib.h, zconf.h and zlib.lib are
-ZLIB_DIR=..\zlib
-
-
-## Compiler, linker and lib stuff
-CC=bcc32
-LD=bcc32
-LIB=tlib
-
-#TARGET_CPU=6
-# 3 = 386, 4 = 486, 5 = Pentium etc.
-!ifndef TARGET_CPU
-TARGET_CPU=5
-!endif
-
-# Use this if you don't want Borland's fancy exception handling
-NOEHLIB=noeh32.lib
-
-!ifdef DEBUG
-CDEBUG=-v
-LDEBUG=-v
-!else
-CDEBUG=
-LDEBUG=
-!endif
-
-# STACKOFLOW=1
-!ifdef STACKOFLOW
-CDEBUG=$(CDEBUG) -N
-LDEBUG=$(LDEBUG) -N
-!endif
-
-# -X- turn on dependency generation in the object file
-# -w  set all warnings on
-# -O2 optimize for speed
-# -Z  global optimization
-CFLAGS=-O2 -Z -X- -w -I$(ZLIB_DIR) -$(TARGET_CPU) $(CDEBUG)
-
-# -M  generate map file
-LDFLAGS=-M -L$(ZLIB_DIR) $(LDEBUG)
-
-
-## Variables
-OBJS = \
-	png.obj \
-	pngerror.obj \
-	pngget.obj \
-	pngmem.obj \
-	pngpread.obj \
-	pngread.obj \
-	pngrio.obj \
-	pngrtran.obj \
-	pngrutil.obj \
-	pngset.obj \
-	pngtrans.obj \
-	pngwio.obj \
-	pngwrite.obj \
-	pngwtran.obj \
-	pngwutil.obj
-
-LIBOBJS = \
-	+png.obj \
-	+pngerror.obj \
-	+pngget.obj \
-	+pngmem.obj \
-	+pngpread.obj \
-	+pngread.obj \
-	+pngrio.obj \
-	+pngrtran.obj \
-	+pngrutil.obj \
-	+pngset.obj \
-	+pngtrans.obj \
-	+pngwio.obj \
-	+pngwrite.obj \
-	+pngwtran.obj \
-	+pngwutil.obj
-
-LIBNAME=libpng.lib
-
-
-## Implicit rules
-# Braces let make "batch" calls to the compiler,
-# 2 calls instead of 12; space is important.
-.c.obj:
-	$(CC) $(CFLAGS) -c {$*.c }
-
-.c.exe:
-	$(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBNAME) zlib.lib $(NOEHLIB)
-
-.obj.exe:
-	$(LD) $(LDFLAGS) $*.obj $(LIBNAME) zlib.lib $(NOEHLIB)
-
-
-## Major targets
-all: libpng pngtest
-
-libpng: $(LIBNAME)
-
-pngtest: pngtest.exe
-
-test: pngtest.exe
-	pngtest
-
-
-## Minor Targets
-
-png.obj: png.c
-pngerror.obj: pngerror.c
-pngget.obj: pngget.c
-pngmem.obj: pngmem.c
-pngpread.obj: pngpread.c
-pngread.obj: pngread.c
-pngrio.obj: pngrio.c
-pngrtran.obj: pngrtran.c
-pngrutil.obj: pngrutil.c
-pngset.obj: pngset.c
-pngtrans.obj: pngtrans.c
-pngwio.obj: pngwio.c
-pngwrite.obj: pngwrite.c
-pngwtran.obj: pngwtran.c
-pngwutil.obj: pngwutil.c
-
-
-$(LIBNAME): $(OBJS)
-	-del $(LIBNAME)
-	$(LIB) $(LIBNAME) @&&|
-$(LIBOBJS), libpng
-|
-
-
-# Clean up anything else you want
-clean:
-	-del *.obj
-	-del *.exe
-	-del *.lib
-	-del *.lst
-	-del *.map
-	-del *.tds
-
-
-# End of makefile for libpng
diff --git a/src/3rdparty/libpng/scripts/makefile.bd32 b/src/3rdparty/libpng/scripts/makefile.bd32
deleted file mode 100644
index 92a57abae..000000000
--- a/src/3rdparty/libpng/scripts/makefile.bd32
+++ /dev/null
@@ -1,76 +0,0 @@
-# Makefile for png32bd.dll
-# -------------------- 32-bit Borland C++ --------------------
-
-# This makefile expects to find zlib.h and zlib32bd.lib in the
-# $(ZLIBDIR) directory.
-
-# The object files here are compiled with the "stdcall" calling convention.
-# This DLL requires zlib32bd.lib to be compiled in the same way.
-
-# Note that png32bd.dll exports the zlib functions adler32, crc32 and
-# the deflate... and inflate... functions. It does not export the
-# compress and uncompress functions, nor any of the gz... functions,
-# since libpng does not call them.
-
-.AUTODEPEND
-
-ZLIBDIR=..\zlib
-ZLIB=zlib32bd.lib
-PNGDLL=png32bd.dll
-PNGLIB=png32bd.lib
-
-CC=bcc32
-CFLAGS= -ps -O2 -N- -k- -d -r- -w-par -w-aus -I$(ZLIBDIR) \
-	-DPNG_NO_GLOBAL_ARRAYS #-DPNG_DEBUG=5
-#LINK=tlink32
-#LINK=ilink32
-LINK=bcc32
-#LINKFLAGS= -Tpd -aa -c
-LINKFLAGS= -WDE
-IMPLIB=implib
-
-# Use this if you don't want Borland's fancy exception handling
-NOEHLIB=noeh32.lib
-
-.c.obj:
-	$(CC) -c $(CFLAGS) $<
-
-.c.exe:
-	$(CC) $(CFLAGS) $< $(PNGLIB) $(NOEHLIB)
-
-
-OBJ1=png.obj pngerror.obj pngget.obj pngmem.obj pngpread.obj
-OBJ2=pngread.obj pngrio.obj pngrtran.obj pngrutil.obj pngset.obj
-OBJ3=pngtrans.obj pngwio.obj pngwrite.obj pngwtran.obj pngwutil.obj
-
-all: $(PNGDLL)
-
-test: pngtest.exe
-	pngtest
-
-
-$(PNGDLL): $(OBJ1) $(OBJ2) $(OBJ3) $(ZLIBDIR)\$(ZLIB)
-	$(LINK) @&&|
-$(LINKFLAGS)
--e$(PNGDLL)
-$(OBJ1)
-$(OBJ2)
-$(OBJ3)
-$(ZLIBDIR)\$(ZLIB)
-$(NOEHLIB)
-|
-	$(IMPLIB) -c $(@R).lib $@
-
-
-# Clean up anything else you want
-clean:
-	-del *.obj
-	-del *.dll
-	-del *.exe
-	-del *.lib
-	-del *.lst
-	-del *.map
-	-del *.tds
-
-
-# End of makefile for png32bd.dll
diff --git a/src/3rdparty/libpng/scripts/makefile.bor b/src/3rdparty/libpng/scripts/makefile.bor
deleted file mode 100644
index a5651aa3f..000000000
--- a/src/3rdparty/libpng/scripts/makefile.bor
+++ /dev/null
@@ -1,162 +0,0 @@
-# Makefile for libpng
-# 16-bit Borland C++ (Note: All modules are compiled in C mode)
-# To build the library, do:
-#       "make -fmakefile.bor -DMODEL=c"
-# or:   "make -fmakefile.bor -DMODEL=l"
-#
-# ------------ Borland C++ ------------
-
-### Absolutely necessary for this makefile to work
-.AUTODEPEND
-
-## Where zlib.h, zconf.h and zlib_MODEL.lib are
-ZLIB_DIR=..\zlib
-
-
-## Compiler, linker and lib stuff
-CC=bcc
-LD=bcc
-LIB=tlib
-
-!ifndef MODEL
-MODEL=l
-!endif
-
-MODEL_ARG=-m$(MODEL)
-
-#TARGET_CPU=3
-# 2 = 286, 3 = 386, etc.
-!ifndef TARGET_CPU
-TARGET_CPU=2
-!endif
-
-# Use this if you don't want Borland's fancy exception handling
-# (for Borland C++ 4.0 or later)
-#NOEHLIB=noeh$(MODEL).lib
-
-!ifdef DEBUG
-CDEBUG=-v
-LDEBUG=-v
-!else
-CDEBUG=
-LDEBUG=
-!endif
-
-# STACKOFLOW=1
-!ifdef STACKOFLOW
-CDEBUG=$(CDEBUG) -N
-LDEBUG=$(LDEBUG) -N
-!endif
-
-# -X- turn on dependency generation in the object file
-# -w  set all warnings on
-# -O2 optimize for speed
-# -Z  global optimization
-CFLAGS=-O2 -Z -X- -w -I$(ZLIB_DIR) -$(TARGET_CPU) $(MODEL_ARG) $(CDEBUG)
-
-# -M  generate map file
-LDFLAGS=-M -L$(ZLIB_DIR) $(MODEL_ARG) $(LDEBUG)
-
-
-## Variables
-OBJS = \
-	png.obj \
-	pngerror.obj \
-	pngget.obj \
-	pngmem.obj \
-	pngpread.obj \
-	pngread.obj \
-	pngrio.obj \
-	pngrtran.obj \
-	pngrutil.obj \
-	pngset.obj \
-	pngtrans.obj \
-	pngwio.obj \
-	pngwrite.obj \
-	pngwtran.obj \
-	pngwutil.obj
-
-LIBOBJS = \
-	+png.obj \
-	+pngerror.obj \
-	+pngget.obj \
-	+pngmem.obj \
-	+pngpread.obj \
-	+pngread.obj \
-	+pngrio.obj \
-	+pngrtran.obj \
-	+pngrutil.obj \
-	+pngset.obj \
-	+pngtrans.obj \
-	+pngwio.obj \
-	+pngwrite.obj \
-	+pngwtran.obj \
-	+pngwutil.obj
-
-LIBNAME=libpng$(MODEL).lib
-
-
-## Implicit rules
-# Braces let make "batch" calls to the compiler,
-# 2 calls instead of 12; space is important.
-.c.obj:
-	$(CC) $(CFLAGS) -c {$*.c }
-
-.c.exe:
-	$(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBNAME) zlib_$(MODEL).lib $(NOEHLIB)
-
-
-## Major targets
-all: libpng pngtest
-
-libpng: $(LIBNAME)
-
-pngtest: pngtest$(MODEL).exe
-
-test: pngtest$(MODEL).exe
-	pngtest$(MODEL)
-
-
-## Minor Targets
-
-png.obj: png.c
-pngerror.obj: pngerror.c
-pngget.obj: pngget.c
-pngmem.obj: pngmem.c
-pngpread.obj: pngpread.c
-pngread.obj: pngread.c
-pngrio.obj: pngrio.c
-pngrtran.obj: pngrtran.c
-pngrutil.obj: pngrutil.c
-pngset.obj: pngset.c
-pngtrans.obj: pngtrans.c
-pngwio.obj: pngwio.c
-pngwrite.obj: pngwrite.c
-pngwtran.obj: pngwtran.c
-pngwutil.obj: pngwutil.c
-
-
-$(LIBNAME): $(OBJS)
-	-del $(LIBNAME)
-	$(LIB) $(LIBNAME) @&&|
-$(LIBOBJS), libpng$(MODEL)
-|
-
-
-pngtest$(MODEL).obj: pngtest.c
-	$(CC) $(CFLAGS) -opngtest$(MODEL) -c pngtest.c
-
-pngtest$(MODEL).exe: pngtest$(MODEL).obj
-	$(LD) $(LDFLAGS) pngtest$(MODEL).obj $(LIBNAME) zlib_$(MODEL).lib $(NOEHLIB)
-
-
-# Clean up anything else you want
-clean:
-	-del *.obj
-	-del *.exe
-	-del *.lib
-	-del *.lst
-	-del *.map
-
-
-# End of makefile for libpng
diff --git a/src/3rdparty/libpng/scripts/makefile.tc3 b/src/3rdparty/libpng/scripts/makefile.tc3
deleted file mode 100644
index 21435a68e..000000000
--- a/src/3rdparty/libpng/scripts/makefile.tc3
+++ /dev/null
@@ -1,89 +0,0 @@
-# Makefile for libpng
-# TurboC/C++ (Note: All modules are compiled in C mode)
-
-# To use, do "make -fmakefile.tc3"
-
-# ----- Turbo C 3.00 (can be modified to work with earlier versions) -----
-
-MODEL=l
-CFLAGS=-O2 -Z -m$(MODEL) -I..\zlib
-#CFLAGS=-D_NO_PROTO -O2 -Z -m$(MODEL) -I..\zlib  # Turbo C older than 3.00
-CC=tcc
-LD=tcc
-LIB=tlib
-LDFLAGS=-m$(MODEL) -L..\zlib
-O=.obj
-E=.exe
-
-# variables
-OBJS1 = png$(O) pngset$(O) pngget$(O) pngrutil$(O) pngtrans$(O) pngwutil$(O)
-OBJS2 = pngmem$(O) pngpread$(O) pngread$(O) pngerror$(O) pngwrite$(O)
-OBJS3 = pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O)
-OBJSL1 = +png$(O) +pngset$(O) +pngget$(O) +pngrutil$(O) +pngtrans$(O)
-OBJSL2 = +pngwutil$(O) +pngmem$(O) +pngpread$(O) +pngread$(O) +pngerror$(O)
-OBJSL3 = +pngwrite$(O) +pngrtran$(O) +pngwtran$(O) +pngrio$(O) +pngwio$(O)
-
-all: libpng$(MODEL).lib pngtest$(E)
-
-pngtest: pngtest$(E)
-
-test: pngtest$(E)
-	pngtest$(E)
-
-png$(O): png.h pngconf.h
-		  $(CC) -c $(CFLAGS) $*.c
-
-pngset$(O): png.h pngconf.h
-		  $(CC) -c $(CFLAGS) $*.c
-
-pngget$(O): png.h pngconf.h
-		  $(CC) -c $(CFLAGS) $*.c
-
-pngread$(O): png.h pngconf.h
-		  $(CC) -c $(CFLAGS) $*.c
-
-pngpread$(O): png.h pngconf.h
-		  $(CC) -c $(CFLAGS) $*.c
-
-pngrtran$(O): png.h pngconf.h
-		  $(CC) -c $(CFLAGS) $*.c
-
-pngrutil$(O): png.h pngconf.h
-		  $(CC) -c $(CFLAGS) $*.c
-
-pngerror$(O): png.h pngconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-pngmem$(O): png.h pngconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-pngrio$(O): png.h pngconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-pngwio$(O): png.h pngconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-pngtest$(O): png.h pngconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-pngtrans$(O): png.h pngconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-pngwrite$(O): png.h pngconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-pngwtran$(O): png.h pngconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-pngwutil$(O): png.h pngconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-libpng$(MODEL).lib: $(OBJS1) $(OBJS2) $(OBJS3)
-	$(LIB) libpng$(MODEL) +$(OBJSL1)
-	$(LIB) libpng$(MODEL) +$(OBJSL2)
-	$(LIB) libpng$(MODEL) +$(OBJSL3)
-
-pngtest$(E): pngtest$(O) libpng$(MODEL).lib
-	$(LD) $(LDFLAGS) pngtest.obj libpng$(MODEL).lib zlib_$(MODEL).lib
-
-# End of makefile for libpng
diff --git a/src/3rdparty/sqlite/os.h b/src/3rdparty/sqlite/os.h
index 72c75c763..5b12c21cd 100644
--- a/src/3rdparty/sqlite/os.h
+++ b/src/3rdparty/sqlite/os.h
@@ -72,7 +72,7 @@
 #      define OS_MAC 1
 #      define OS_WIN 0
 #      define OS_UNIX 0
-#    elif defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__BORLANDC__)
+#    elif defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
 #      define OS_MAC 0
 #      define OS_WIN 1
 #      define OS_UNIX 0
@@ -128,7 +128,7 @@
     HANDLE h;               /* Handle for accessing the file */
     int locked;             /* 0: unlocked, <0: write lock, >0: read lock */
   };
-# if defined(_MSC_VER) || defined(__BORLANDC__)
+# if defined(_MSC_VER)
     typedef __int64 off_t;
 # else
 #  if !defined(_CYGWIN_TYPES_H)
diff --git a/src/3rdparty/zlib/win32/Makefile.bor b/src/3rdparty/zlib/win32/Makefile.bor
deleted file mode 100644
index b802519ca..000000000
--- a/src/3rdparty/zlib/win32/Makefile.bor
+++ /dev/null
@@ -1,107 +0,0 @@
-# Makefile for zlib
-# Borland C++ for Win32
-#
-# Updated for zlib 1.2.x by Cosmin Truta, 11-Mar-2003
-# Last updated: 28-Aug-2003
-#
-# Usage:
-#  make -f win32/Makefile.bor
-#  make -f win32/Makefile.bor LOCAL_ZLIB=-DASMV OBJA=match.obj OBJPA=+match.obj
-
-# ------------ Borland C++ ------------
-
-# Optional nonstandard preprocessor flags (e.g. -DMAX_MEM_LEVEL=7)
-# should be added to the environment via "set LOCAL_ZLIB=-DFOO" or
-# added to the declaration of LOC here:
-LOC = $(LOCAL_ZLIB)
-
-CC = bcc32
-AS = bcc32
-LD = bcc32
-AR = tlib
-CFLAGS  = -a -d -k- -O2 $(LOC)
-ASFLAGS = $(LOC)
-LDFLAGS = $(LOC)
-
-
-# variables
-ZLIB_LIB = zlib.lib
-
-OBJ1  = adler32.obj compress.obj crc32.obj deflate.obj gzio.obj infback.obj
-OBJ2  = inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
-#OBJA =
-OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzio.obj+infback.obj
-OBJP2 = +inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
-#OBJPA=
-
-
-# targets
-all: $(ZLIB_LIB) example.exe minigzip.exe
-
-.c.obj:
-	$(CC) -c $(CFLAGS) $<
-
-.asm.obj:
-	$(AS) -c $(ASFLAGS) $<
-
-adler32.obj: adler32.c zlib.h zconf.h
-
-compress.obj: compress.c zlib.h zconf.h
-
-crc32.obj: crc32.c zlib.h zconf.h crc32.h
-
-deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
-
-gzio.obj: gzio.c zutil.h zlib.h zconf.h
-
-infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h inffixed.h
-
-inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h
-
-inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h inffixed.h
-
-inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
-
-trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
-
-uncompr.obj: uncompr.c zlib.h zconf.h
-
-zutil.obj: zutil.c zutil.h zlib.h zconf.h
-
-example.obj: example.c zlib.h zconf.h
-
-minigzip.obj: minigzip.c zlib.h zconf.h
-
-
-# For the sake of the old Borland make,
-# the command line is cut to fit in the MS-DOS 128 byte limit:
-$(ZLIB_LIB): $(OBJ1) $(OBJ2) $(OBJA)
-	-del $(ZLIB_LIB)
-	$(AR) $(ZLIB_LIB) $(OBJP1)
-	$(AR) $(ZLIB_LIB) $(OBJP2)
-	$(AR) $(ZLIB_LIB) $(OBJPA)
-
-
-# testing
-test: example.exe minigzip.exe
-	example
-	echo hello world | minigzip | minigzip -d
-
-example.exe: example.obj $(ZLIB_LIB)
-	$(LD) $(LDFLAGS) example.obj $(ZLIB_LIB)
-
-minigzip.exe: minigzip.obj $(ZLIB_LIB)
-	$(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB)
-
-
-# cleanup
-clean:
-	-del *.obj
-	-del *.lib
-	-del *.exe
-	-del *.tds
-	-del zlib.bak
-	-del foo.gz
diff --git a/src/3rdparty/zlib/zconf.h b/src/3rdparty/zlib/zconf.h
index 3c21403fc..af321ab6f 100644
--- a/src/3rdparty/zlib/zconf.h
+++ b/src/3rdparty/zlib/zconf.h
@@ -99,7 +99,7 @@
 #if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
 #  define STDC
 #endif
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
+#if !defined(STDC) && defined(__GNUC__)
 #  define STDC
 #endif
 #if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
@@ -184,11 +184,7 @@
 #  if (defined(__SMALL__) || defined(__MEDIUM__))
      /* Turbo C small or medium model */
 #    define SMALL_MEDIUM
-#    ifdef __BORLANDC__
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
+#    define FAR far
 #  endif
 #endif
 
@@ -197,7 +193,7 @@
     * This is not mandatory, but it offers a little performance increase.
     */
 #  ifdef ZLIB_DLL
-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
+#    if defined(WIN32)
 #      ifdef ZLIB_INTERNAL
 #        define ZEXTERN extern __declspec(dllexport)
 #      else
@@ -257,12 +253,7 @@ typedef unsigned char  Byte;  /* 8 bits */
 typedef unsigned int   uInt;  /* 16 bits or more */
 typedef unsigned long  uLong; /* 32 bits or more */
 
-#ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
+typedef Byte  FAR Bytef;
 typedef char  FAR charf;
 typedef int   FAR intf;
 typedef uInt  FAR uIntf;
diff --git a/src/3rdparty/zlib/zconf.in.h b/src/3rdparty/zlib/zconf.in.h
index 3c21403fc..af321ab6f 100644
--- a/src/3rdparty/zlib/zconf.in.h
+++ b/src/3rdparty/zlib/zconf.in.h
@@ -99,7 +99,7 @@
 #if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
 #  define STDC
 #endif
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
+#if !defined(STDC) && defined(__GNUC__)
 #  define STDC
 #endif
 #if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
@@ -184,11 +184,7 @@
 #  if (defined(__SMALL__) || defined(__MEDIUM__))
      /* Turbo C small or medium model */
 #    define SMALL_MEDIUM
-#    ifdef __BORLANDC__
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
+#    define FAR far
 #  endif
 #endif
 
@@ -197,7 +193,7 @@
     * This is not mandatory, but it offers a little performance increase.
     */
 #  ifdef ZLIB_DLL
-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
+#    if defined(WIN32)
 #      ifdef ZLIB_INTERNAL
 #        define ZEXTERN extern __declspec(dllexport)
 #      else
@@ -257,12 +253,7 @@ typedef unsigned char  Byte;  /* 8 bits */
 typedef unsigned int   uInt;  /* 16 bits or more */
 typedef unsigned long  uLong; /* 32 bits or more */
 
-#ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
+typedef Byte  FAR Bytef;
 typedef char  FAR charf;
 typedef int   FAR intf;
 typedef uInt  FAR uIntf;
diff --git a/src/3rdparty/zlib/zutil.c b/src/3rdparty/zlib/zutil.c
index 0ef4f99f5..11cafad6b 100644
--- a/src/3rdparty/zlib/zutil.c
+++ b/src/3rdparty/zlib/zutil.c
@@ -185,84 +185,6 @@ void zmemzero(dest, len)
 
 #ifdef SYS16BIT
 
-#ifdef __TURBOC__
-/* Turbo C in 16-bit mode */
-
-#  define MY_ZCALLOC
-
-/* Turbo C malloc() does not allow dynamic allocation of 64K bytes
- * and farmalloc(64K) returns a pointer with an offset of 8, so we
- * must fix the pointer. Warning: the pointer must be put back to its
- * original form in order to free it, use zcfree().
- */
-
-#define MAX_PTR 10
-/* 10*64K = 640K */
-
-local int next_ptr = 0;
-
-typedef struct ptr_table_s {
-    voidpf org_ptr;
-    voidpf new_ptr;
-} ptr_table;
-
-local ptr_table table[MAX_PTR];
-/* This table is used to remember the original form of pointers
- * to large buffers (64K). Such pointers are normalized with a zero offset.
- * Since MSDOS is not a preemptive multitasking OS, this table is not
- * protected from concurrent access. This hack doesn't work anyway on
- * a protected system like OS/2. Use Microsoft C instead.
- */
-
-voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
-{
-    voidpf buf = opaque; /* just to make some compilers happy */
-    ulg bsize = (ulg)items*size;
-
-    /* If we allocate less than 65520 bytes, we assume that farmalloc
-     * will return a usable pointer which doesn't have to be normalized.
-     */
-    if (bsize < 65520L) {
-        buf = farmalloc(bsize);
-        if (*(ush*)&buf != 0) return buf;
-    } else {
-        buf = farmalloc(bsize + 16L);
-    }
-    if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
-    table[next_ptr].org_ptr = buf;
-
-    /* Normalize the pointer to seg:0 */
-    *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
-    *(ush*)&buf = 0;
-    table[next_ptr++].new_ptr = buf;
-    return buf;
-}
-
-void  zcfree (voidpf opaque, voidpf ptr)
-{
-    int n;
-    if (*(ush*)&ptr != 0) { /* object < 64K */
-        farfree(ptr);
-        return;
-    }
-    /* Find the original pointer */
-    for (n = 0; n < next_ptr; n++) {
-        if (ptr != table[n].new_ptr) continue;
-
-        farfree(table[n].org_ptr);
-        while (++n < next_ptr) {
-            table[n-1] = table[n];
-        }
-        next_ptr--;
-        return;
-    }
-    ptr = opaque; /* just to make some compilers happy */
-    Assert(0, "zcfree: ptr not found");
-}
-
-#endif /* __TURBOC__ */
-
-
 #ifdef M_I86
 /* Microsoft C in 16-bit mode */
 
diff --git a/src/3rdparty/zlib/zutil.h b/src/3rdparty/zlib/zutil.h
index 7b42edcaa..50bcbbf6e 100644
--- a/src/3rdparty/zlib/zutil.h
+++ b/src/3rdparty/zlib/zutil.h
@@ -76,17 +76,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 
 #if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
 #  define OS_CODE  0x00
-#  if defined(__TURBOC__) || defined(__BORLANDC__)
-#    if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
-       /* Allow compilation with ANSI keywords only enabled */
-       void _Cdecl farfree( void *block );
-       void *_Cdecl farmalloc( unsigned long nbytes );
-#    else
-#      include <alloc.h>
-#    endif
-#  else /* MSC or DJGPP */
-#    include <malloc.h>
-#  endif
+#  include <malloc.h>
 #endif
 
 #ifdef AMIGA
@@ -160,7 +150,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 
          /* functions */
 
-#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
+#if defined(STDC99)
 #  ifndef HAVE_VSNPRINTF
 #    define HAVE_VSNPRINTF
 #  endif
@@ -176,9 +166,6 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
         but for now we just assume it doesn't. */
 #    define NO_vsnprintf
 #  endif
-#  ifdef __TURBOC__
-#    define NO_vsnprintf
-#  endif
 #  ifdef WIN32
      /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
 #    if !defined(vsnprintf) && !defined(NO_vsnprintf)
diff --git a/src/canvas/ntqcanvas.h b/src/canvas/ntqcanvas.h
index 1dccedf6b..78b886c32 100644
--- a/src/canvas/ntqcanvas.h
+++ b/src/canvas/ntqcanvas.h
@@ -75,7 +75,7 @@ class TQCanvasItem;
 class TQCanvasView;
 class TQCanvasPixmap;
 
-#if defined(Q_TEMPLATEDLL) && ( !defined(Q_CC_BOR) || !defined(QT_MAKEDLL) || defined(TQ_EXPORT_TEMPLATES) )
+#if defined(Q_TEMPLATEDLL) && ( !defined(QT_MAKEDLL) || defined(TQ_EXPORT_TEMPLATES) )
 // MOC_SKIP_BEGIN
 TQM_TEMPLATE_EXTERN_CANVAS template class TQM_EXPORT_CANVAS TQValueListIterator< TQCanvasItem* >;
 TQM_TEMPLATE_EXTERN_CANVAS template class TQM_EXPORT_CANVAS TQValueList< TQCanvasItem* >;
diff --git a/src/kernel/ntqgplugin.h b/src/kernel/ntqgplugin.h
index 1b7431458..828d83e33 100644
--- a/src/kernel/ntqgplugin.h
+++ b/src/kernel/ntqgplugin.h
@@ -93,11 +93,7 @@
 	    return i->iface(); \
 	}
 
-#if defined(TQ_WS_WIN) && defined(Q_CC_BOR)
-#   define Q_STDCALL __stdcall
-#else
-#   define Q_STDCALL
-#endif
+#define Q_STDCALL
 
 #define TQ_EXPORT_PLUGIN(PLUGIN) \
 	    Q_PLUGIN_VERIFICATION_DATA \
diff --git a/src/kernel/qcolor_p.cpp b/src/kernel/qcolor_p.cpp
index e7e33c9cb..46cbd8739 100644
--- a/src/kernel/qcolor_p.cpp
+++ b/src/kernel/qcolor_p.cpp
@@ -40,11 +40,6 @@
 **********************************************************************/
 
 #include "ntqglobal.h"
-#if defined(Q_CC_BOR)
-// needed for qsort() because of a std namespace problem on Borland
-#include "qplatformdefs.h"
-#endif
-
 #include "ntqcolor.h"
 
 #ifndef TQT_NO_COLORNAMES
diff --git a/src/kernel/qmngio.cpp b/src/kernel/qmngio.cpp
index fad1aa9b3..8f612d6c7 100644
--- a/src/kernel/qmngio.cpp
+++ b/src/kernel/qmngio.cpp
@@ -47,13 +47,6 @@
 #include "ntqiodevice.h"
 #include "ntqmngio.h"
 
-// Define XMD_H prohibits the included headers of libmng.h to typedef INT32.
-// This is needed for Borland with STL support, since in that case, INT32 is
-// already defined by some Borland header.
-#define XMD_H
-#if defined(Q_OS_UNIXWARE)
-#  define HAVE_BOOLEAN  // libjpeg under Unixware seems to need this
-#endif
 #include <libmng.h>
 #include <stdlib.h>
 
diff --git a/src/kernel/qobject.cpp b/src/kernel/qobject.cpp
index 79b337f28..b7869c646 100644
--- a/src/kernel/qobject.cpp
+++ b/src/kernel/qobject.cpp
@@ -418,16 +418,7 @@ static inline bool isIdentChar( char x )
 
 static inline bool isSpace( char x )
 {
-#if defined(Q_CC_BOR)
-  /*
-    Borland C++ 4.5 has a weird isspace() bug.
-    isspace() usually works, but not here.
-    This implementation is sufficient for our internal use: rmWS()
-  */
-    return (uchar) x <= 32;
-#else
     return isspace( (uchar) x );
-#endif
 }
 
 static TQCString qt_rmWS( const char *s )
diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp
index ecc304071..4609a340b 100644
--- a/src/kernel/qrichtext.cpp
+++ b/src/kernel/qrichtext.cpp
@@ -2259,7 +2259,7 @@ TQString TQTextDocument::plainText() const
     TQTextParagraph *p = fParag;
     while ( p ) {
 	if ( !p->mightHaveCustomItems ) {
-	    const TQTextString *ts = p->string(); // workaround VC++ and Borland
+	    const TQTextString *ts = p->string();
 	    s = ts->toString(); // with FALSE we don't fix spaces (nbsp)
 	} else {
 	    for ( int i = 0; i < p->length() - 1; ++i ) {
diff --git a/src/moc/moc.y b/src/moc/moc.y
index 4b754b7bc..b3371cab9 100644
--- a/src/moc/moc.y
+++ b/src/moc/moc.y
@@ -2140,16 +2140,7 @@ void registerClassInNamespace()
 
 inline bool isSpace( char x )
 {
-#if defined(Q_CC_BOR)
-  /*
-    Borland C++ 4.5 has a weird isspace() bug.
-    isspace() usually works, but not here.
-    This implementation is sufficient for our internal use: rmWS()
-  */
-    return (uchar) x <= 32;
-#else
     return isspace( (uchar) x );
-#endif
 }
 
 static TQCString rmWS( const char *src )
diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp
index ef980dd34..bf8963493 100644
--- a/src/moc/moc_yacc.cpp
+++ b/src/moc/moc_yacc.cpp
@@ -5015,16 +5015,7 @@ void registerClassInNamespace()
 
 inline bool isSpace( char x )
 {
-#if defined(Q_CC_BOR)
-  /*
-    Borland C++ 4.5 has a weird isspace() bug.
-    isspace() usually works, but not here.
-    This implementation is sufficient for our internal use: rmWS()
-  */
-    return (uchar) x <= 32;
-#else
     return isspace( (uchar) x );
-#endif
 }
 
 static TQCString rmWS( const char *src )
diff --git a/src/qt.pro b/src/qt.pro
index 84482686b..c875e4fae 100644
--- a/src/qt.pro
+++ b/src/qt.pro
@@ -11,15 +11,6 @@ CONFIG          += qmake_cache
 
 win32:!shared:CONFIG += staticlib
 
-win32-borland {
-	mng:QMAKE_CFLAGS_WARN_ON	+= -w-par
-	mng:QMAKE_CXXFLAGS_WARN_ON	+= -w-par
-	# Keep the size of the .tds file for the TQt library smaller than
-	# 34 Mbytes to avoid linking problems
-	QMAKE_CFLAGS_DEBUG += -vi -y-
-	QMAKE_CXXFLAGS_DEBUG += -vi -y-
-}
-
 linux-*:version_script {
    QMAKE_LFLAGS += -Wl,--version-script=libtqt.map
    TARGETDEPS += libtqt.map
@@ -83,7 +74,6 @@ win32 {
 	    exists(qt.rc):RC_FILE = qt.rc
 	}
 }
-win32-borland:INCLUDEPATH += kernel
 
 unix {
 	CANVAS_H	= $$CANVAS_CPP
@@ -118,9 +108,7 @@ DEPENDPATH += $$CANVAS_H;$$STYLES_H
 embedded:DEPENDPATH += ;$$EMBEDDED_H
 
 thread {
-	!win32-borland:TARGET = tqt-mt
-	win32-borland:TARGET = qtmt
-	embedded:TARGET = qte-mt
+	TARGET = tqt-mt
 	DEFINES += TQT_THREAD_SUPPORT
 }
 
diff --git a/src/qtmain.pro b/src/qtmain.pro
index a87c31d78..d8890564f 100644
--- a/src/qtmain.pro
+++ b/src/qtmain.pro
@@ -13,6 +13,5 @@ win32 {
 	CONFIG		-= jpeg
 	INCLUDEPATH	+= tmp
 }
-win32-borland:INCLUDEPATH += kernel
 
 !win32-*:!wince-*:error("${QMAKE_FILE} is intended only for Windows!")
diff --git a/src/sql/drivers/odbc/qsql_odbc.h b/src/sql/drivers/odbc/qsql_odbc.h
index 73b469fdd..901a01929 100644
--- a/src/sql/drivers/odbc/qsql_odbc.h
+++ b/src/sql/drivers/odbc/qsql_odbc.h
@@ -69,15 +69,7 @@
 #define HAVE_LONG_LONG 1 // force UnixODBC NOT to fall back to a struct for BIGINTs
 #endif
 
-#if defined(Q_CC_BOR)
-// workaround for Borland to make sure that SQLBIGINT is defined
-#  define _MSC_VER 900
-#endif
 #include <sql.h>
-#if defined(Q_CC_BOR)
-#  undef _MSC_VER
-#endif
-
 #include <sqlext.h>
 #include "debian_qsql_odbc.h"
 
diff --git a/src/sql/qt_sql.pri b/src/sql/qt_sql.pri
index fea3c9d59..e24ca78d3 100644
--- a/src/sql/qt_sql.pri
+++ b/src/sql/qt_sql.pri
@@ -74,9 +74,6 @@ sql {
 #				LIBS *= delayimp.lib
 #				QMAKE_LFLAGS += /DELAYLOAD:libpqdll.dll
 #			}
-#			win32-borland: {
-#				QMAKE_LFLAGS += /dlibpqdll.dll
-#			}		
 		}
 	}
 
@@ -96,9 +93,6 @@ sql {
 #			win32-msvc: { 
 #				LIBS *= delayimp.lib
 #				QMAKE_LFLAGS += /DELAYLOAD:libmysql.dll
-#			}
-#			win32-borland: {
-#				QMAKE_LFLAGS += /dlibmysql.dll
 #			}
 		}
 	}
@@ -121,8 +115,7 @@ sql {
 		}
 
 		win32 {
-			!win32-borland:LIBS     *= odbc32.lib
-			win32-borland:LIBS      *= $(BCB)/lib/PSDK/odbc32.lib
+			LIBS     *= odbc32.lib
 		}
 
 	}
@@ -142,9 +135,6 @@ sql {
 #				LIBS *= delayimp.lib
 #				QMAKE_LFLAGS += /DELAYLOAD:oci.dll
 #			}
-#			win32-borland: {
-#				QMAKE_LFLAGS += /doci.dll
-#			}		
 		}
 	}
 
@@ -158,15 +148,11 @@ sql {
 			LIBS += -L$SYBASE/lib -lsybdb
 		}
 		win32 {
-			!win32-borland:LIBS += NTWDBLIB.LIB
-			win32-borland:LIBS += $(BCB)/lib/PSDK/NTWDBLIB.LIB
+			LIBS += NTWDBLIB.LIB
 #			win32-msvc: { 
 #				LIBS *= delayimp.lib
 #				QMAKE_LFLAGS += /DELAYLOAD:ntwdblib.dll
 #			}
-#			win32-borland: {
-#				QMAKE_LFLAGS += /dntwdblib.dll
-#			}		
 		}
 	}
 
@@ -178,8 +164,7 @@ sql {
 			LIBS += -ldb2
 		}
 		win32 {
-			!win32-borland:LIBS += db2cli.lib
-#			win32-borland:LIBS  += $(BCB)/lib/PSDK/db2cli.lib
+			LIBS += db2cli.lib
 		}
 	}
 
@@ -191,8 +176,7 @@ sql {
                         LIBS *= -lfbclient
                 }
                 win32 {
-			!win32-borland:LIBS *= gds32_ms.lib
-			win32-borland:LIBS  += gds32.lib
+			LIBS *= gds32_ms.lib
                 }
 	}
 
diff --git a/src/table/qtable.cpp b/src/table/qtable.cpp
index bf27224c8..7f7910b04 100644
--- a/src/table/qtable.cpp
+++ b/src/table/qtable.cpp
@@ -39,11 +39,6 @@
 **********************************************************************/
 
 #include "ntqglobal.h"
-#if defined(Q_CC_BOR)
-// needed for qsort() because of a std namespace problem on Borland
-#include "qplatformdefs.h"
-#endif
-
 #include "ntqtable.h"
 
 #ifndef TQT_NO_TABLE
diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h
index f83da9d79..ef71a722b 100644
--- a/src/tools/ntqglobal.h
+++ b/src/tools/ntqglobal.h
@@ -199,7 +199,6 @@
      MPW	- MPW C++
      MWERKS	- Metrowerks CodeWarrior
      MSVC	- Microsoft Visual C/C++, Intel C++ for Windows
-     BOR	- Borland/Turbo C++
      WAT	- Watcom C++
      GNU	- GNU C++
      COMEAU	- Comeau C++
@@ -266,14 +265,6 @@
 #    define Q_NO_USING_KEYWORD /* ### check "using" status */
 #  endif
 
-#elif defined(__BORLANDC__) || defined(__TURBOC__)
-#  define Q_CC_BOR
-#  if __BORLANDC__ < 0x502
-#    define Q_NO_BOOL_TYPE
-#    define Q_NO_EXPLICIT_KEYWORD
-#  endif
-#  define Q_NO_USING_KEYWORD /* ### check "using" status */
-
 #elif defined(__WATCOMC__)
 #  define Q_CC_WAT
 #  if defined(Q_OS_QNX4)
@@ -852,17 +843,6 @@ class TQString;
 #    endif
 #    undef  TQ_DISABLE_COPY	/* avoid unresolved externals */
 #  endif
-#elif defined(Q_OS_LINUX) && defined(Q_CC_BOR)
-#  if defined(QT_SHARED)	/* create a TQt shared library */
-#    define TQ_EXPORT  __declspec(dllexport)
-#    define Q_TEMPLATEDLL
-#    define Q_TEMPLATE_EXTERN
-#    undef  TQ_DISABLE_COPY	/* avoid unresolved externals */
-#  else
-#    define Q_TEMPLATEDLL
-#    define Q_TEMPLATE_EXTERN
-#    undef  TQ_DISABLE_COPY 	/* avoid unresolved externals */
-#  endif
 #elif defined(Q_CC_GNU) && __GNUC__ - 0 >= 4
 #    define TQ_EXPORT __attribute__((visibility("default")))
 #    undef QT_MAKEDLL		/* ignore these for other platforms */
@@ -1083,14 +1063,6 @@ TQ_EXPORT const char *tqInstallPathShare();
 #    pragma warning(disable: 4355) // 'this' : used in base member initializer list
 #    pragma warning(disable: 4231) // nonstandard extension used : 'extern' before template explicit instantiation
 #    pragma warning(disable: 4710) // function not inlined
-#  elif defined(Q_CC_BOR)
-#    pragma option -w-inl
-#    pragma option -w-aus
-#    pragma warn -inl
-#    pragma warn -pia
-#    pragma warn -ccc
-#    pragma warn -rch
-#    pragma warn -sig
 #  endif
 #endif
 
diff --git a/src/tools/ntqwinexport.h b/src/tools/ntqwinexport.h
index dc5928391..3a8373c79 100644
--- a/src/tools/ntqwinexport.h
+++ b/src/tools/ntqwinexport.h
@@ -36,7 +36,7 @@
 **
 **********************************************************************/
 
-#if defined(Q_TEMPLATEDLL) && ( !defined(Q_CC_BOR) || !defined(QT_MAKEDLL) || defined(TQ_EXPORT_TEMPLATES) )
+#if defined(Q_TEMPLATEDLL) && ( !defined(QT_MAKEDLL) || defined(TQ_EXPORT_TEMPLATES) )
 // MOC_SKIP_BEGIN
 
 #if defined(Q_DEFINED_QASCIIDICT) && defined(Q_DEFINED_QCONNECTION_LIST) && !defined(TQ_EXPORTED_QASCIIDICT_TEMPLATES)
diff --git a/src/tools/qcom_p.h b/src/tools/qcom_p.h
index 9590468ae..3c2ced4cc 100644
--- a/src/tools/qcom_p.h
+++ b/src/tools/qcom_p.h
@@ -312,22 +312,12 @@ public:		   \
 #endif // Q_CREATE_INSTANCE
 
 #    ifdef TQ_WS_WIN
-#	ifdef Q_CC_BOR
-#	    define TQ_EXPORT_COMPONENT() \
-	        Q_UCM_VERIFICATION_DATA \
-		TQ_EXTERN_C __declspec(dllexport) \
-                const char * __stdcall qt_ucm_query_verification_data() \
-                { return qt_ucm_verification_data; } \
-		TQ_EXTERN_C TQ_EXPORT __declspec(dllexport) TQUnknownInterface* \
-                __stdcall ucm_instantiate()
-#	else
 #	    define TQ_EXPORT_COMPONENT() \
 	        Q_UCM_VERIFICATION_DATA \
 		TQ_EXTERN_C __declspec(dllexport) \
                 const char *qt_ucm_query_verification_data() \
                 { return qt_ucm_verification_data; } \
 		TQ_EXTERN_C TQ_EXPORT __declspec(dllexport) TQUnknownInterface* ucm_instantiate()
-#	endif
 #    else
 #	define TQ_EXPORT_COMPONENT() \
 	    Q_UCM_VERIFICATION_DATA \
diff --git a/src/tools/qcomlibrary.cpp b/src/tools/qcomlibrary.cpp
index 20366db9a..77671e3ca 100644
--- a/src/tools/qcomlibrary.cpp
+++ b/src/tools/qcomlibrary.cpp
@@ -439,11 +439,7 @@ void TQComLibrary::createInstanceInternal()
 		return;
 	}
 
-#  ifdef Q_CC_BOR
-	typedef const char * __stdcall (*UCMQueryVerificationDataProc)();
-#  else
 	typedef const char * (*UCMQueryVerificationDataProc)();
-#  endif
 	UCMQueryVerificationDataProc ucmQueryVerificationdataProc;
 	ucmQueryVerificationdataProc =
 	    (UCMQueryVerificationDataProc) resolve( "qt_ucm_query_verification_data" );
@@ -490,11 +486,7 @@ void TQComLibrary::createInstanceInternal()
 	    return;
     }
 
-#ifdef Q_CC_BOR
-    typedef TQUnknownInterface* __stdcall (*UCMInstanceProc)();
-#else
     typedef TQUnknownInterface* (*UCMInstanceProc)();
-#endif
     UCMInstanceProc ucmInstanceProc;
     ucmInstanceProc = (UCMInstanceProc) resolve( "ucm_instantiate" );
 #if defined(QT_DEBUG_COMPONENT)
diff --git a/src/tools/qgarray.cpp b/src/tools/qgarray.cpp
index ff1f7b08b..dbcaceccb 100644
--- a/src/tools/qgarray.cpp
+++ b/src/tools/qgarray.cpp
@@ -39,10 +39,7 @@
 **********************************************************************/
 
 #include "ntqglobal.h"
-#if defined(Q_CC_BOR)
-    // needed for qsort() because of a std namespace problem on Borland
-#   include "qplatformdefs.h"
-#elif defined(TQ_WS_WIN)
+#if defined(TQ_WS_WIN)
     // needed for bsearch on some platforms
 #   include "qt_windows.h"
 #endif
diff --git a/src/tools/qgvector.cpp b/src/tools/qgvector.cpp
index ea1e2018a..448183c14 100644
--- a/src/tools/qgvector.cpp
+++ b/src/tools/qgvector.cpp
@@ -39,10 +39,6 @@
 **********************************************************************/
 
 #include "ntqglobal.h"
-#if defined(Q_CC_BOR)
-// needed for qsort() because of a std namespace problem on Borland
-#include "qplatformdefs.h"
-#endif
 
 #define	 TQGVECTOR_CPP
 #include "ntqgvector.h"
diff --git a/src/tools/qlocale.cpp b/src/tools/qlocale.cpp
index 0714dbb88..af45c13e0 100644
--- a/src/tools/qlocale.cpp
+++ b/src/tools/qlocale.cpp
@@ -5684,7 +5684,6 @@ static char *qdtoa ( double d, int mode, int ndigits, int *decpt, int *sign, cha
     // Some values of the floating-point control word can cause _qdtoa to crash with an underflow.
     // We set a safe value here.
 #ifdef Q_OS_WIN
-#ifndef Q_CC_BOR
     unsigned int oldbits = _control87(0, 0);
 #ifndef _M_X64 //x64 does not support precition control
     _control87(0x9001F, 0xFFFFF);
@@ -5692,7 +5691,6 @@ static char *qdtoa ( double d, int mode, int ndigits, int *decpt, int *sign, cha
     _control87(0x9001F, _MCW_DN|_MCW_EM|_MCW_RC);
 #endif //_M_X64
 #endif
-#endif
 
 #ifdef Q_OS_LINUX
     fenv_t envp;
@@ -5702,7 +5700,6 @@ static char *qdtoa ( double d, int mode, int ndigits, int *decpt, int *sign, cha
     char *s = _qdtoa(d, mode, ndigits, decpt, sign, rve, resultp);
 
 #ifdef Q_OS_WIN
-#ifndef Q_CC_BOR
     _clear87();
 #ifndef _M_X64
     _control87(oldbits, 0xFFFFF);
@@ -5710,7 +5707,6 @@ static char *qdtoa ( double d, int mode, int ndigits, int *decpt, int *sign, cha
     _control87(oldbits, _MCW_DN|_MCW_EM|_MCW_RC);
 #endif //_M_X64
 #endif
-#endif
 
 #ifdef Q_OS_LINUX
     fesetenv(&envp);
diff --git a/src/tools/qt_tools.pri b/src/tools/qt_tools.pri
index 175cc88e4..c988be7b0 100644
--- a/src/tools/qt_tools.pri
+++ b/src/tools/qt_tools.pri
@@ -79,8 +79,6 @@ tools {
 		  $$TOOLS_CPP/qthreadstorage_win.cpp \
 		  $$TOOLS_CPP/qcriticalsection_p.cpp
 
-	win32-borland:SOURCES += $$TOOLS_CPP/qwinexport.cpp
-
 	wince-* {
 		SOURCES -= $$TOOLS_CPP/qdir_win.cpp \
 			   $$TOOLS_CPP/qfile_win.cpp \
diff --git a/src/widgets/qiconview.cpp b/src/widgets/qiconview.cpp
index 154702ea7..1854cf78e 100644
--- a/src/widgets/qiconview.cpp
+++ b/src/widgets/qiconview.cpp
@@ -39,11 +39,6 @@
 **********************************************************************/
 
 #include "ntqglobal.h"
-#if defined(Q_CC_BOR)
-// needed for qsort() because of a std namespace problem on Borland
-#include "qplatformdefs.h"
-#endif
-
 #include "ntqiconview.h"
 
 #ifndef TQT_NO_ICONVIEW
@@ -431,7 +426,6 @@ void TQIconViewItemLineEdit::keyPressEvent( TQKeyEvent *e )
 
 void TQIconViewItemLineEdit::focusOutEvent( TQFocusEvent *e )
 {
-    Q_UNUSED(e) // I need this to get rid of a Borland warning
     if ( e->reason() != TQFocusEvent::Popup )
 	item->cancelRenameItem();
 }
diff --git a/src/widgets/qlistbox.cpp b/src/widgets/qlistbox.cpp
index 3669b3e25..cc5077abc 100644
--- a/src/widgets/qlistbox.cpp
+++ b/src/widgets/qlistbox.cpp
@@ -39,11 +39,6 @@
 **********************************************************************/
 
 #include "ntqglobal.h"
-#if defined(Q_CC_BOR)
-// needed for qsort() because of a std namespace problem on Borland
-#include "qplatformdefs.h"
-#endif
-
 #include "ntqlistbox.h"
 #ifndef TQT_NO_LISTBOX
 #include "ntqmemarray.h"
diff --git a/src/xml/qt_xml.pri b/src/xml/qt_xml.pri
index cba8404ac..03d7dbb82 100644
--- a/src/xml/qt_xml.pri
+++ b/src/xml/qt_xml.pri
@@ -3,8 +3,4 @@
 xml {
 	HEADERS += $$XML_H/ntqxml.h $$XML_H/ntqdom.h $$XML_CPP/qsvgdevice_p.h
 	SOURCES += $$XML_CPP/qxml.cpp $$XML_CPP/qdom.cpp $$XML_CPP/qsvgdevice.cpp
-	win32-borland {
-		QMAKE_CFLAGS_WARN_ON	+= -w-use
-		QMAKE_CXXFLAGS_WARN_ON	+= -w-use
-	}
 }
diff --git a/tools/designer/uilib/uilib.pro b/tools/designer/uilib/uilib.pro
index bc1fe2b86..10b1ba834 100644
--- a/tools/designer/uilib/uilib.pro
+++ b/tools/designer/uilib/uilib.pro
@@ -13,7 +13,7 @@ sql:SOURCES += 		  ../designer/database.cpp
 sql:HEADERS +=		  ../designer/database2.h
 
 DEFINES += QT_INTERNAL_XML
-!win32-borland:DEFINES += Q_TEMPLATE_EXTERN=extern
+DEFINES += Q_TEMPLATE_EXTERN=extern
 include( ../../../src/qt_professional.pri )
 TARGET		= tqui
 INCLUDEPATH	+= ../shared
-- 
cgit v1.2.3