summaryrefslogtreecommitdiff
path: root/mkspecs/win32-borland
Unidiff
Diffstat (limited to 'mkspecs/win32-borland') (more/less context) (show whitespace changes)
-rw-r--r--mkspecs/win32-borland/qmake.conf34
-rw-r--r--mkspecs/win32-borland/qplatformdefs.h54
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 @@
3# 3#
4# qmake configuration for Win32/Borland C++ 4# qmake configuration for win32-borland
5#
6# Written for Borland C++.
5# 7#
@@ -8,3 +10,3 @@ MAKEFILE_GENERATOR = BMAKE
8 TEMPLATE = app 10 TEMPLATE = app
9 CONFIG += qt warn_on release 11 CONFIG += qt warn_on release link_prl
10 DEFINES += UNICODE 12 DEFINES += UNICODE
@@ -32,9 +34,8 @@ QMAKE_CFLAGS_YACC =
32 QMAKE_CFLAGS_CONSOLE= -tWC 34 QMAKE_CFLAGS_CONSOLE= -tWC
33 35 QMAKE_CFLAGS_STL_ON=
34!contains(CONFIG,exceptions){ 36 QMAKE_CFLAGS_STL_OFF=
35 QMAKE_CFLAGS += -x- 37 QMAKE_CFLAGS_RTTI_ON=
36} 38 QMAKE_CFLAGS_RTTI_OFF= -RT-
37!contains(CONFIG,rtti){ 39QMAKE_CFLAGS_EXCEPTIONS_ON =
38 QMAKE_CFLAGS+= -RT- $(CFLAGS_EXTRA) 40QMAKE_CFLAGS_EXCEPTIONS_OFF = -x-
39}
40 41
@@ -52,2 +53,8 @@ QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
52 QMAKE_CXXFLAGS_CONSOLE= $$QMAKE_CFLAGS_CONSOLE 53 QMAKE_CXXFLAGS_CONSOLE= $$QMAKE_CFLAGS_CONSOLE
54 QMAKE_CXXFLAGS_STL_ON= $$QMAKE_CFLAGS_STL_ON
55 QMAKE_CXXFLAGS_STL_OFF= $$QMAKE_CFLAGS_STL_OFF
56 QMAKE_CXXFLAGS_RTTI_ON= $$QMAKE_CFLAGS_RTTI_ON
57 QMAKE_CXXFLAGS_RTTI_OFF= $$QMAKE_CFLAGS_RTTI_OFF
58QMAKE_CXXFLAGS_EXCEPTIONS_ON = $$QMAKE_CFLAGS_EXCEPTIONS_ON
59QMAKE_CXXFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF
53 60
@@ -72,3 +79,3 @@ QMAKE_LFLAGS_WINDOWS_DLL= -Gi -aa -Tpd c0d32.obj
72 79
73 QMAKE_LIBS = $(LIBS_EXTRA) 80 QMAKE_LIBS = import32.lib $(LIBS_EXTRA)
74 QMAKE_LIBS_RT = cw32i.lib 81 QMAKE_LIBS_RT = cw32i.lib
@@ -90,3 +97,3 @@ QMAKE_IDL = midl
90 QMAKE_LIB = tlib /C /P256 97 QMAKE_LIB = tlib /C /P256
91 QMAKE_RC = brcc32 98 QMAKE_RC = brcc32 -dQ_CC_BOR
92 99
@@ -96,2 +103,5 @@ QMAKE_COPY = copy
96 QMAKE_MOVE = move 103 QMAKE_MOVE = move
97 QMAKE_DEL = del 104 QMAKE_DEL_FILE = del
105 QMAKE_DEL_DIR = rmdir
106 QMAKE_CHK_DIR_EXISTS= if not exist
107 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 @@
30#if __BORLANDC__ >= 0x550 30#if __BORLANDC__ >= 0x550
31#ifdef QT_LARGE_FILE_SUPPORT 31// Borland Builder 6
32
33#ifdef QT_LARGEFILE_SUPPORT
32 #define QT_STATBUF struct stati64 // non-ANSI defs 34 #define QT_STATBUF struct stati64 // non-ANSI defs
33 #define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs 35 # define QT_STATBUF4TSTAT struct stati64 // non-ANSI defs
34 #define QT_STAT ::stati64 36 # define QT_STAT ::_stati64
35 #define QT_FSTAT ::fstati64 37 #define QT_FSTAT ::fstati64
38 # define QT_LSEEK ::_lseeki64
39 # define QT_TSTAT ::_tstati64
36#else 40#else
@@ -40,3 +44,6 @@
40 #define QT_FSTAT ::fstat 44 #define QT_FSTAT ::fstat
45 # define QT_LSEEK ::_lseek
46 # define QT_TSTAT ::_tstat
41#endif 47#endif
48
42 # define QT_STAT_REG _S_IFREG 49 # define QT_STAT_REG _S_IFREG
@@ -44,2 +51,3 @@
44 # define QT_STAT_MASK _S_IFMT 51 # define QT_STAT_MASK _S_IFMT
52
45# if defined(_S_IFLNK) 53# if defined(_S_IFLNK)
@@ -47,2 +55,3 @@
47# endif 55# endif
56
48 # define QT_FILENO _fileno 57 # define QT_FILENO _fileno
@@ -50,9 +59,3 @@
50 # define QT_CLOSE ::_close 59 # define QT_CLOSE ::_close
51#ifdef QT_LARGE_FILE_SUPPORT 60
52 #define QT_LSEEK ::_lseeki64
53 #define QT_TSTAT ::_tstati64
54#else
55 #define QT_LSEEK ::_lseek
56 #define QT_TSTAT ::_tstat
57#endif
58 # define QT_READ ::_read 61 # define QT_READ ::_read
@@ -70,2 +73,3 @@
70 # define QT_OPEN_APPEND _O_APPEND 73 # define QT_OPEN_APPEND _O_APPEND
74
71# if defined(O_TEXT) 75# if defined(O_TEXT)
@@ -74,4 +78,7 @@
74# endif 78# endif
75 #else // all other systems 79
76#ifdef QT_LARGE_FILE_SUPPORT 80#else
81// Borland Builder 5
82
83#ifdef QT_LARGEFILE_SUPPORT
77 #define QT_STATBUF struct stati64 // non-ANSI defs 84 #define QT_STATBUF struct stati64 // non-ANSI defs
@@ -80,2 +87,4 @@
80 #define QT_FSTAT ::fstati64 87 #define QT_FSTAT ::fstati64
88 # define QT_LSEEK ::lseeki64
89 # define QT_TSTAT ::tstati64
81#else 90#else
@@ -85,3 +94,6 @@
85 #define QT_FSTAT ::fstat 94 #define QT_FSTAT ::fstat
95 # define QT_LSEEK ::lseek
96 # define QT_TSTAT ::tstat
86#endif 97#endif
98
87 # define QT_STAT_REG S_IFREG 99 # define QT_STAT_REG S_IFREG
@@ -89,2 +101,3 @@
89 # define QT_STAT_MASK S_IFMT 101 # define QT_STAT_MASK S_IFMT
102
90# if defined(S_IFLNK) 103# if defined(S_IFLNK)
@@ -92,2 +105,3 @@
92# endif 105# endif
106
93 # define QT_FILENO fileno 107 # define QT_FILENO fileno
@@ -95,9 +109,3 @@
95 # define QT_CLOSE ::close 109 # define QT_CLOSE ::close
96#ifdef QT_LARGE_FILE_SUPPORT 110
97 #define QT_LSEEK ::lseeki64
98 #define QT_TSTAT ::tstati64
99#else
100 #define QT_LSEEK ::lseek
101 #define QT_TSTAT ::tstat
102#endif
103 # define QT_READ ::read 111 # define QT_READ ::read
@@ -105,2 +113,3 @@
105 # define QT_ACCESS ::access 113 # define QT_ACCESS ::access
114
106# if defined(Q_OS_OS2EMX) 115# if defined(Q_OS_OS2EMX)
@@ -114,2 +123,3 @@
114# endif 123# endif
124
115 # define QT_MKDIR ::mkdir 125 # define QT_MKDIR ::mkdir
@@ -122,2 +132,3 @@
122 # define QT_OPEN_APPEND O_APPEND 132 # define QT_OPEN_APPEND O_APPEND
133
123# if defined(O_TEXT) 134# if defined(O_TEXT)
@@ -126,3 +137,6 @@
126# endif 137# endif
127#endif 138
139#endif // __BORLANDC__ >= 0x550
140
141// Borland Builder 5 and 6
128 142