author | zecke <zecke> | 2004-07-18 19:32:20 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-07-18 19:32:20 (UTC) |
commit | 8795812a0d763742a5273f356c35313af0fed84d (patch) (unidiff) | |
tree | 34b7259e1595e53e1fa2069d7d79bbdef67293e8 /mkspecs/win32-borland | |
parent | 8e8fcd65b8d8657650728bae604c5a34dc31338e (diff) | |
download | opie-8795812a0d763742a5273f356c35313af0fed84d.zip opie-8795812a0d763742a5273f356c35313af0fed84d.tar.gz opie-8795812a0d763742a5273f356c35313af0fed84d.tar.bz2 |
-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
-rw-r--r-- | mkspecs/win32-borland/qmake.conf | 34 | ||||
-rw-r--r-- | mkspecs/win32-borland/qplatformdefs.h | 174 |
2 files changed, 116 insertions, 92 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 | |||
@@ -1,15 +1,17 @@ | |||
1 | # | 1 | # |
2 | # $Id$ | 2 | # $Id$ |
3 | # | 3 | # |
4 | # qmake configuration for Win32/Borland C++ | 4 | # qmake configuration for win32-borland |
5 | # | ||
6 | # Written for Borland C++. | ||
5 | # | 7 | # |
6 | 8 | ||
7 | MAKEFILE_GENERATOR= BMAKE | 9 | 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 |
11 | QMAKE_NOFORCE = 1 | 13 | QMAKE_NOFORCE = 1 |
12 | 14 | ||
13 | exists( $(QTDIR)\.qtwinconfig ) { | 15 | exists( $(QTDIR)\.qtwinconfig ) { |
14 | include( $(QTDIR)\.qtwinconfig ) | 16 | include( $(QTDIR)\.qtwinconfig ) |
15 | } | 17 | } |
@@ -27,19 +29,18 @@ QMAKE_CFLAGS_DEBUG = -v | |||
27 | QMAKE_CFLAGS_MT = -tWM | 29 | QMAKE_CFLAGS_MT = -tWM |
28 | QMAKE_CFLAGS_MT_DBG= -tWM | 30 | QMAKE_CFLAGS_MT_DBG= -tWM |
29 | QMAKE_CFLAGS_MT_DLL= -tWM | 31 | QMAKE_CFLAGS_MT_DLL= -tWM |
30 | QMAKE_CFLAGS_MT_DLLDBG= -tWM | 32 | QMAKE_CFLAGS_MT_DLLDBG= -tWM |
31 | QMAKE_CFLAGS_YACC= | 33 | 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){ | 39 | QMAKE_CFLAGS_EXCEPTIONS_ON = |
38 | QMAKE_CFLAGS+= -RT- $(CFLAGS_EXTRA) | 40 | QMAKE_CFLAGS_EXCEPTIONS_OFF = -x- |
39 | } | ||
40 | 41 | ||
41 | QMAKE_CXX = $$QMAKE_CC | 42 | QMAKE_CXX = $$QMAKE_CC |
42 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 43 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
43 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 44 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
44 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 45 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
45 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 46 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
@@ -47,12 +48,18 @@ QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG | |||
47 | QMAKE_CXXFLAGS_MT= $$QMAKE_CFLAGS_MT | 48 | QMAKE_CXXFLAGS_MT= $$QMAKE_CFLAGS_MT |
48 | QMAKE_CXXFLAGS_MT_DBG= $$QMAKE_CFLAGS_MT_DBG | 49 | QMAKE_CXXFLAGS_MT_DBG= $$QMAKE_CFLAGS_MT_DBG |
49 | QMAKE_CXXFLAGS_MT_DLL= $$QMAKE_CFLAGS_MT_DLL | 50 | QMAKE_CXXFLAGS_MT_DLL= $$QMAKE_CFLAGS_MT_DLL |
50 | QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG | 51 | QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG |
51 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 52 | 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 | ||
58 | QMAKE_CXXFLAGS_EXCEPTIONS_ON = $$QMAKE_CFLAGS_EXCEPTIONS_ON | ||
59 | QMAKE_CXXFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF | ||
53 | 60 | ||
54 | QMAKE_INCDIR = | 61 | QMAKE_INCDIR = |
55 | QMAKE_INCDIR_QT = $(QTDIR)\include | 62 | QMAKE_INCDIR_QT = $(QTDIR)\include |
56 | QMAKE_LIBDIR = $(BCB)\lib | 63 | QMAKE_LIBDIR = $(BCB)\lib |
57 | QMAKE_LIBDIR_QT = $(QTDIR)\lib | 64 | QMAKE_LIBDIR_QT = $(QTDIR)\lib |
58 | 65 | ||
@@ -67,13 +74,13 @@ QMAKE_LFLAGS_RELEASE = | |||
67 | QMAKE_LFLAGS_DEBUG= -v | 74 | QMAKE_LFLAGS_DEBUG= -v |
68 | QMAKE_LFLAGS_CONSOLE= -ap -Tpe c0x32.obj | 75 | QMAKE_LFLAGS_CONSOLE= -ap -Tpe c0x32.obj |
69 | QMAKE_LFLAGS_WINDOWS= -aa -Tpe c0w32.obj | 76 | QMAKE_LFLAGS_WINDOWS= -aa -Tpe c0w32.obj |
70 | QMAKE_LFLAGS_CONSOLE_DLL= -Gi -ap -Tpd c0d32.obj | 77 | QMAKE_LFLAGS_CONSOLE_DLL= -Gi -ap -Tpd c0d32.obj |
71 | QMAKE_LFLAGS_WINDOWS_DLL= -Gi -aa -Tpd c0d32.obj | 78 | 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 |
75 | QMAKE_LIBS_RTMT = cw32mti.lib | 82 | QMAKE_LIBS_RTMT = cw32mti.lib |
76 | QMAKE_LIBS_CONSOLE= | 83 | QMAKE_LIBS_CONSOLE= |
77 | QMAKE_LIBS_WINDOWS= | 84 | QMAKE_LIBS_WINDOWS= |
78 | QMAKE_LIBS_QT = qt.lib | 85 | QMAKE_LIBS_QT = qt.lib |
79 | QMAKE_LIBS_QT_THREAD= qtmt.lib | 86 | QMAKE_LIBS_QT_THREAD= qtmt.lib |
@@ -85,13 +92,16 @@ QMAKE_LFLAGS_OPENGL = /dopengl32.dll | |||
85 | QMAKE_MOC = $(QTDIR)\bin\moc.exe | 92 | QMAKE_MOC = $(QTDIR)\bin\moc.exe |
86 | QMAKE_UIC = $(QTDIR)\bin\uic.exe | 93 | QMAKE_UIC = $(QTDIR)\bin\uic.exe |
87 | QMAKE_IDC = $(QTDIR)\bin\idc.exe | 94 | QMAKE_IDC = $(QTDIR)\bin\idc.exe |
88 | 95 | ||
89 | QMAKE_IDL = midl | 96 | 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 | ||
93 | QMAKE_ZIP = zip -r -9 | 100 | QMAKE_ZIP = zip -r -9 |
94 | 101 | ||
95 | QMAKE_COPY = copy | 102 | 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 | |||
@@ -25,110 +25,124 @@ | |||
25 | #include <sys/stat.h> | 25 | #include <sys/stat.h> |
26 | #include <dos.h> | 26 | #include <dos.h> |
27 | #include <stdlib.h> | 27 | #include <stdlib.h> |
28 | #include <windows.h> | 28 | #include <windows.h> |
29 | 29 | ||
30 | #if __BORLANDC__ >= 0x550 | 30 | #if __BORLANDC__ >= 0x550 |
31 | #ifdef QT_LARGE_FILE_SUPPORT | 31 | // Borland Builder 6 |
32 | #define QT_STATBUF struct stati64 // non-ANSI defs | 32 | |
33 | #define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs | 33 | #ifdef QT_LARGEFILE_SUPPORT |
34 | #define QT_STAT ::stati64 | 34 | # define QT_STATBUF struct stati64 // non-ANSI defs |
35 | #define QT_FSTAT ::fstati64 | 35 | # define QT_STATBUF4TSTAT struct stati64 // non-ANSI defs |
36 | # define QT_STAT ::_stati64 | ||
37 | # define QT_FSTAT ::fstati64 | ||
38 | # define QT_LSEEK ::_lseeki64 | ||
39 | # define QT_TSTAT ::_tstati64 | ||
36 | #else | 40 | #else |
37 | #define QT_STATBUF struct stat // non-ANSI defs | 41 | # define QT_STATBUF struct stat // non-ANSI defs |
38 | #define QT_STATBUF4TSTAT struct _stat // non-ANSI defs | 42 | # define QT_STATBUF4TSTAT struct _stat // non-ANSI defs |
39 | #define QT_STAT ::stat | 43 | # define QT_STAT ::stat |
40 | #define QT_FSTAT ::fstat | 44 | # define QT_FSTAT ::fstat |
45 | # define QT_LSEEK ::_lseek | ||
46 | # define QT_TSTAT ::_tstat | ||
41 | #endif | 47 | #endif |
42 | # define QT_STAT_REG _S_IFREG | 48 | |
43 | # define QT_STAT_DIR _S_IFDIR | 49 | #define QT_STAT_REG _S_IFREG |
44 | # define QT_STAT_MASK _S_IFMT | 50 | #define QT_STAT_DIR _S_IFDIR |
45 | # if defined(_S_IFLNK) | 51 | #define QT_STAT_MASK _S_IFMT |
52 | |||
53 | #if defined(_S_IFLNK) | ||
46 | # define QT_STAT_LNK _S_IFLNK | 54 | # define QT_STAT_LNK _S_IFLNK |
47 | # endif | ||
48 | # define QT_FILENO _fileno | ||
49 | # define QT_OPEN ::open | ||
50 | # define QT_CLOSE ::_close | ||
51 | #ifdef QT_LARGE_FILE_SUPPORT | ||
52 | #define QT_LSEEK ::_lseeki64 | ||
53 | #define QT_TSTAT ::_tstati64 | ||
54 | #else | ||
55 | #define QT_LSEEK ::_lseek | ||
56 | #define QT_TSTAT ::_tstat | ||
57 | #endif | 55 | #endif |
58 | # define QT_READ ::_read | 56 | |
59 | # define QT_WRITE ::_write | 57 | #define QT_FILENO _fileno |
60 | # define QT_ACCESS ::_access | 58 | #define QT_OPEN ::open |
61 | # define QT_GETCWD ::_getcwd | 59 | #define QT_CLOSE ::_close |
62 | # define QT_CHDIR ::chdir | 60 | |
63 | # define QT_MKDIR ::_mkdir | 61 | #define QT_READ ::_read |
64 | # define QT_RMDIR ::_rmdir | 62 | #define QT_WRITE ::_write |
65 | # define QT_OPEN_RDONLY _O_RDONLY | 63 | #define QT_ACCESS ::_access |
66 | # define QT_OPEN_WRONLY _O_WRONLY | 64 | #define QT_GETCWD ::_getcwd |
67 | # define QT_OPEN_RDWR _O_RDWR | 65 | #define QT_CHDIR ::chdir |
68 | # define QT_OPEN_CREAT _O_CREAT | 66 | #define QT_MKDIR ::_mkdir |
69 | # define QT_OPEN_TRUNC _O_TRUNC | 67 | #define QT_RMDIR ::_rmdir |
70 | # define QT_OPEN_APPEND _O_APPEND | 68 | #define QT_OPEN_RDONLY _O_RDONLY |
71 | # if defined(O_TEXT) | 69 | #define QT_OPEN_WRONLY _O_WRONLY |
70 | #define QT_OPEN_RDWR _O_RDWR | ||
71 | #define QT_OPEN_CREAT _O_CREAT | ||
72 | #define QT_OPEN_TRUNC _O_TRUNC | ||
73 | #define QT_OPEN_APPEND _O_APPEND | ||
74 | |||
75 | #if defined(O_TEXT) | ||
72 | # define QT_OPEN_TEXT _O_TEXT | 76 | # define QT_OPEN_TEXT _O_TEXT |
73 | # define QT_OPEN_BINARY_O_BINARY | 77 | # define QT_OPEN_BINARY_O_BINARY |
74 | # endif | 78 | #endif |
75 | #else // all other systems | 79 | |
76 | #ifdef QT_LARGE_FILE_SUPPORT | ||
77 | #define QT_STATBUF struct stati64 // non-ANSI defs | ||
78 | #define QT_STATBUF4TSTAT struct stati64 // non-ANSI defs | ||
79 | #define QT_STAT ::stati64 | ||
80 | #define QT_FSTAT ::fstati64 | ||
81 | #else | 80 | #else |
82 | #define QT_STATBUF struct stat // non-ANSI defs | 81 | // Borland Builder 5 |
83 | #define QT_STATBUF4TSTAT struct stat // non-ANSI defs | 82 | |
84 | #define QT_STAT ::stat | 83 | #ifdef QT_LARGEFILE_SUPPORT |
85 | #define QT_FSTAT ::fstat | 84 | # define QT_STATBUF struct stati64 // non-ANSI defs |
85 | # define QT_STATBUF4TSTAT struct stati64 // non-ANSI defs | ||
86 | # define QT_STAT ::stati64 | ||
87 | # define QT_FSTAT ::fstati64 | ||
88 | # define QT_LSEEK ::lseeki64 | ||
89 | # define QT_TSTAT ::tstati64 | ||
90 | #else | ||
91 | # define QT_STATBUF struct stat // non-ANSI defs | ||
92 | # define QT_STATBUF4TSTAT struct stat // non-ANSI defs | ||
93 | # define QT_STAT ::stat | ||
94 | # define QT_FSTAT ::fstat | ||
95 | # define QT_LSEEK ::lseek | ||
96 | # define QT_TSTAT ::tstat | ||
86 | #endif | 97 | #endif |
87 | # define QT_STAT_REG S_IFREG | 98 | |
88 | # define QT_STAT_DIR S_IFDIR | 99 | #define QT_STAT_REG S_IFREG |
89 | # define QT_STAT_MASK S_IFMT | 100 | #define QT_STAT_DIR S_IFDIR |
90 | # if defined(S_IFLNK) | 101 | #define QT_STAT_MASK S_IFMT |
102 | |||
103 | #if defined(S_IFLNK) | ||
91 | # define QT_STAT_LNK S_IFLNK | 104 | # define QT_STAT_LNK S_IFLNK |
92 | # endif | ||
93 | # define QT_FILENO fileno | ||
94 | # define QT_OPEN ::open | ||
95 | # define QT_CLOSE ::close | ||
96 | #ifdef QT_LARGE_FILE_SUPPORT | ||
97 | #define QT_LSEEK ::lseeki64 | ||
98 | #define QT_TSTAT ::tstati64 | ||
99 | #else | ||
100 | #define QT_LSEEK ::lseek | ||
101 | #define QT_TSTAT ::tstat | ||
102 | #endif | 105 | #endif |
103 | # define QT_READ ::read | 106 | |
104 | # define QT_WRITE ::write | 107 | #define QT_FILENO fileno |
105 | # define QT_ACCESS ::access | 108 | #define QT_OPEN ::open |
106 | # if defined(Q_OS_OS2EMX) | 109 | #define QT_CLOSE ::close |
107 | // This is documented in the un*x to OS/2-EMX Porting FAQ: | 110 | |
108 | // http://homepages.tu-darmstadt.de/~st002279/os2/porting.html | 111 | #define QT_READ ::read |
112 | #define QT_WRITE ::write | ||
113 | #define QT_ACCESS ::access | ||
114 | |||
115 | #if defined(Q_OS_OS2EMX) | ||
116 | // This is documented in the un*x to OS/2-EMX Porting FAQ: | ||
117 | // http://homepages.tu-darmstadt.de/~st002279/os2/porting.html | ||
109 | # define QT_GETCWD ::_getcwd2 | 118 | # define QT_GETCWD ::_getcwd2 |
110 | # define QT_CHDIR ::_chdir2 | 119 | # define QT_CHDIR ::_chdir2 |
111 | # else | 120 | #else |
112 | # define QT_GETCWD ::getcwd | 121 | # define QT_GETCWD ::getcwd |
113 | # define QT_CHDIR ::chdir | 122 | # define QT_CHDIR ::chdir |
114 | # endif | 123 | #endif |
115 | # define QT_MKDIR ::mkdir | 124 | |
116 | # define QT_RMDIR ::rmdir | 125 | #define QT_MKDIR ::mkdir |
117 | # define QT_OPEN_RDONLY O_RDONLY | 126 | #define QT_RMDIR ::rmdir |
118 | # define QT_OPEN_WRONLY O_WRONLY | 127 | #define QT_OPEN_RDONLY O_RDONLY |
119 | # define QT_OPEN_RDWR O_RDWR | 128 | #define QT_OPEN_WRONLY O_WRONLY |
120 | # define QT_OPEN_CREAT O_CREAT | 129 | #define QT_OPEN_RDWR O_RDWR |
121 | # define QT_OPEN_TRUNC O_TRUNC | 130 | #define QT_OPEN_CREAT O_CREAT |
122 | # define QT_OPEN_APPEND O_APPEND | 131 | #define QT_OPEN_TRUNC O_TRUNC |
123 | # if defined(O_TEXT) | 132 | #define QT_OPEN_APPEND O_APPEND |
133 | |||
134 | #if defined(O_TEXT) | ||
124 | # define QT_OPEN_TEXT O_TEXT | 135 | # define QT_OPEN_TEXT O_TEXT |
125 | # define QT_OPEN_BINARYO_BINARY | 136 | # define QT_OPEN_BINARYO_BINARY |
126 | # endif | ||
127 | #endif | 137 | #endif |
128 | 138 | ||
139 | #endif // __BORLANDC__ >= 0x550 | ||
140 | |||
141 | // Borland Builder 5 and 6 | ||
142 | |||
129 | #define QT_SIGNAL_ARGS int | 143 | #define QT_SIGNAL_ARGS int |
130 | 144 | ||
131 | #define QT_VSNPRINTF ::_vsnprintf | 145 | #define QT_VSNPRINTF ::_vsnprintf |
132 | #define QT_SNPRINTF ::_snprintf | 146 | #define QT_SNPRINTF ::_snprintf |
133 | 147 | ||
134 | # define F_OK0 | 148 | # define F_OK0 |