-CHECK if DIR exist added to qmake.conf's

-use arm-linux-g++ for linking now

hopefully not removed anything important

Added python tool to opiefy mkspecs

2 files changed, 56 insertions, 32 deletions

diff --git a/mkspecs/win32-borland/qmake.conf b/mkspecs/win32-borland/qmake.conf
index c5d3ea5..7aed9e8 100644
--- a/mkspecs/win32-borland/qmake.conf
+++ b/mkspecs/win32-borland/qmake.conf
@@ -3,3 +3,5 @@
 #
-# qmake configuration for Win32/Borland C++
+# qmake configuration for win32-borland
+#
+# Written for Borland C++.
 #
@@ -8,3 +10,3 @@ MAKEFILE_GENERATOR	= BMAKE
 TEMPLATE		= app
-CONFIG			+= qt warn_on release
+CONFIG			+= qt warn_on release link_prl
 DEFINES			+= UNICODE
@@ -32,9 +34,8 @@ QMAKE_CFLAGS_YACC	=
 QMAKE_CFLAGS_CONSOLE	= -tWC
-
-!contains(CONFIG,exceptions){
-	QMAKE_CFLAGS += -x-
-}
-!contains(CONFIG,rtti){
-	QMAKE_CFLAGS	+= -RT- $(CFLAGS_EXTRA)
-}
+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-
 
@@ -52,2 +53,8 @@ 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
 
@@ -72,3 +79,3 @@ QMAKE_LFLAGS_WINDOWS_DLL= -Gi -aa -Tpd c0d32.obj
 
-QMAKE_LIBS		= $(LIBS_EXTRA)
+QMAKE_LIBS		= import32.lib $(LIBS_EXTRA)
 QMAKE_LIBS_RT		= cw32i.lib
@@ -90,3 +97,3 @@ QMAKE_IDL		= midl
 QMAKE_LIB		= tlib /C /P256
-QMAKE_RC		= brcc32
+QMAKE_RC		= brcc32 -dQ_CC_BOR
 
@@ -96,2 +103,5 @@ QMAKE_COPY		= copy
 QMAKE_MOVE		= move
-QMAKE_DEL		= del
+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
index 5babada..121f863 100644
--- a/mkspecs/win32-borland/qplatformdefs.h
+++ b/mkspecs/win32-borland/qplatformdefs.h
@@ -30,7 +30,11 @@
 #if __BORLANDC__ >= 0x550
-#ifdef QT_LARGE_FILE_SUPPORT
+// 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_STATBUF4TSTAT	struct stati64		// non-ANSI defs
+#  define QT_STAT		::_stati64
 #define QT_FSTAT		::fstati64
+#  define QT_LSEEK		::_lseeki64
+#  define QT_TSTAT		::_tstati64
 #else
@@ -40,3 +44,6 @@
 #define QT_FSTAT		::fstat
+#  define QT_LSEEK		::_lseek
+#  define QT_TSTAT		::_tstat
 #endif
+
 # define QT_STAT_REG		_S_IFREG
@@ -44,2 +51,3 @@
 # define QT_STAT_MASK		_S_IFMT
+
 # if defined(_S_IFLNK)
@@ -47,2 +55,3 @@
 # endif
+
 # define QT_FILENO		_fileno
@@ -50,9 +59,3 @@
 # define QT_CLOSE		::_close
-#ifdef QT_LARGE_FILE_SUPPORT
-#define QT_LSEEK		::_lseeki64
-#define QT_TSTAT		::_tstati64
-#else
-#define QT_LSEEK		::_lseek
-#define QT_TSTAT		::_tstat
-#endif
+
 # define QT_READ		::_read
@@ -70,2 +73,3 @@
 # define QT_OPEN_APPEND		_O_APPEND
+
 # if defined(O_TEXT)
@@ -74,4 +78,7 @@
 # endif
-#else						// all other systems
-#ifdef QT_LARGE_FILE_SUPPORT
+
+#else
+// Borland Builder 5
+
+#ifdef QT_LARGEFILE_SUPPORT
 #define QT_STATBUF		struct stati64		// non-ANSI defs
@@ -80,2 +87,4 @@
 #define QT_FSTAT		::fstati64
+#  define QT_LSEEK		::lseeki64
+#  define QT_TSTAT		::tstati64
 #else
@@ -85,3 +94,6 @@
 #define QT_FSTAT		::fstat
+#  define QT_LSEEK		::lseek
+#  define QT_TSTAT		::tstat
 #endif
+
 # define QT_STAT_REG		S_IFREG
@@ -89,2 +101,3 @@
 # define QT_STAT_MASK		S_IFMT
+
 # if defined(S_IFLNK)
@@ -92,2 +105,3 @@
 # endif
+
 # define QT_FILENO		fileno
@@ -95,9 +109,3 @@
 # define QT_CLOSE		::close
-#ifdef QT_LARGE_FILE_SUPPORT
-#define QT_LSEEK		::lseeki64
-#define QT_TSTAT		::tstati64
-#else
-#define QT_LSEEK		::lseek
-#define QT_TSTAT		::tstat
-#endif
+
 # define QT_READ		::read
@@ -105,2 +113,3 @@
 # define QT_ACCESS		::access
+
 # if defined(Q_OS_OS2EMX)
@@ -114,2 +123,3 @@
 # endif
+
 # define QT_MKDIR		::mkdir
@@ -122,2 +132,3 @@
 # define QT_OPEN_APPEND		O_APPEND
+
 # if defined(O_TEXT)
@@ -126,3 +137,6 @@
 # endif
-#endif
+
+#endif // __BORLANDC__ >= 0x550
+
+// Borland Builder 5 and 6