-rw-r--r-- | mkspecs/sco-cc/qmake.conf | 16 | ||||
-rw-r--r-- | mkspecs/sco-cc/qplatformdefs.h | 8 |
2 files changed, 9 insertions, 15 deletions
diff --git a/mkspecs/sco-cc/qmake.conf b/mkspecs/sco-cc/qmake.conf index 4da6809..5d6c7dc 100644 --- a/mkspecs/sco-cc/qmake.conf +++ b/mkspecs/sco-cc/qmake.conf | |||
@@ -3,13 +3,15 @@ | |||
3 | # | 3 | # |
4 | # qmake configuration for sco-cc | 4 | # qmake configuration for sco-cc |
5 | # | 5 | # |
6 | # Written for SCO OpenServer with UDK. | ||
7 | # | ||
6 | # -Wf,--diag_suppress,838 | 8 | # -Wf,--diag_suppress,838 |
7 | # turns off warning about missing return types in X headers | 9 | # turns off warning about missing return types in X headers |
8 | # | 10 | # |
9 | 11 | ||
10 | MAKEFILE_GENERATOR= UNIX | 12 | MAKEFILE_GENERATOR= UNIX |
11 | TEMPLATE = app | 13 | TEMPLATE = app |
12 | CONFIG += qt warn_on release | 14 | CONFIG += qt warn_on release link_prl |
13 | 15 | ||
14 | QMAKE_CC = cc | 16 | QMAKE_CC = cc |
15 | QMAKE_LEX = flex | 17 | QMAKE_LEX = flex |
@@ -23,7 +25,6 @@ QMAKE_CFLAGS_RELEASE = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) | |||
23 | QMAKE_CFLAGS_DEBUG= -g | 25 | QMAKE_CFLAGS_DEBUG= -g |
24 | QMAKE_CFLAGS_SHLIB= -KPIC | 26 | QMAKE_CFLAGS_SHLIB= -KPIC |
25 | QMAKE_CFLAGS_YACC= -Wf,--diag_suppress,111 -Wf,--diag_suppress,177 | 27 | QMAKE_CFLAGS_YACC= -Wf,--diag_suppress,111 -Wf,--diag_suppress,177 |
26 | QMAKE_CFLAGS_THREAD= -Kthread | ||
27 | 28 | ||
28 | QMAKE_CXX = CC | 29 | QMAKE_CXX = CC |
29 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -Wf,--display_error_number -Wf,--diag_suppress,838 $(CXXFLAGS_EXTRA) | 30 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -Wf,--display_error_number -Wf,--diag_suppress,838 $(CXXFLAGS_EXTRA) |
@@ -33,7 +34,6 @@ QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -Tused | |||
33 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 34 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
34 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 35 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
35 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 36 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
36 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | ||
37 | 37 | ||
38 | QMAKE_INCDIR = | 38 | QMAKE_INCDIR = |
39 | QMAKE_LIBDIR = | 39 | QMAKE_LIBDIR = |
@@ -52,24 +52,20 @@ QMAKE_LFLAGS_DEBUG = | |||
52 | QMAKE_LFLAGS_SHLIB= -G | 52 | QMAKE_LFLAGS_SHLIB= -G |
53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
54 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE | 54 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE |
55 | QMAKE_LFLAGS_THREAD= -Kthread | ||
56 | 55 | ||
57 | QMAKE_LIBS = $(LIBS_EXTRA) | 56 | QMAKE_LIBS = $(LIBS_EXTRA) |
58 | QMAKE_LIBS_DYNLOAD= -ldl | 57 | QMAKE_LIBS_DYNLOAD= -ldl |
59 | QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm | 58 | QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm |
60 | QMAKE_LIBS_X11SM= -lSM -lICE | 59 | QMAKE_LIBS_X11SM= -lSM -lICE |
61 | QMAKE_LIBS_QT = -lqt | 60 | QMAKE_LIBS_QT = -lqt |
62 | QMAKE_LIBS_QT_THREAD= -lqt-mt | ||
63 | 61 | ||
64 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt -lSM -lICE | 62 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt |
65 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 63 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
66 | 64 | ||
67 | QMAKE_LIBS_THREAD= | ||
68 | |||
69 | QMAKE_MOC = $(QTDIR)/bin/moc | 65 | QMAKE_MOC = $(QTDIR)/bin/moc |
70 | QMAKE_UIC = $(QTDIR)/bin/uic | 66 | QMAKE_UIC = $(QTDIR)/bin/uic |
71 | 67 | ||
72 | QMAKE_AR = ar cqs | 68 | QMAKE_AR = ar cq |
73 | QMAKE_RANLIB = | 69 | QMAKE_RANLIB = |
74 | 70 | ||
75 | QMAKE_TAR = tar -cf | 71 | QMAKE_TAR = tar -cf |
@@ -79,3 +75,5 @@ QMAKE_COPY = cp -f | |||
79 | QMAKE_MOVE = mv -f | 75 | QMAKE_MOVE = mv -f |
80 | QMAKE_DEL_FILE = rm -f | 76 | QMAKE_DEL_FILE = rm -f |
81 | QMAKE_DEL_DIR = rmdir | 77 | QMAKE_DEL_DIR = rmdir |
78 | QMAKE_CHK_DIR_EXISTS= test -d | ||
79 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/sco-cc/qplatformdefs.h b/mkspecs/sco-cc/qplatformdefs.h index 4201ed6..06af247 100644 --- a/mkspecs/sco-cc/qplatformdefs.h +++ b/mkspecs/sco-cc/qplatformdefs.h | |||
@@ -7,11 +7,6 @@ | |||
7 | 7 | ||
8 | // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs | 8 | // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs |
9 | 9 | ||
10 | // This is to have PATH_MAX defined in <limits.h> | ||
11 | #ifndef _IBCS2 | ||
12 | # define _IBCS2 | ||
13 | #endif | ||
14 | |||
15 | #include <unistd.h> | 10 | #include <unistd.h> |
16 | 11 | ||
17 | 12 | ||
@@ -31,6 +26,7 @@ | |||
31 | 26 | ||
32 | #include <sys/types.h> | 27 | #include <sys/types.h> |
33 | #include <sys/ioctl.h> | 28 | #include <sys/ioctl.h> |
29 | #include <sys/filio.h> | ||
34 | #include <sys/ipc.h> | 30 | #include <sys/ipc.h> |
35 | #include <sys/time.h> | 31 | #include <sys/time.h> |
36 | #include <sys/shm.h> | 32 | #include <sys/shm.h> |
@@ -80,7 +76,7 @@ | |||
80 | #define QT_SIGNAL_ARGS int | 76 | #define QT_SIGNAL_ARGS int |
81 | #define QT_SIGNAL_IGNORESIG_IGN | 77 | #define QT_SIGNAL_IGNORESIG_IGN |
82 | 78 | ||
83 | #define QT_SOCKLEN_T int | 79 | #define QT_SOCKLEN_T size_t |
84 | 80 | ||
85 | #define QT_SNPRINTF ::snprintf | 81 | #define QT_SNPRINTF ::snprintf |
86 | #define QT_VSNPRINTF ::vsnprintf | 82 | #define QT_VSNPRINTF ::vsnprintf |