| -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 @@ # # qmake configuration for sco-cc # +# Written for SCO OpenServer with UDK. +# # -Wf,--diag_suppress,838 # turns off warning about missing return types in X headers # MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt warn_on release +CONFIG += qt warn_on release link_prl QMAKE_CC = cc QMAKE_LEX = flex @@ -23,7 +25,6 @@ QMAKE_CFLAGS_RELEASE = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) QMAKE_CFLAGS_DEBUG = -g QMAKE_CFLAGS_SHLIB = -KPIC QMAKE_CFLAGS_YACC = -Wf,--diag_suppress,111 -Wf,--diag_suppress,177 -QMAKE_CFLAGS_THREAD = -Kthread QMAKE_CXX = CC 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 QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD QMAKE_INCDIR = QMAKE_LIBDIR = @@ -52,24 +52,20 @@ QMAKE_LFLAGS_DEBUG = QMAKE_LFLAGS_SHLIB = -G QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -h$$LITERAL_WHITESPACE -QMAKE_LFLAGS_THREAD = -Kthread QMAKE_LIBS = $(LIBS_EXTRA) QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm QMAKE_LIBS_X11SM = -lSM -lICE QMAKE_LIBS_QT = -lqt -QMAKE_LIBS_QT_THREAD = -lqt-mt -QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -lXt -lSM -lICE +QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -lXt QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -QMAKE_LIBS_THREAD = - QMAKE_MOC = $(QTDIR)/bin/moc QMAKE_UIC = $(QTDIR)/bin/uic -QMAKE_AR = ar cqs +QMAKE_AR = ar cq QMAKE_RANLIB = QMAKE_TAR = tar -cf @@ -79,3 +75,5 @@ QMAKE_COPY = cp -f QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir +QMAKE_CHK_DIR_EXISTS = test -d +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 @@ // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs -// This is to have PATH_MAX defined in <limits.h> -#ifndef _IBCS2 -# define _IBCS2 -#endif - #include <unistd.h> @@ -31,6 +26,7 @@ #include <sys/types.h> #include <sys/ioctl.h> +#include <sys/filio.h> #include <sys/ipc.h> #include <sys/time.h> #include <sys/shm.h> @@ -80,7 +76,7 @@ #define QT_SIGNAL_ARGS int #define QT_SIGNAL_IGNORE SIG_IGN -#define QT_SOCKLEN_T int +#define QT_SOCKLEN_T size_t #define QT_SNPRINTF ::snprintf #define QT_VSNPRINTF ::vsnprintf |