107 files changed, 2558 insertions, 438 deletions
diff --git a/mkspecs/aix-g++-64/qmake.conf b/mkspecs/aix-g++-64/qmake.conf new file mode 100755 index 0000000..abc111e --- a/dev/null +++ b/mkspecs/aix-g++-64/qmake.conf | |||
| @@ -0,0 +1,81 @@ | |||
| 1 | # | ||
| 2 | # $Id$ | ||
| 3 | # | ||
| 4 | # qmake configuration for aix-g++-64 | ||
| 5 | # | ||
| 6 | |||
| 7 | MAKEFILE_GENERATOR= UNIX | ||
| 8 | TEMPLATE = app | ||
| 9 | CONFIG += qt warn_on release link_prl | ||
| 10 | |||
| 11 | QMAKE_CC = gcc | ||
| 12 | QMAKE_LEX = flex | ||
| 13 | QMAKE_LEXFLAGS = | ||
| 14 | QMAKE_YACC = yacc | ||
| 15 | QMAKE_YACCFLAGS = -d | ||
| 16 | QMAKE_CFLAGS = -maix64 $(CFLAGS_EXTRA) | ||
| 17 | QMAKE_CFLAGS_DEPS= -M | ||
| 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W | ||
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | ||
| 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | ||
| 21 | QMAKE_CFLAGS_DEBUG= -g | ||
| 22 | QMAKE_CFLAGS_SHLIB= | ||
| 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | ||
| 24 | QMAKE_CFLAGS_THREAD= -D_THREAD_SAFE | ||
| 25 | |||
| 26 | QMAKE_CXX = g++ | ||
| 27 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | ||
| 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | ||
| 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | ||
| 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | ||
| 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | ||
| 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | ||
| 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | ||
| 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | ||
| 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | ||
| 36 | |||
| 37 | QMAKE_INCDIR = | ||
| 38 | QMAKE_LIBDIR = | ||
| 39 | QMAKE_INCDIR_X11= /usr/X11R6/include | ||
| 40 | QMAKE_LIBDIR_X11= /usr/X11R6/lib | ||
| 41 | QMAKE_INCDIR_QT = $(QTDIR)/include | ||
| 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | ||
| 43 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | ||
| 44 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | ||
| 45 | |||
| 46 | QMAKE_LINK = g++ | ||
| 47 | QMAKE_LINK_SHLIB= g++ | ||
| 48 | QMAKE_LFLAGS = -b64 $(LFLAGS_EXTRA) | ||
| 49 | QMAKE_LFLAGS_RELEASE= | ||
| 50 | QMAKE_LFLAGS_DEBUG= | ||
| 51 | QMAKE_LFLAGS_SHLIB= -shared | ||
| 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | ||
| 53 | QMAKE_LFLAGS_SONAME= | ||
| 54 | QMAKE_LFLAGS_THREAD= -L/usr/lib/threads | ||
| 55 | QMAKE_AIX_SHLIB = 1 | ||
| 56 | |||
| 57 | QMAKE_LIBS = $(LIBS_EXTRA) | ||
| 58 | QMAKE_LIBS_DYNLOAD= -ldl | ||
| 59 | QMAKE_LIBS_X11 = -lXext -lX11 -lm -lbind | ||
| 60 | QMAKE_LIBS_X11SM= -lSM -lICE | ||
| 61 | QMAKE_LIBS_QT = -lqt | ||
| 62 | QMAKE_LIBS_QT_THREAD= -lqt-mt | ||
| 63 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | ||
| 64 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | ||
| 65 | QMAKE_LIBS_THREAD= -lpthreads | ||
| 66 | |||
| 67 | QMAKE_MOC = $(QTDIR)/bin/moc | ||
| 68 | QMAKE_UIC = $(QTDIR)/bin/uic | ||
| 69 | |||
| 70 | QMAKE_AR = ar cqs | ||
| 71 | QMAKE_RANLIB = | ||
| 72 | |||
| 73 | QMAKE_TAR = tar -cf | ||
| 74 | QMAKE_GZIP = gzip -9f | ||
| 75 | |||
| 76 | QMAKE_COPY = cp -f | ||
| 77 | QMAKE_MOVE = mv -f | ||
| 78 | QMAKE_DEL_FILE = rm -f | ||
| 79 | QMAKE_DEL_DIR = rmdir | ||
| 80 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 81 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/aix-g++/qmake.conf b/mkspecs/aix-g++/qmake.conf index c79fe81..92d098b 100644 --- a/mkspecs/aix-g++/qmake.conf +++ b/mkspecs/aix-g++/qmake.conf | |||
| @@ -1,78 +1,81 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for aix-g++ | 4 | # qmake configuration for aix-g++ |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 9 | CONFIG += qt warn_on release link_prl |
| 10 | 10 | ||
| 11 | QMAKE_CC = gcc | 11 | QMAKE_CC = gcc |
| 12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 17 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | 19 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= | 22 | QMAKE_CFLAGS_SHLIB= |
| 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 24 | QMAKE_CFLAGS_THREAD= -D_THREAD_SAFE | 24 | QMAKE_CFLAGS_THREAD= -D_THREAD_SAFE |
| 25 | 25 | ||
| 26 | QMAKE_CXX = g++ | 26 | QMAKE_CXX = g++ |
| 27 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 27 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 36 | 36 | ||
| 37 | QMAKE_INCDIR = | 37 | QMAKE_INCDIR = |
| 38 | QMAKE_LIBDIR = | 38 | QMAKE_LIBDIR = |
| 39 | QMAKE_INCDIR_X11= /usr/X11R6/include | 39 | QMAKE_INCDIR_X11= /usr/X11R6/include |
| 40 | QMAKE_LIBDIR_X11= /usr/X11R6/lib | 40 | QMAKE_LIBDIR_X11= /usr/X11R6/lib |
| 41 | QMAKE_INCDIR_QT = $(QTDIR)/include | 41 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 43 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 43 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 44 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 44 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 45 | 45 | ||
| 46 | QMAKE_LINK = g++ | 46 | QMAKE_LINK = g++ |
| 47 | QMAKE_LINK_SHLIB= g++ | 47 | QMAKE_LINK_SHLIB= g++ |
| 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 49 | QMAKE_LFLAGS_RELEASE= | 49 | QMAKE_LFLAGS_RELEASE= |
| 50 | QMAKE_LFLAGS_DEBUG= | 50 | QMAKE_LFLAGS_DEBUG= |
| 51 | QMAKE_LFLAGS_SHLIB= -shared | 51 | QMAKE_LFLAGS_SHLIB= -shared |
| 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 53 | QMAKE_LFLAGS_SONAME= | 53 | QMAKE_LFLAGS_SONAME= |
| 54 | QMAKE_LFLAGS_THREAD= -L/usr/lib/threads | 54 | QMAKE_LFLAGS_THREAD= -L/usr/lib/threads |
| 55 | QMAKE_AIX_SHLIB = 1 | ||
| 55 | 56 | ||
| 56 | QMAKE_LIBS = $(LIBS_EXTRA) | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 57 | QMAKE_LIBS_DYNLOAD= -ldl | 58 | QMAKE_LIBS_DYNLOAD= -ldl |
| 58 | QMAKE_LIBS_X11 = -lXext -lX11 -lm -lbind | 59 | QMAKE_LIBS_X11 = -lXext -lX11 -lm -lbind |
| 59 | QMAKE_LIBS_X11SM= -lSM -lICE | 60 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 60 | QMAKE_LIBS_QT = -lqt | 61 | QMAKE_LIBS_QT = -lqt |
| 61 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 62 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 62 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 63 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 63 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 64 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 64 | QMAKE_LIBS_THREAD= -lpthreads | 65 | QMAKE_LIBS_THREAD= -lpthreads |
| 65 | 66 | ||
| 66 | QMAKE_MOC = $(QTDIR)/bin/moc | 67 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 67 | QMAKE_UIC = $(QTDIR)/bin/uic | 68 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 68 | 69 | ||
| 69 | QMAKE_AR = ar cqs | 70 | QMAKE_AR = ar cqs |
| 70 | QMAKE_RANLIB = | 71 | QMAKE_RANLIB = |
| 71 | 72 | ||
| 72 | QMAKE_TAR = tar -cf | 73 | QMAKE_TAR = tar -cf |
| 73 | QMAKE_GZIP = gzip -9f | 74 | QMAKE_GZIP = gzip -9f |
| 74 | 75 | ||
| 75 | QMAKE_COPY = cp -f | 76 | QMAKE_COPY = cp -f |
| 76 | QMAKE_MOVE = mv -f | 77 | QMAKE_MOVE = mv -f |
| 77 | QMAKE_DEL_FILE = rm -f | 78 | QMAKE_DEL_FILE = rm -f |
| 78 | QMAKE_DEL_DIR = rmdir | 79 | QMAKE_DEL_DIR = rmdir |
| 80 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 81 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/aix-xlc-64/qmake.conf b/mkspecs/aix-xlc-64/qmake.conf index 2e08cbf..42e362b 100644 --- a/mkspecs/aix-xlc-64/qmake.conf +++ b/mkspecs/aix-xlc-64/qmake.conf | |||
| @@ -1,85 +1,90 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for aix-xlc | 4 | # qmake configuration for aix-xlc |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 9 | CONFIG += qt warn_on release link_prl |
| 10 | 10 | ||
| 11 | QMAKE_CC = xlc | 11 | QMAKE_CC = xlc |
| 12 | QMAKE_CC_THREAD = xlc_r | 12 | QMAKE_CC_THREAD = xlc_r |
| 13 | QMAKE_LEX = flex | 13 | QMAKE_LEX = flex |
| 14 | QMAKE_LEXFLAGS = | 14 | QMAKE_LEXFLAGS = |
| 15 | QMAKE_YACC = yacc | 15 | QMAKE_YACC = yacc |
| 16 | QMAKE_YACCFLAGS = -d | 16 | QMAKE_YACCFLAGS = -d |
| 17 | QMAKE_CFLAGS = -qstrict -q64 $(CFLAGS_EXTRA) | 17 | QMAKE_CFLAGS = -qstrict -q64 $(CFLAGS_EXTRA) |
| 18 | QMAKE_CFLAGS_WARN_ON= -qwarn64 | 18 | # -qwarn64 turns on too many bogus warnings and shadows real warnings |
| 19 | #QMAKE_CFLAGS_WARN_ON= -qwarn64 | ||
| 20 | QMAKE_CFLAGS_WARN_ON = | ||
| 19 | QMAKE_CFLAGS_WARN_OFF= | 21 | QMAKE_CFLAGS_WARN_OFF= |
| 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O3) | 22 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O3) |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 23 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= | 24 | QMAKE_CFLAGS_SHLIB= |
| 23 | QMAKE_CFLAGS_YACC= | 25 | QMAKE_CFLAGS_YACC= |
| 24 | QMAKE_CFLAGS_THREAD= -qthreaded -D_THREAD_SAFE | 26 | QMAKE_CFLAGS_THREAD= -qthreaded |
| 25 | 27 | ||
| 26 | QMAKE_CXX = xlC | 28 | QMAKE_CXX = xlC |
| 27 | QMAKE_CXX_THREAD= xlC_r | 29 | QMAKE_CXX_THREAD= xlC_r |
| 28 | QMAKE_CXXFLAGS = -+ $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 30 | QMAKE_CXXFLAGS = -+ $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 31 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 32 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 33 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 34 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 35 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 36 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 37 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 36 | 38 | ||
| 37 | QMAKE_INCDIR = | 39 | QMAKE_INCDIR = |
| 38 | QMAKE_LIBDIR = | 40 | QMAKE_LIBDIR = |
| 39 | QMAKE_INCDIR_X11= | 41 | QMAKE_INCDIR_X11= |
| 40 | QMAKE_LIBDIR_X11= | 42 | QMAKE_LIBDIR_X11= |
| 41 | QMAKE_INCDIR_QT = $(QTDIR)/include | 43 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 44 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 43 | QMAKE_INCDIR_OPENGL= | 45 | QMAKE_INCDIR_OPENGL= |
| 44 | QMAKE_LIBDIR_OPENGL= | 46 | QMAKE_LIBDIR_OPENGL= |
| 45 | 47 | ||
| 46 | QMAKE_LINK = xlC | 48 | QMAKE_LINK = xlC |
| 47 | QMAKE_LINK_THREAD= xlC_r | 49 | QMAKE_LINK_THREAD= xlC_r |
| 48 | QMAKE_LINK_SHLIB= ld | 50 | QMAKE_LINK_SHLIB= ld |
| 49 | QMAKE_LINK_SHLIB_CMD= makeC++SharedLib -p 0 -X64 \ | 51 | QMAKE_LINK_SHLIB_CMD= makeC++SharedLib -p 0 -X64 \ |
| 50 | -o $(TARGETD) \ | 52 | -o $(TARGETD) \ |
| 51 | $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS); \ | 53 | $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS); \ |
| 52 | $(AR) lib$(QMAKE_TARGET).a $(TARGETD); \ | 54 | $(AR) lib$(QMAKE_TARGET).a $(TARGETD); \ |
| 53 | $(RANLIB) lib$(QMAKE_TARGET).a; \ | 55 | $(RANLIB) lib$(QMAKE_TARGET).a; \ |
| 54 | mv lib$(QMAKE_TARGET).a $(DESTDIR) | 56 | mv lib$(QMAKE_TARGET).a $(DESTDIR) |
| 55 | QMAKE_LFLAGS = -q64 $(LFLAGS_EXTRA) | 57 | QMAKE_LFLAGS = -q64 $(LFLAGS_EXTRA) |
| 56 | QMAKE_LFLAGS_RELEASE= | 58 | QMAKE_LFLAGS_RELEASE= |
| 57 | QMAKE_LFLAGS_DEBUG= | 59 | QMAKE_LFLAGS_DEBUG= |
| 58 | QMAKE_LFLAGS_SHLIB= | 60 | QMAKE_LFLAGS_SHLIB= |
| 59 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 61 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 60 | QMAKE_LFLAGS_SONAME= | 62 | QMAKE_LFLAGS_SONAME= |
| 61 | QMAKE_LFLAGS_THREAD= -L/usr/lib/threads | 63 | QMAKE_LFLAGS_THREAD= -L/usr/lib/threads |
| 64 | QMAKE_AIX_SHLIB = 1 | ||
| 62 | 65 | ||
| 63 | QMAKE_LIBS = $(LIBS_EXTRA) | 66 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 64 | QMAKE_LIBS_DYNLOAD= -ldl | 67 | QMAKE_LIBS_DYNLOAD= -ldl |
| 65 | QMAKE_LIBS_X11 = -lXext -lX11 -lm -lbind | 68 | QMAKE_LIBS_X11 = -lXext -lX11 -lm -lbind |
| 66 | QMAKE_LIBS_X11SM= -lSM -lICE | 69 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 67 | QMAKE_LIBS_QT = -lqt | 70 | QMAKE_LIBS_QT = -lqt |
| 68 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 71 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 69 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 72 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 70 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 73 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 71 | QMAKE_LIBS_THREAD= -lpthreads | 74 | QMAKE_LIBS_THREAD= -lpthreads |
| 72 | 75 | ||
| 73 | QMAKE_MOC = $(QTDIR)/bin/moc | 76 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 74 | QMAKE_UIC = $(QTDIR)/bin/uic | 77 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 75 | 78 | ||
| 76 | QMAKE_AR = ar -X64 cq | 79 | QMAKE_AR = ar -X64 cq |
| 77 | QMAKE_RANLIB = ranlib -X64 | 80 | QMAKE_RANLIB = ranlib -X64 |
| 78 | 81 | ||
| 79 | QMAKE_TAR = tar -cf | 82 | QMAKE_TAR = tar -cf |
| 80 | QMAKE_GZIP = gzip -9f | 83 | QMAKE_GZIP = gzip -9f |
| 81 | 84 | ||
| 82 | QMAKE_COPY = cp -f | 85 | QMAKE_COPY = cp -f |
| 83 | QMAKE_MOVE = mv -f | 86 | QMAKE_MOVE = mv -f |
| 84 | QMAKE_DEL_FILE = rm -f | 87 | QMAKE_DEL_FILE = rm -f |
| 85 | QMAKE_DEL_DIR = rmdir | 88 | QMAKE_DEL_DIR = rmdir |
| 89 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 90 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/aix-xlc/qmake.conf b/mkspecs/aix-xlc/qmake.conf index 76ead61..3ce593c 100644 --- a/mkspecs/aix-xlc/qmake.conf +++ b/mkspecs/aix-xlc/qmake.conf | |||
| @@ -1,85 +1,88 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for aix-xlc | 4 | # qmake configuration for aix-xlc |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 9 | CONFIG += qt warn_on release link_prl |
| 10 | 10 | ||
| 11 | QMAKE_CC = xlc | 11 | QMAKE_CC = xlc |
| 12 | QMAKE_CC_THREAD = xlc_r | 12 | QMAKE_CC_THREAD = xlc_r |
| 13 | QMAKE_LEX = flex | 13 | QMAKE_LEX = flex |
| 14 | QMAKE_LEXFLAGS = | 14 | QMAKE_LEXFLAGS = |
| 15 | QMAKE_YACC = yacc | 15 | QMAKE_YACC = yacc |
| 16 | QMAKE_YACCFLAGS = -d | 16 | QMAKE_YACCFLAGS = -d |
| 17 | QMAKE_CFLAGS = -qstrict $(CFLAGS_EXTRA) | 17 | QMAKE_CFLAGS = -qstrict $(CFLAGS_EXTRA) |
| 18 | QMAKE_CFLAGS_WARN_ON= | 18 | QMAKE_CFLAGS_WARN_ON= |
| 19 | QMAKE_CFLAGS_WARN_OFF= | 19 | QMAKE_CFLAGS_WARN_OFF= |
| 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O3) | 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O3) |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= | 22 | QMAKE_CFLAGS_SHLIB= |
| 23 | QMAKE_CFLAGS_YACC= | 23 | QMAKE_CFLAGS_YACC= |
| 24 | QMAKE_CFLAGS_THREAD= -qthreaded -D_THREAD_SAFE | 24 | QMAKE_CFLAGS_THREAD= -qthreaded |
| 25 | 25 | ||
| 26 | QMAKE_CXX = xlC | 26 | QMAKE_CXX = xlC |
| 27 | QMAKE_CXX_THREAD= xlC_r | 27 | QMAKE_CXX_THREAD= xlC_r |
| 28 | QMAKE_CXXFLAGS = -+ $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 28 | QMAKE_CXXFLAGS = -+ $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 36 | 36 | ||
| 37 | QMAKE_INCDIR = | 37 | QMAKE_INCDIR = |
| 38 | QMAKE_LIBDIR = | 38 | QMAKE_LIBDIR = |
| 39 | QMAKE_INCDIR_X11= | 39 | QMAKE_INCDIR_X11= |
| 40 | QMAKE_LIBDIR_X11= | 40 | QMAKE_LIBDIR_X11= |
| 41 | QMAKE_INCDIR_QT = $(QTDIR)/include | 41 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 43 | QMAKE_INCDIR_OPENGL= | 43 | QMAKE_INCDIR_OPENGL= |
| 44 | QMAKE_LIBDIR_OPENGL= | 44 | QMAKE_LIBDIR_OPENGL= |
| 45 | 45 | ||
| 46 | QMAKE_LINK = xlC | 46 | QMAKE_LINK = xlC |
| 47 | QMAKE_LINK_THREAD= xlC_r | 47 | QMAKE_LINK_THREAD= xlC_r |
| 48 | QMAKE_LINK_SHLIB= ld | 48 | QMAKE_LINK_SHLIB= ld |
| 49 | QMAKE_LINK_SHLIB_CMD= makeC++SharedLib -p 0 \ | 49 | QMAKE_LINK_SHLIB_CMD= makeC++SharedLib -p 0 \ |
| 50 | -o $(TARGETD) \ | 50 | -o $(TARGETD) \ |
| 51 | $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS); \ | 51 | $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS); \ |
| 52 | ar q lib$(QMAKE_TARGET).a $(TARGETD); \ | 52 | $(AR) lib$(QMAKE_TARGET).a $(TARGETD); \ |
| 53 | ranlib lib$(QMAKE_TARGET).a; \ | 53 | $(RANLIB) lib$(QMAKE_TARGET).a; \ |
| 54 | mv lib$(QMAKE_TARGET).a $(DESTDIR) | 54 | mv lib$(QMAKE_TARGET).a $(DESTDIR) |
| 55 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 55 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 56 | QMAKE_LFLAGS_RELEASE= | 56 | QMAKE_LFLAGS_RELEASE= |
| 57 | QMAKE_LFLAGS_DEBUG= | 57 | QMAKE_LFLAGS_DEBUG= |
| 58 | QMAKE_LFLAGS_SHLIB= | 58 | QMAKE_LFLAGS_SHLIB= |
| 59 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 59 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 60 | QMAKE_LFLAGS_SONAME= | 60 | QMAKE_LFLAGS_SONAME= |
| 61 | QMAKE_LFLAGS_THREAD= -L/usr/lib/threads | 61 | QMAKE_LFLAGS_THREAD= -L/usr/lib/threads |
| 62 | QMAKE_AIX_SHLIB = 1 | ||
| 62 | 63 | ||
| 63 | QMAKE_LIBS = $(LIBS_EXTRA) | 64 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 64 | QMAKE_LIBS_DYNLOAD= -ldl | 65 | QMAKE_LIBS_DYNLOAD= -ldl |
| 65 | QMAKE_LIBS_X11 = -lXext -lX11 -lm -lbind | 66 | QMAKE_LIBS_X11 = -lXext -lX11 -lm -lbind |
| 66 | QMAKE_LIBS_X11SM= -lSM -lICE | 67 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 67 | QMAKE_LIBS_QT = -lqt | 68 | QMAKE_LIBS_QT = -lqt |
| 68 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 69 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 69 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 70 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 70 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 71 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 71 | QMAKE_LIBS_THREAD= -lpthreads | 72 | QMAKE_LIBS_THREAD= -lpthreads |
| 72 | 73 | ||
| 73 | QMAKE_MOC = $(QTDIR)/bin/moc | 74 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 74 | QMAKE_UIC = $(QTDIR)/bin/uic | 75 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 75 | 76 | ||
| 76 | QMAKE_AR = ar cq | 77 | QMAKE_AR = ar cq |
| 77 | QMAKE_RANLIB = ranlib | 78 | QMAKE_RANLIB = ranlib |
| 78 | 79 | ||
| 79 | QMAKE_TAR = tar -cf | 80 | QMAKE_TAR = tar -cf |
| 80 | QMAKE_GZIP = gzip -9f | 81 | QMAKE_GZIP = gzip -9f |
| 81 | 82 | ||
| 82 | QMAKE_COPY = cp -f | 83 | QMAKE_COPY = cp -f |
| 83 | QMAKE_MOVE = mv -f | 84 | QMAKE_MOVE = mv -f |
| 84 | QMAKE_DEL_FILE = rm -f | 85 | QMAKE_DEL_FILE = rm -f |
| 85 | QMAKE_DEL_DIR = rmdir | 86 | QMAKE_DEL_DIR = rmdir |
| 87 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 88 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/aix-xlc/qplatformdefs.h b/mkspecs/aix-xlc/qplatformdefs.h index 7685a7b..79afa5d 100644 --- a/mkspecs/aix-xlc/qplatformdefs.h +++ b/mkspecs/aix-xlc/qplatformdefs.h | |||
| @@ -34,72 +34,72 @@ | |||
| 34 | #include <sys/socket.h> | 34 | #include <sys/socket.h> |
| 35 | #include <sys/stat.h> | 35 | #include <sys/stat.h> |
| 36 | #include <sys/wait.h> | 36 | #include <sys/wait.h> |
| 37 | 37 | ||
| 38 | // DNS header files are not fully covered by X/Open specifications. | 38 | // DNS header files are not fully covered by X/Open specifications. |
| 39 | // In particular nothing is said about res_* :/ | 39 | // In particular nothing is said about res_* :/ |
| 40 | // On AIX header files <netinet/in.h> and <arpa/nameser.h> are not | 40 | // On AIX header files <netinet/in.h> and <arpa/nameser.h> are not |
| 41 | // included by <resolv.h>. Note that <arpa/nameser.h> must be included | 41 | // included by <resolv.h>. Note that <arpa/nameser.h> must be included |
| 42 | // before <resolv.h>. | 42 | // before <resolv.h>. |
| 43 | #include <netinet/in.h> | 43 | #include <netinet/in.h> |
| 44 | #define class nsrr_class // AIX 4.3.1.0 | 44 | #define class nsrr_class // AIX 4.3.1.0 |
| 45 | #include <arpa/nameser.h> | 45 | #include <arpa/nameser.h> |
| 46 | #undef class | 46 | #undef class |
| 47 | #include <resolv.h> | 47 | #include <resolv.h> |
| 48 | 48 | ||
| 49 | 49 | ||
| 50 | #if !defined(QT_NO_COMPAT) | 50 | #if !defined(QT_NO_COMPAT) |
| 51 | #define QT_STATBUF struct stat | 51 | #define QT_STATBUF struct stat |
| 52 | #define QT_STATBUF4TSTATstruct stat | 52 | #define QT_STATBUF4TSTATstruct stat |
| 53 | #define QT_STAT ::stat | 53 | #define QT_STAT ::stat |
| 54 | #define QT_FSTAT ::fstat | 54 | #define QT_FSTAT ::fstat |
| 55 | #define QT_STAT_REG S_IFREG | 55 | #define QT_STAT_REG S_IFREG |
| 56 | #define QT_STAT_DIR S_IFDIR | 56 | #define QT_STAT_DIR S_IFDIR |
| 57 | #define QT_STAT_MASK S_IFMT | 57 | #define QT_STAT_MASK S_IFMT |
| 58 | #define QT_STAT_LNK S_IFLNK | 58 | #define QT_STAT_LNK S_IFLNK |
| 59 | #define QT_FILENO fileno | 59 | #define QT_FILENO fileno |
| 60 | #define QT_OPEN ::open | 60 | #define QT_OPEN ::open |
| 61 | #define QT_CLOSE ::close | 61 | #define QT_CLOSE ::close |
| 62 | #define QT_LSEEK ::lseek | 62 | #define QT_LSEEK ::lseek |
| 63 | #define QT_READ ::read | 63 | #define QT_READ ::read |
| 64 | #define QT_WRITE ::write | 64 | #define QT_WRITE ::write |
| 65 | #define QT_ACCESS ::access | 65 | #define QT_ACCESS ::access |
| 66 | #define QT_GETCWD ::getcwd | 66 | #define QT_GETCWD ::getcwd |
| 67 | #define QT_CHDIR ::chdir | 67 | #define QT_CHDIR ::chdir |
| 68 | #define QT_MKDIR ::mkdir | 68 | #define QT_MKDIR ::mkdir |
| 69 | #define QT_RMDIR ::rmdir | 69 | #define QT_RMDIR ::rmdir |
| 70 | #define QT_OPEN_RDONLY O_RDONLY | 70 | #define QT_OPEN_RDONLY O_RDONLY |
| 71 | #define QT_OPEN_WRONLY O_WRONLY | 71 | #define QT_OPEN_WRONLY O_WRONLY |
| 72 | #define QT_OPEN_RDWR O_RDWR | 72 | #define QT_OPEN_RDWR O_RDWR |
| 73 | #define QT_OPEN_CREAT O_CREAT | 73 | #define QT_OPEN_CREAT O_CREAT |
| 74 | #define QT_OPEN_TRUNC O_TRUNC | 74 | #define QT_OPEN_TRUNC O_TRUNC |
| 75 | #define QT_OPEN_APPEND O_APPEND | 75 | #define QT_OPEN_APPEND O_APPEND |
| 76 | #endif | 76 | #endif |
| 77 | 77 | ||
| 78 | #define QT_SIGNAL_RETTYPEvoid | 78 | #define QT_SIGNAL_RETTYPEvoid |
| 79 | #define QT_SIGNAL_ARGS int | 79 | #define QT_SIGNAL_ARGS int |
| 80 | #define QT_SIGNAL_IGNORESIG_IGN | 80 | #define QT_SIGNAL_IGNORESIG_IGN |
| 81 | 81 | ||
| 82 | #ifdef _AIX43 | 82 | #ifdef _AIX43 |
| 83 | // AIX 4.3 | 83 | // AIX 4.3 |
| 84 | // The AIX 4.3 online documentation says 'size_t' but a user asked IBM | 84 | // The AIX 4.3 online documentation says 'size_t' but a user asked IBM |
| 85 | // and they told him the documentation is wrong. And anyway 'socklen_t' | 85 | // and they told him the documentation is wrong. And anyway 'socklen_t' |
| 86 | // reportedly works for all AIX 4.3 users. | 86 | // reportedly works for all AIX 4.3 users. |
| 87 | #define QT_SOCKLEN_T socklen_t | 87 | #define QT_SOCKLEN_T socklen_t |
| 88 | #elif _AIX42 | 88 | #elif _AIX42 |
| 89 | // AIX 4.2 | 89 | // AIX 4.2 |
| 90 | #define QT_SOCKLEN_T size_t | 90 | #define QT_SOCKLEN_T size_t |
| 91 | #else | 91 | #else |
| 92 | // AIX 4.1 | 92 | // AIX 4.1 |
| 93 | #define QT_SOCKLEN_T size_t | 93 | #define QT_SOCKLEN_T size_t |
| 94 | // override | 94 | // override |
| 95 | #define QT_SOCKOPTLEN_T int | 95 | #define QT_SOCKOPTLEN_T int |
| 96 | #endif | 96 | #endif |
| 97 | 97 | ||
| 98 | #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) | 98 | #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500) |
| 99 | // AIX 4.3 and better only | 99 | // AIX 4.3 and better only |
| 100 | #define QT_SNPRINTF ::snprintf | 100 | #define QT_SNPRINTF ::snprintf |
| 101 | #define QT_VSNPRINTF ::vsnprintf | 101 | #define QT_VSNPRINTF ::vsnprintf |
| 102 | #endif | 102 | #endif |
| 103 | 103 | ||
| 104 | 104 | ||
| 105 | #endif // QPLATFORMDEFS_H | 105 | #endif // QPLATFORMDEFS_H |
diff --git a/mkspecs/bsdi-g++/qmake.conf b/mkspecs/bsdi-g++/qmake.conf index be4e125..45cd8fb 100644 --- a/mkspecs/bsdi-g++/qmake.conf +++ b/mkspecs/bsdi-g++/qmake.conf | |||
| @@ -1,82 +1,84 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for bsdi-g++ | 4 | # qmake configuration for bsdi-g++ |
| 5 | # | 5 | # |
| 6 | # Written for WindRiver BSD/OS 4.0. | 6 | # Written for WindRiver BSD/OS 4.0. |
| 7 | # | 7 | # |
| 8 | 8 | ||
| 9 | MAKEFILE_GENERATOR= UNIX | 9 | MAKEFILE_GENERATOR= UNIX |
| 10 | TEMPLATE = app | 10 | TEMPLATE = app |
| 11 | CONFIG += qt warn_on release | 11 | CONFIG += qt warn_on release link_prl |
| 12 | 12 | ||
| 13 | QMAKE_CC = gcc | 13 | QMAKE_CC = gcc |
| 14 | QMAKE_LEX = flex | 14 | QMAKE_LEX = flex |
| 15 | QMAKE_LEXFLAGS = | 15 | QMAKE_LEXFLAGS = |
| 16 | QMAKE_YACC = yacc | 16 | QMAKE_YACC = yacc |
| 17 | QMAKE_YACCFLAGS = -d | 17 | QMAKE_YACCFLAGS = -d |
| 18 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) | 18 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 19 | QMAKE_CFLAGS_DEPS= -M | 19 | QMAKE_CFLAGS_DEPS= -M |
| 20 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 20 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 21 | QMAKE_CFLAGS_WARN_OFF= -w | 21 | QMAKE_CFLAGS_WARN_OFF= -w |
| 22 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 22 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 23 | QMAKE_CFLAGS_DEBUG= -g | 23 | QMAKE_CFLAGS_DEBUG= -g |
| 24 | QMAKE_CFLAGS_SHLIB= -fPIC | 24 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 25 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 25 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 26 | QMAKE_CFLAGS_THREAD= | 26 | QMAKE_CFLAGS_THREAD= |
| 27 | 27 | ||
| 28 | QMAKE_CXX = g++ | 28 | QMAKE_CXX = g++ |
| 29 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 29 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 30 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 30 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 31 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 31 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 32 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 32 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 33 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 33 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 34 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 34 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 35 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 35 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 36 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 36 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 37 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 37 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 38 | 38 | ||
| 39 | 39 | ||
| 40 | QMAKE_INCDIR = | 40 | QMAKE_INCDIR = |
| 41 | QMAKE_LIBDIR = | 41 | QMAKE_LIBDIR = |
| 42 | QMAKE_INCDIR_X11= /usr/X11R6/include | 42 | QMAKE_INCDIR_X11= /usr/X11R6/include |
| 43 | QMAKE_LIBDIR_X11= /usr/X11R6/lib | 43 | QMAKE_LIBDIR_X11= /usr/X11R6/lib |
| 44 | QMAKE_INCDIR_QT = $(QTDIR)/include | 44 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 45 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 45 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 46 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 46 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 47 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 47 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 48 | 48 | ||
| 49 | QMAKE_LINK = g++ | 49 | QMAKE_LINK = g++ |
| 50 | QMAKE_LINK_SHLIB= g++ | 50 | QMAKE_LINK_SHLIB= g++ |
| 51 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 51 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 52 | QMAKE_LFLAGS_RELEASE= | 52 | QMAKE_LFLAGS_RELEASE= |
| 53 | QMAKE_LFLAGS_DEBUG= | 53 | QMAKE_LFLAGS_DEBUG= |
| 54 | QMAKE_LFLAGS_SHLIB= -shared | 54 | QMAKE_LFLAGS_SHLIB= -shared |
| 55 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 55 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 56 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 56 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 57 | QMAKE_LFLAGS_THREAD= | 57 | QMAKE_LFLAGS_THREAD= |
| 58 | QMAKE_RPATH = -Wl,-rpath, | 58 | QMAKE_RPATH = -Wl,-rpath, |
| 59 | 59 | ||
| 60 | QMAKE_LIBS = $(LIBS_EXTRA) | 60 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 61 | QMAKE_LIBS_DYNLOAD= -ldl | 61 | QMAKE_LIBS_DYNLOAD= -ldl |
| 62 | QMAKE_LIBS_X11 = -lXext -lX11 -lm | 62 | QMAKE_LIBS_X11 = -lXext -lX11 -lm |
| 63 | QMAKE_LIBS_X11SM= -lSM -lICE | 63 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 64 | QMAKE_LIBS_QT = -lqt | 64 | QMAKE_LIBS_QT = -lqt |
| 65 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 65 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 66 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 66 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 67 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 67 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 68 | QMAKE_LIBS_THREAD= | 68 | QMAKE_LIBS_THREAD= |
| 69 | 69 | ||
| 70 | QMAKE_MOC = $(QTDIR)/bin/moc | 70 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 71 | QMAKE_UIC = $(QTDIR)/bin/uic | 71 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 72 | 72 | ||
| 73 | QMAKE_AR = ar cqs | 73 | QMAKE_AR = ar cqs |
| 74 | QMAKE_RANLIB = | 74 | QMAKE_RANLIB = |
| 75 | 75 | ||
| 76 | QMAKE_TAR = tar -cf | 76 | QMAKE_TAR = tar -cf |
| 77 | QMAKE_GZIP = gzip -9f | 77 | QMAKE_GZIP = gzip -9f |
| 78 | 78 | ||
| 79 | QMAKE_COPY = cp -f | 79 | QMAKE_COPY = cp -f |
| 80 | QMAKE_MOVE = mv -f | 80 | QMAKE_MOVE = mv -f |
| 81 | QMAKE_DEL_FILE = rm -f | 81 | QMAKE_DEL_FILE = rm -f |
| 82 | QMAKE_DEL_DIR = rmdir | 82 | QMAKE_DEL_DIR = rmdir |
| 83 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 84 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/cygwin-g++/qmake.conf b/mkspecs/cygwin-g++/qmake.conf index 4532c89..7258fa8 100644 --- a/mkspecs/cygwin-g++/qmake.conf +++ b/mkspecs/cygwin-g++/qmake.conf | |||
| @@ -1,80 +1,86 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for cygwin-g++ | 4 | # qmake configuration for cygwin-g++ |
| 5 | # | 5 | # |
| 6 | # Written for Qt/X11 on Cygwin, using the POSIX API. | ||
| 7 | # | ||
| 6 | 8 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 9 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 10 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release incremental | 11 | CONFIG += qt warn_on release incremental link_prl |
| 10 | QMAKE_INCREMENTAL_STYLE = sublib | 12 | QMAKE_INCREMENTAL_STYLE = sublib |
| 11 | 13 | ||
| 12 | QMAKE_CC = gcc | 14 | QMAKE_CC = gcc |
| 13 | QMAKE_LEX = flex | 15 | QMAKE_LEX = flex |
| 14 | QMAKE_LEXFLAGS = | 16 | QMAKE_LEXFLAGS = |
| 15 | QMAKE_YACC = yacc | 17 | QMAKE_YACC = byacc |
| 16 | QMAKE_YACCFLAGS = -d | 18 | QMAKE_YACCFLAGS = -d |
| 17 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 19 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 18 | QMAKE_CFLAGS_DEPS= -M | 20 | QMAKE_CFLAGS_DEPS= -M |
| 19 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 21 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 20 | QMAKE_CFLAGS_WARN_OFF= -w | 22 | QMAKE_CFLAGS_WARN_OFF= -w |
| 21 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 23 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 22 | QMAKE_CFLAGS_DEBUG= -g | 24 | QMAKE_CFLAGS_DEBUG= -g |
| 23 | QMAKE_CFLAGS_SHLIB= | 25 | QMAKE_CFLAGS_SHLIB= |
| 24 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 26 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 25 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 27 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 26 | 28 | ||
| 27 | QMAKE_CXX = g++ | 29 | QMAKE_CXX = g++ |
| 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 30 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 29 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 31 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 32 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 33 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 32 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 34 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 33 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 35 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 34 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 36 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 35 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 37 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 36 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 38 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 37 | 39 | ||
| 38 | QMAKE_INCDIR = | 40 | QMAKE_INCDIR = |
| 39 | QMAKE_LIBDIR = | 41 | QMAKE_LIBDIR = |
| 40 | QMAKE_INCDIR_X11= /usr/X11R6/include | 42 | QMAKE_INCDIR_X11= /usr/X11R6/include |
| 41 | QMAKE_LIBDIR_X11= /usr/X11R6/lib | 43 | QMAKE_LIBDIR_X11= /usr/X11R6/lib |
| 42 | QMAKE_INCDIR_QT = $(QTDIR)/include | 44 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 45 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 44 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 46 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 45 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 47 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 46 | 48 | ||
| 47 | QMAKE_LINK = g++ | 49 | QMAKE_LINK = g++ |
| 48 | QMAKE_LINK_SHLIB= g++ | 50 | QMAKE_LINK_SHLIB= g++ |
| 49 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 51 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 50 | QMAKE_LFLAGS_RELEASE= | 52 | QMAKE_LFLAGS_RELEASE= |
| 51 | QMAKE_LFLAGS_DEBUG= | 53 | QMAKE_LFLAGS_DEBUG= |
| 52 | QMAKE_LFLAGS_SHLIB= -shared | 54 | QMAKE_LFLAGS_SHLIB= -shared |
| 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 55 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 54 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 56 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 55 | QMAKE_LFLAGS_THREAD= | 57 | QMAKE_LFLAGS_THREAD= |
| 56 | QMAKE_RPATH = -Wl,-rpath, | 58 | QMAKE_RPATH = -Wl,-rpath, |
| 57 | 59 | QMAKE_CYGWIN_SHLIB= 1 | |
| 60 | QMAKE_CYGWIN_EXE= 1 | ||
| 61 | |||
| 58 | QMAKE_LIBS = $(LIBS_EXTRA) | 62 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 59 | QMAKE_LIBS_DYNLOAD= -ldl | 63 | QMAKE_LIBS_DYNLOAD= -ldl |
| 60 | QMAKE_LIBS_X11 = -lXext -lX11 | 64 | QMAKE_LIBS_X11 = -lXext -lX11 |
| 61 | QMAKE_LIBS_X11SM= -lSM -lICE | 65 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 62 | QMAKE_LIBS_QT = -lqt | 66 | QMAKE_LIBS_QT = -lqt |
| 63 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 67 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 64 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 68 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 65 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 69 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 66 | QMAKE_LIBS_THREAD= -lpthread | 70 | QMAKE_LIBS_THREAD= -lpthread |
| 67 | 71 | ||
| 68 | QMAKE_MOC = $(QTDIR)/bin/moc | 72 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 69 | QMAKE_UIC = $(QTDIR)/bin/uic | 73 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 70 | 74 | ||
| 71 | QMAKE_AR = ar cqs | 75 | QMAKE_AR = ar cqs |
| 72 | QMAKE_RANLIB = | 76 | QMAKE_RANLIB = |
| 73 | 77 | ||
| 74 | QMAKE_TAR = tar -cf | 78 | QMAKE_TAR = tar -cf |
| 75 | QMAKE_GZIP = gzip -9f | 79 | QMAKE_GZIP = gzip -9f |
| 76 | 80 | ||
| 77 | QMAKE_COPY = cp -f | 81 | QMAKE_COPY = cp -f |
| 78 | QMAKE_MOVE = mv -f | 82 | QMAKE_MOVE = mv -f |
| 79 | QMAKE_DEL_FILE = rm -f | 83 | QMAKE_DEL_FILE = rm -f |
| 80 | QMAKE_DEL_DIR = rmdir | 84 | QMAKE_DEL_DIR = rmdir |
| 85 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 86 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/cygwin-g++/qplatformdefs.h b/mkspecs/cygwin-g++/qplatformdefs.h index b985044..bc04a69 100644 --- a/mkspecs/cygwin-g++/qplatformdefs.h +++ b/mkspecs/cygwin-g++/qplatformdefs.h | |||
| @@ -1,103 +1,105 @@ | |||
| 1 | #ifndef QPLATFORMDEFS_H | 1 | #ifndef QPLATFORMDEFS_H |
| 2 | #define QPLATFORMDEFS_H | 2 | #define QPLATFORMDEFS_H |
| 3 | 3 | ||
| 4 | // Get Qt defines/settings | 4 | // Get Qt defines/settings |
| 5 | 5 | ||
| 6 | #include "qglobal.h" | 6 | #include "qglobal.h" |
| 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 | // DNS system header files are a mess! | 10 | // DNS system header files are a mess! |
| 11 | // <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using | 11 | // <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using |
| 12 | // 'u_char' and includes <sys/types.h>. Now the problem is that | 12 | // 'u_char' and includes <sys/types.h>. Now the problem is that |
| 13 | // <sys/types.h> defines 'u_char' only if __USE_BSD is defined. | 13 | // <sys/types.h> defines 'u_char' only if __USE_BSD is defined. |
| 14 | // __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined. | 14 | // __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined. |
| 15 | #ifndef _BSD_SOURCE | 15 | #ifndef _BSD_SOURCE |
| 16 | # define _BSD_SOURCE | 16 | # define _BSD_SOURCE |
| 17 | #endif | 17 | #endif |
| 18 | 18 | ||
| 19 | // 1) need to reset default environment if _BSD_SOURCE is defined | 19 | // 1) need to reset default environment if _BSD_SOURCE is defined |
| 20 | // 2) need to specify POSIX thread interfaces explicitly in glibc 2.0 | 20 | // 2) need to specify POSIX thread interfaces explicitly in glibc 2.0 |
| 21 | // 3) it seems older glibc need this to include the X/Open stuff | 21 | // 3) it seems older glibc need this to include the X/Open stuff |
| 22 | #ifndef _GNU_SOURCE | 22 | #ifndef _GNU_SOURCE |
| 23 | # define _GNU_SOURCE | 23 | # define _GNU_SOURCE |
| 24 | #endif | 24 | #endif |
| 25 | 25 | ||
| 26 | #include <unistd.h> | 26 | #include <unistd.h> |
| 27 | 27 | ||
| 28 | 28 | ||
| 29 | // We are hot - unistd.h should have turned on the specific APIs we requested | 29 | // We are hot - unistd.h should have turned on the specific APIs we requested |
| 30 | 30 | ||
| 31 | 31 | ||
| 32 | #ifdef QT_THREAD_SUPPORT | 32 | #ifdef QT_THREAD_SUPPORT |
| 33 | #include <pthread.h> | 33 | #include <pthread.h> |
| 34 | #endif | 34 | #endif |
| 35 | 35 | ||
| 36 | #include <dirent.h> | 36 | #include <dirent.h> |
| 37 | #include <fcntl.h> | 37 | #include <fcntl.h> |
| 38 | #include <grp.h> | 38 | #include <grp.h> |
| 39 | #include <pwd.h> | 39 | #include <pwd.h> |
| 40 | #include <signal.h> | 40 | #include <signal.h> |
| 41 | #include <dlfcn.h> | 41 | #include <dlfcn.h> |
| 42 | 42 | ||
| 43 | #include <sys/types.h> | 43 | #include <sys/types.h> |
| 44 | #include <sys/ioctl.h> | 44 | #include <sys/ioctl.h> |
| 45 | #include <sys/ipc.h> | 45 | // Cygwin does not provide <sys/ipc.h> and <sys/shm.h> because it |
| 46 | // doesn't support SysV IPC or shared memory. See for example: | ||
| 47 | // http://afni.nimh.nih.gov/afni/afniboard/messages/1725.html | ||
| 46 | #include <sys/time.h> | 48 | #include <sys/time.h> |
| 47 | #include <sys/shm.h> | ||
| 48 | #include <sys/socket.h> | 49 | #include <sys/socket.h> |
| 49 | #include <sys/stat.h> | 50 | #include <sys/stat.h> |
| 50 | #include <sys/wait.h> | 51 | #include <sys/wait.h> |
| 52 | #include <windows.h> | ||
| 51 | 53 | ||
| 52 | // Resolver functions are not implemented in Cygwin, headers | 54 | // Resolver functions are not implemented in Cygwin, headers |
| 53 | // <arpa/nameser.h> and <resolv.h> are missing: | 55 | // <arpa/nameser.h> and <resolv.h> are missing: |
| 54 | // http://cygwin.com//cgi-bin/cygwin-todo.cgi?20000426.105252 | 56 | // http://cygwin.com//cgi-bin/cygwin-todo.cgi?20000426.105252 |
| 55 | // Maybe bindlib_w32 | 57 | // Maybe bindlib_w32 |
| 56 | // http://www.php.net/extra/bindlib_w32.zip | 58 | // http://www.php.net/extra/bindlib_w32.zip |
| 57 | // or Don Berstein's djbdns: | 59 | // or Don Berstein's djbdns: |
| 58 | // http://cr.yp.to/djbdns.html | 60 | // http://cr.yp.to/djbdns.html |
| 59 | // provide this functionality, but not necessarily under the Cygwin license... | 61 | // provide this functionality, but not necessarily under the Cygwin license... |
| 60 | #include <netinet/in.h> | 62 | #include <netinet/in.h> |
| 61 | 63 | ||
| 62 | 64 | ||
| 63 | #if !defined(QT_NO_COMPAT) | 65 | #if !defined(QT_NO_COMPAT) |
| 64 | #define QT_STATBUF struct stat | 66 | #define QT_STATBUF struct stat |
| 65 | #define QT_STATBUF4TSTATstruct stat | 67 | #define QT_STATBUF4TSTATstruct stat |
| 66 | #define QT_STAT ::stat | 68 | #define QT_STAT ::stat |
| 67 | #define QT_FSTAT ::fstat | 69 | #define QT_FSTAT ::fstat |
| 68 | #define QT_STAT_REG S_IFREG | 70 | #define QT_STAT_REG S_IFREG |
| 69 | #define QT_STAT_DIR S_IFDIR | 71 | #define QT_STAT_DIR S_IFDIR |
| 70 | #define QT_STAT_MASK S_IFMT | 72 | #define QT_STAT_MASK S_IFMT |
| 71 | #define QT_STAT_LNK S_IFLNK | 73 | #define QT_STAT_LNK S_IFLNK |
| 72 | #define QT_FILENO fileno | 74 | #define QT_FILENO fileno |
| 73 | #define QT_OPEN ::open | 75 | #define QT_OPEN ::open |
| 74 | #define QT_CLOSE ::close | 76 | #define QT_CLOSE ::close |
| 75 | #define QT_LSEEK ::lseek | 77 | #define QT_LSEEK ::lseek |
| 76 | #define QT_READ ::read | 78 | #define QT_READ ::read |
| 77 | #define QT_WRITE ::write | 79 | #define QT_WRITE ::write |
| 78 | #define QT_ACCESS ::access | 80 | #define QT_ACCESS ::access |
| 79 | #define QT_GETCWD ::getcwd | 81 | #define QT_GETCWD ::getcwd |
| 80 | #define QT_CHDIR ::chdir | 82 | #define QT_CHDIR ::chdir |
| 81 | #define QT_MKDIR ::mkdir | 83 | #define QT_MKDIR ::mkdir |
| 82 | #define QT_RMDIR ::rmdir | 84 | #define QT_RMDIR ::rmdir |
| 83 | #define QT_OPEN_RDONLY O_RDONLY | 85 | #define QT_OPEN_RDONLY O_RDONLY |
| 84 | #define QT_OPEN_WRONLY O_WRONLY | 86 | #define QT_OPEN_WRONLY O_WRONLY |
| 85 | #define QT_OPEN_RDWR O_RDWR | 87 | #define QT_OPEN_RDWR O_RDWR |
| 86 | #define QT_OPEN_CREAT O_CREAT | 88 | #define QT_OPEN_CREAT O_CREAT |
| 87 | #define QT_OPEN_TRUNC O_TRUNC | 89 | #define QT_OPEN_TRUNC O_TRUNC |
| 88 | #define QT_OPEN_APPEND O_APPEND | 90 | #define QT_OPEN_APPEND O_APPEND |
| 89 | #endif | 91 | #endif |
| 90 | 92 | ||
| 91 | #define QT_SIGNAL_RETTYPEvoid | 93 | #define QT_SIGNAL_RETTYPEvoid |
| 92 | #define QT_SIGNAL_ARGS int | 94 | #define QT_SIGNAL_ARGS int |
| 93 | #define QT_SIGNAL_IGNORESIG_IGN | 95 | #define QT_SIGNAL_IGNORESIG_IGN |
| 94 | 96 | ||
| 95 | #define QT_SOCKLEN_T socklen_t | 97 | #define QT_SOCKLEN_T socklen_t |
| 96 | 98 | ||
| 97 | #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) | 99 | #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) |
| 98 | #define QT_SNPRINTF ::snprintf | 100 | #define QT_SNPRINTF ::snprintf |
| 99 | #define QT_VSNPRINTF ::vsnprintf | 101 | #define QT_VSNPRINTF ::vsnprintf |
| 100 | #endif | 102 | #endif |
| 101 | 103 | ||
| 102 | 104 | ||
| 103 | #endif // QPLATFORMDEFS_H | 105 | #endif // QPLATFORMDEFS_H |
diff --git a/mkspecs/darwin-g++/qmake.conf b/mkspecs/darwin-g++/qmake.conf index 2051427..c53e6e9 100644 --- a/mkspecs/darwin-g++/qmake.conf +++ b/mkspecs/darwin-g++/qmake.conf | |||
| @@ -1,80 +1,92 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for darwin-g++ (Darwin/X11) | 4 | # qmake configuration for darwin-g++ |
| 5 | # | ||
| 6 | # Written for Qt/X11 on Darwin and XFree86. | ||
| 5 | # | 7 | # |
| 6 | 8 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 9 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 10 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release resource_fork | 11 | CONFIG += qt warn_on release native_precompiled_headers |
| 12 | CONFIG += qt warn_on release link_prl | ||
| 13 | DEFINES += __DARWIN_X11__ | ||
| 10 | 14 | ||
| 11 | QMAKE_CC = cc | 15 | QMAKE_CC = cc |
| 12 | QMAKE_LEX = flex | 16 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 17 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 18 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 19 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 20 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 21 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 22 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | 23 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O3) | 24 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 25 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= -fPIC | 26 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 23 | QMAKE_EXTENSION_SHLIB= dylib | 27 | QMAKE_EXTENSION_SHLIB= dylib |
| 28 | QMAKE_EXTENSION_PLUGIN= so | ||
| 24 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 29 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 25 | QMAKE_CFLAGS_THREAD= | 30 | QMAKE_CFLAGS_THREAD= |
| 26 | 31 | ||
| 27 | QMAKE_CXX = c++ | 32 | QMAKE_CXX = c++ |
| 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 33 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 29 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 34 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 35 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 36 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 32 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 37 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 33 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 38 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 34 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 39 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 35 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 40 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 36 | QMAKE_CXXFLAGS_THREAD= | 41 | QMAKE_CXXFLAGS_THREAD= |
| 37 | 42 | ||
| 38 | QMAKE_INCDIR = /usr/local/include | 43 | QMAKE_INCDIR = /usr/local/include |
| 39 | QMAKE_LIBDIR = | 44 | QMAKE_LIBDIR = |
| 40 | QMAKE_INCDIR_X11= /usr/X11R6/include | 45 | QMAKE_INCDIR_X11= /usr/X11R6/include |
| 41 | QMAKE_LIBDIR_X11= /usr/X11R6/lib | 46 | QMAKE_LIBDIR_X11= /usr/X11R6/lib |
| 42 | QMAKE_INCDIR_QT = $(QTDIR)/include | 47 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 48 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 44 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 49 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 45 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 50 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 46 | 51 | ||
| 47 | QMAKE_LINK = c++ | 52 | QMAKE_LINK = c++ |
| 48 | QMAKE_LINK_SHLIB= c++ | 53 | QMAKE_LINK_SHLIB= c++ |
| 49 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 54 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 50 | QMAKE_LFLAGS_RELEASE= | 55 | QMAKE_LFLAGS_RELEASE= |
| 51 | QMAKE_LFLAGS_DEBUG= | 56 | QMAKE_LFLAGS_DEBUG= |
| 52 | QMAKE_LFLAGS_SHLIB= -dynamiclib | 57 | QMAKE_LFLAGS_APP = -prebind |
| 58 | QMAKE_LFLAGS_SHLIB= -prebind -dynamiclib -single_module -headerpad_max_install_names | ||
| 53 | QMAKE_LFLAGS_PLUGIN= -bundle | 59 | QMAKE_LFLAGS_PLUGIN= -bundle |
| 54 | QMAKE_LFLAGS_THREAD= | 60 | QMAKE_LFLAGS_THREAD= |
| 61 | |||
| 62 | QMAKE_LFLAGS_VERSION = -current_version$${LITERAL_WHITESPACE} | ||
| 63 | QMAKE_LFLAGS_COMPAT_VERSION = -compatibility_version$${LITERAL_WHITESPACE} | ||
| 64 | |||
| 55 | QMAKE_RPATH = | 65 | QMAKE_RPATH = |
| 56 | 66 | ||
| 57 | QMAKE_LIBS_DYNLOAD= | 67 | QMAKE_LIBS_DYNLOAD= |
| 58 | QMAKE_LIBS_X11 = -lXext -lX11 -lm | 68 | QMAKE_LIBS_X11 = -lXext -lX11 -lm |
| 59 | QMAKE_LIBS_X11SM= -lSM -lICE | 69 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 60 | QMAKE_LIBS_QT = -lqt | 70 | QMAKE_LIBS_QT = -lqt |
| 61 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 71 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 62 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 72 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 63 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 73 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 64 | QMAKE_LIBS_THREAD= | 74 | QMAKE_LIBS_THREAD= |
| 65 | 75 | ||
| 66 | QMAKE_MOC = $(QTDIR)/bin/moc | 76 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 67 | QMAKE_UIC = $(QTDIR)/bin/uic | 77 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 68 | 78 | ||
| 69 | QMAKE_AR = ar cq | 79 | QMAKE_AR = ar cq |
| 70 | QMAKE_RANLIB = ranlib -s | 80 | QMAKE_RANLIB = ranlib -s |
| 71 | 81 | ||
| 72 | QMAKE_TAR = tar -cf | 82 | QMAKE_TAR = tar -cf |
| 73 | QMAKE_GZIP = gzip -9f | 83 | QMAKE_GZIP = gzip -9f |
| 74 | 84 | ||
| 75 | QMAKE_COPY = cp -f | 85 | QMAKE_COPY = cp -f |
| 76 | QMAKE_COPY_FILE = $$QMAKE_COPY | 86 | QMAKE_COPY_FILE = $$QMAKE_COPY |
| 77 | QMAKE_COPY_DIR = $$QMAKE_COPY -r | 87 | QMAKE_COPY_DIR = $$QMAKE_COPY -r |
| 78 | QMAKE_MOVE = mv -f | 88 | QMAKE_MOVE = mv -f |
| 79 | QMAKE_DEL_FILE = rm -f | 89 | QMAKE_DEL_FILE = rm -f |
| 80 | QMAKE_DEL_DIR = rmdir | 90 | QMAKE_DEL_DIR = rmdir |
| 91 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 92 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/darwin-g++/qplatformdefs.h b/mkspecs/darwin-g++/qplatformdefs.h index 9f09f4c..0a1b602 100644 --- a/mkspecs/darwin-g++/qplatformdefs.h +++ b/mkspecs/darwin-g++/qplatformdefs.h | |||
| @@ -18,66 +18,68 @@ | |||
| 18 | #endif | 18 | #endif |
| 19 | 19 | ||
| 20 | #include <dirent.h> | 20 | #include <dirent.h> |
| 21 | #include <fcntl.h> | 21 | #include <fcntl.h> |
| 22 | #include <grp.h> | 22 | #include <grp.h> |
| 23 | #include <pwd.h> | 23 | #include <pwd.h> |
| 24 | #include <signal.h> | 24 | #include <signal.h> |
| 25 | 25 | ||
| 26 | #include <sys/types.h> | 26 | #include <sys/types.h> |
| 27 | #include <sys/ioctl.h> | 27 | #include <sys/ioctl.h> |
| 28 | #include <sys/ipc.h> | 28 | #include <sys/ipc.h> |
| 29 | #include <sys/time.h> | 29 | #include <sys/time.h> |
| 30 | #include <sys/shm.h> | 30 | #include <sys/shm.h> |
| 31 | #include <sys/socket.h> | 31 | #include <sys/socket.h> |
| 32 | #include <sys/stat.h> | 32 | #include <sys/stat.h> |
| 33 | #include <sys/wait.h> | 33 | #include <sys/wait.h> |
| 34 | 34 | ||
| 35 | // DNS header files are not fully covered by X/Open specifications. | 35 | // DNS header files are not fully covered by X/Open specifications. |
| 36 | // In particular nothing is said about res_* :/ | 36 | // In particular nothing is said about res_* :/ |
| 37 | // On BSDs header files <netinet/in.h> and <arpa/nameser.h> are not | 37 | // On BSDs header files <netinet/in.h> and <arpa/nameser.h> are not |
| 38 | // included by <resolv.h>. Note that <arpa/nameser.h> must be included | 38 | // included by <resolv.h>. Note that <arpa/nameser.h> must be included |
| 39 | // before <resolv.h>. | 39 | // before <resolv.h>. |
| 40 | #include <netinet/in.h> | 40 | #include <netinet/in.h> |
| 41 | #include <arpa/nameser.h> | 41 | #include <arpa/nameser.h> |
| 42 | #include <resolv.h> | 42 | #include <resolv.h> |
| 43 | 43 | ||
| 44 | 44 | ||
| 45 | #if !defined(QT_NO_COMPAT) | 45 | #if !defined(QT_NO_COMPAT) |
| 46 | #define QT_STATBUF struct stat | 46 | #define QT_STATBUF struct stat |
| 47 | #define QT_STATBUF4TSTATstruct stat | 47 | #define QT_STATBUF4TSTATstruct stat |
| 48 | #define QT_STAT ::stat | 48 | #define QT_STAT ::stat |
| 49 | #define QT_FSTAT ::fstat | 49 | #define QT_FSTAT ::fstat |
| 50 | #define QT_STAT_REG S_IFREG | 50 | #define QT_STAT_REG S_IFREG |
| 51 | #define QT_STAT_DIR S_IFDIR | 51 | #define QT_STAT_DIR S_IFDIR |
| 52 | #define QT_STAT_MASK S_IFMT | 52 | #define QT_STAT_MASK S_IFMT |
| 53 | #define QT_STAT_LNK S_IFLNK | 53 | #define QT_STAT_LNK S_IFLNK |
| 54 | #define QT_FILENO fileno | 54 | #define QT_FILENO fileno |
| 55 | #define QT_OPEN ::open | 55 | #define QT_OPEN ::open |
| 56 | #define QT_CLOSE ::close | 56 | #define QT_CLOSE ::close |
| 57 | #define QT_LSEEK ::lseek | 57 | #define QT_LSEEK ::lseek |
| 58 | #define QT_READ ::read | 58 | #define QT_READ ::read |
| 59 | #define QT_WRITE ::write | 59 | #define QT_WRITE ::write |
| 60 | #define QT_ACCESS ::access | 60 | #define QT_ACCESS ::access |
| 61 | #define QT_GETCWD ::getcwd | 61 | #define QT_GETCWD ::getcwd |
| 62 | #define QT_CHDIR ::chdir | 62 | #define QT_CHDIR ::chdir |
| 63 | #define QT_MKDIR ::mkdir | 63 | #define QT_MKDIR ::mkdir |
| 64 | #define QT_RMDIR ::rmdir | 64 | #define QT_RMDIR ::rmdir |
| 65 | #define QT_OPEN_RDONLY O_RDONLY | 65 | #define QT_OPEN_RDONLY O_RDONLY |
| 66 | #define QT_OPEN_WRONLY O_WRONLY | 66 | #define QT_OPEN_WRONLY O_WRONLY |
| 67 | #define QT_OPEN_RDWR O_RDWR | 67 | #define QT_OPEN_RDWR O_RDWR |
| 68 | #define QT_OPEN_CREAT O_CREAT | 68 | #define QT_OPEN_CREAT O_CREAT |
| 69 | #define QT_OPEN_TRUNC O_TRUNC | 69 | #define QT_OPEN_TRUNC O_TRUNC |
| 70 | #define QT_OPEN_APPEND O_APPEND | 70 | #define QT_OPEN_APPEND O_APPEND |
| 71 | #endif | 71 | #endif |
| 72 | 72 | ||
| 73 | #define QT_SIGNAL_RETTYPEvoid | 73 | #define QT_SIGNAL_RETTYPEvoid |
| 74 | #define QT_SIGNAL_ARGS int | 74 | #define QT_SIGNAL_ARGS int |
| 75 | #define QT_SIGNAL_IGNORESIG_IGN | 75 | #define QT_SIGNAL_IGNORESIG_IGN |
| 76 | 76 | ||
| 77 | #define QT_SOCKLEN_T int | 77 | #define QT_SOCKLEN_T int |
| 78 | 78 | ||
| 79 | #define QT_SNPRINTF ::snprintf | 79 | #define QT_SNPRINTF ::snprintf |
| 80 | #define QT_VSNPRINTF ::vsnprintf | 80 | #define QT_VSNPRINTF ::vsnprintf |
| 81 | 81 | ||
| 82 | #define QT_AOUT_UNDERSCORE | ||
| 83 | |||
| 82 | 84 | ||
| 83 | #endif // QPLATFORMDEFS_H | 85 | #endif // QPLATFORMDEFS_H |
diff --git a/mkspecs/dgux-g++/qmake.conf b/mkspecs/dgux-g++/qmake.conf index c8c7527..011a1c7 100644 --- a/mkspecs/dgux-g++/qmake.conf +++ b/mkspecs/dgux-g++/qmake.conf | |||
| @@ -1,75 +1,77 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for dgux-g++ | 4 | # qmake configuration for dgux-g++ |
| 5 | # | 5 | # |
| 6 | # Written for DG/UX R4.20MU06. | 6 | # Written for DG/UX R4.20MU06. |
| 7 | # | 7 | # |
| 8 | 8 | ||
| 9 | MAKEFILE_GENERATOR= UNIX | 9 | MAKEFILE_GENERATOR= UNIX |
| 10 | TEMPLATE = app | 10 | TEMPLATE = app |
| 11 | CONFIG += qt warn_on release | 11 | CONFIG += qt warn_on release link_prl |
| 12 | 12 | ||
| 13 | QMAKE_CC = gcc | 13 | QMAKE_CC = gcc |
| 14 | QMAKE_LEX = flex | 14 | QMAKE_LEX = flex |
| 15 | QMAKE_LEXFLAGS = | 15 | QMAKE_LEXFLAGS = |
| 16 | QMAKE_YACC = yacc | 16 | QMAKE_YACC = yacc |
| 17 | QMAKE_YACCFLAGS = -d | 17 | QMAKE_YACCFLAGS = -d |
| 18 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) | 18 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 19 | QMAKE_CFLAGS_DEPS= -M | 19 | QMAKE_CFLAGS_DEPS= -M |
| 20 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 20 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 21 | QMAKE_CFLAGS_WARN_OFF= -w | 21 | QMAKE_CFLAGS_WARN_OFF= -w |
| 22 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 22 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 23 | QMAKE_CFLAGS_DEBUG= -g | 23 | QMAKE_CFLAGS_DEBUG= -g |
| 24 | QMAKE_CFLAGS_SHLIB= -fPIC | 24 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 25 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 25 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 26 | 26 | ||
| 27 | QMAKE_CXX = g++ | 27 | QMAKE_CXX = g++ |
| 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 29 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 29 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 32 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 32 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 33 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 33 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 34 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 34 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 35 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 35 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 36 | 36 | ||
| 37 | QMAKE_INCDIR = | 37 | QMAKE_INCDIR = |
| 38 | QMAKE_LIBDIR = | 38 | QMAKE_LIBDIR = |
| 39 | QMAKE_INCDIR_X11= /usr/X11R6/include | 39 | QMAKE_INCDIR_X11= /usr/X11R6/include |
| 40 | QMAKE_LIBDIR_X11= /usr/X11R6/lib | 40 | QMAKE_LIBDIR_X11= /usr/X11R6/lib |
| 41 | QMAKE_INCDIR_QT = $(QTDIR)/include | 41 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 43 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 43 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 44 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 44 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 45 | 45 | ||
| 46 | QMAKE_LINK = g++ | 46 | QMAKE_LINK = g++ |
| 47 | QMAKE_LINK_SHLIB= g++ | 47 | QMAKE_LINK_SHLIB= g++ |
| 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 49 | QMAKE_LFLAGS_RELEASE= | 49 | QMAKE_LFLAGS_RELEASE= |
| 50 | QMAKE_LFLAGS_DEBUG= | 50 | QMAKE_LFLAGS_DEBUG= |
| 51 | QMAKE_LFLAGS_SHLIB= -shared | 51 | QMAKE_LFLAGS_SHLIB= -shared |
| 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 53 | QMAKE_LFLAGS_SONAME= -Wl,-h, | 53 | QMAKE_LFLAGS_SONAME= -Wl,-h, |
| 54 | 54 | ||
| 55 | QMAKE_LIBS = $(LIBS_EXTRA) | 55 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 56 | QMAKE_LIBS_DYNLOAD= -ldl | 56 | QMAKE_LIBS_DYNLOAD= -ldl |
| 57 | QMAKE_LIBS_X11 = -lXext -lX11 -lm | 57 | QMAKE_LIBS_X11 = -lXext -lX11 -lm |
| 58 | QMAKE_LIBS_QT = -lqt | 58 | QMAKE_LIBS_QT = -lqt |
| 59 | 59 | ||
| 60 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 60 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 61 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 61 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 62 | 62 | ||
| 63 | QMAKE_MOC = $(QTDIR)/bin/moc | 63 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 64 | QMAKE_UIC = $(QTDIR)/bin/uic | 64 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 65 | 65 | ||
| 66 | QMAKE_AR = ar cq | 66 | QMAKE_AR = ar cq |
| 67 | QMAKE_RANLIB = | 67 | QMAKE_RANLIB = |
| 68 | 68 | ||
| 69 | QMAKE_TAR = tar -cf | 69 | QMAKE_TAR = tar -cf |
| 70 | QMAKE_GZIP = gzip -9f | 70 | QMAKE_GZIP = gzip -9f |
| 71 | 71 | ||
| 72 | QMAKE_COPY = cp -f | 72 | QMAKE_COPY = cp -f |
| 73 | QMAKE_MOVE = mv -f | 73 | QMAKE_MOVE = mv -f |
| 74 | QMAKE_DEL_FILE = rm -f | 74 | QMAKE_DEL_FILE = rm -f |
| 75 | QMAKE_DEL_DIR = rmdir | 75 | QMAKE_DEL_DIR = rmdir |
| 76 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 77 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/freebsd-g++/qmake.conf b/mkspecs/freebsd-g++/qmake.conf index 3269c83..ac7f728 100644 --- a/mkspecs/freebsd-g++/qmake.conf +++ b/mkspecs/freebsd-g++/qmake.conf | |||
| @@ -1,80 +1,82 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for freebsd-g++ | 4 | # qmake configuration for freebsd-g++ |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 9 | CONFIG += qt warn_on release link_prl |
| 10 | 10 | ||
| 11 | QMAKE_CC = gcc | 11 | QMAKE_CC = gcc |
| 12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 17 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | 19 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= -fPIC | 22 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 24 | QMAKE_CFLAGS_THREAD= -pthread -D_THREAD_SAFE | 24 | QMAKE_CFLAGS_THREAD= -pthread -D_THREAD_SAFE |
| 25 | 25 | ||
| 26 | QMAKE_CXX = g++ | 26 | QMAKE_CXX = g++ |
| 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 28 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 28 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 36 | 36 | ||
| 37 | # Addon software goes into /usr/local on the BSDs, by default we will look there | 37 | # Addon software goes into /usr/local on the BSDs, by default we will look there |
| 38 | QMAKE_INCDIR = /usr/local/include | 38 | QMAKE_INCDIR = /usr/local/include |
| 39 | QMAKE_LIBDIR = /usr/local/lib | 39 | QMAKE_LIBDIR = /usr/local/lib |
| 40 | QMAKE_INCDIR_X11= /usr/X11R6/include | 40 | QMAKE_INCDIR_X11= /usr/X11R6/include |
| 41 | QMAKE_LIBDIR_X11= /usr/X11R6/lib | 41 | QMAKE_LIBDIR_X11= /usr/X11R6/lib |
| 42 | QMAKE_INCDIR_QT = $(QTDIR)/include | 42 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 44 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 44 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 45 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 45 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 46 | 46 | ||
| 47 | QMAKE_LINK = g++ | 47 | QMAKE_LINK = g++ |
| 48 | QMAKE_LINK_SHLIB= g++ | 48 | QMAKE_LINK_SHLIB= g++ |
| 49 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 49 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 50 | QMAKE_LFLAGS_RELEASE= | 50 | QMAKE_LFLAGS_RELEASE= |
| 51 | QMAKE_LFLAGS_DEBUG= | 51 | QMAKE_LFLAGS_DEBUG= |
| 52 | QMAKE_LFLAGS_SHLIB= -shared | 52 | QMAKE_LFLAGS_SHLIB= -shared |
| 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 54 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 54 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 55 | QMAKE_LFLAGS_THREAD= -pthread | 55 | QMAKE_LFLAGS_THREAD= -pthread |
| 56 | QMAKE_RPATH = -Wl,-rpath, | 56 | QMAKE_RPATH = -Wl,-rpath, |
| 57 | 57 | ||
| 58 | QMAKE_LIBS = $(LIBS_EXTRA) | 58 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 59 | QMAKE_LIBS_DYNLOAD= | 59 | QMAKE_LIBS_DYNLOAD= |
| 60 | QMAKE_LIBS_X11 = -lXext -lX11 -lm | 60 | QMAKE_LIBS_X11 = -lXext -lX11 -lm |
| 61 | QMAKE_LIBS_X11SM= -lSM -lICE | 61 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 62 | QMAKE_LIBS_QT = -lqt | 62 | QMAKE_LIBS_QT = -lqt |
| 63 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 63 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 64 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 64 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 65 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 65 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 66 | QMAKE_LIBS_THREAD= | 66 | QMAKE_LIBS_THREAD= |
| 67 | 67 | ||
| 68 | QMAKE_MOC = $(QTDIR)/bin/moc | 68 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 69 | QMAKE_UIC = $(QTDIR)/bin/uic | 69 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 70 | 70 | ||
| 71 | QMAKE_AR = ar cqs | 71 | QMAKE_AR = ar cqs |
| 72 | QMAKE_RANLIB = | 72 | QMAKE_RANLIB = |
| 73 | 73 | ||
| 74 | QMAKE_TAR = tar -cf | 74 | QMAKE_TAR = tar -cf |
| 75 | QMAKE_GZIP = gzip -9f | 75 | QMAKE_GZIP = gzip -9f |
| 76 | 76 | ||
| 77 | QMAKE_COPY = cp -f | 77 | QMAKE_COPY = cp -f |
| 78 | QMAKE_MOVE = mv -f | 78 | QMAKE_MOVE = mv -f |
| 79 | QMAKE_DEL_FILE = rm -f | 79 | QMAKE_DEL_FILE = rm -f |
| 80 | QMAKE_DEL_DIR = rmdir | 80 | QMAKE_DEL_DIR = rmdir |
| 81 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 82 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/hpux-acc-64/qmake.conf b/mkspecs/hpux-acc-64/qmake.conf index 7ce4711..d43273e 100644 --- a/mkspecs/hpux-acc-64/qmake.conf +++ b/mkspecs/hpux-acc-64/qmake.conf | |||
| @@ -1,121 +1,126 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for hpux-n64 | 4 | # qmake configuration for hpux-n64 |
| 5 | # | 5 | # |
| 6 | # We define _POSIX_C_SOURCE to 199506L when using threads, therefore | 6 | # We define _POSIX_C_SOURCE to 199506L when using threads, therefore |
| 7 | # we also need to redefine _HPUX_SOURCE. | 7 | # we also need to redefine _HPUX_SOURCE. |
| 8 | # From pthread(3t): | 8 | # From pthread(3t): |
| 9 | # Some documentation will recommend the use of -D_REENTRANT for | 9 | # Some documentation will recommend the use of -D_REENTRANT for |
| 10 | # compilation. While this also functions properly, it is considered | 10 | # compilation. While this also functions properly, it is considered |
| 11 | # an obsolescent form. | 11 | # an obsolescent form. |
| 12 | # See pthread(3t) for more details. | 12 | # See pthread(3t) for more details. |
| 13 | # | 13 | # |
| 14 | # From the "HP aC++ Online Programmer's Guide": | 14 | # From the "HP aC++ Online Programmer's Guide": |
| 15 | # When +DA2.0W is specified: | 15 | # When +DA2.0W is specified: |
| 16 | # * 64-bit SVR4 Executable and Linking Format (ELF) object files | 16 | # * 64-bit SVR4 Executable and Linking Format (ELF) object files |
| 17 | # are generated for PA-RISC 2.0. | 17 | # are generated for PA-RISC 2.0. |
| 18 | # * The preprocessor predefined macro, __LP64__ is defined. | 18 | # * The preprocessor predefined macro, __LP64__ is defined. |
| 19 | # * The correct path for 64-bit system and language libraries is | 19 | # * The correct path for 64-bit system and language libraries is |
| 20 | # selected. | 20 | # selected. |
| 21 | # When +DD32 is specified: | 21 | # When +DD32 is specified: |
| 22 | # * The size of an int, long, or pointer data type is 32-bits. | 22 | # * The size of an int, long, or pointer data type is 32-bits. |
| 23 | # The size of an int data type is 32-bits. The size of a long or | 23 | # The size of an int data type is 32-bits. The size of a long or |
| 24 | # pointer data type is 64-bits. | 24 | # pointer data type is 64-bits. |
| 25 | # * This is the default, currently equivalent to +DA1.1 architecture. | 25 | # * This is the default, currently equivalent to +DA1.1 architecture. |
| 26 | # When +DD64 is specified: | 26 | # When +DD64 is specified: |
| 27 | # * The size of an int data type is 32-bits. The size of a long or | 27 | # * The size of an int data type is 32-bits. The size of a long or |
| 28 | # pointer data type is 64-bits. | 28 | # pointer data type is 64-bits. |
| 29 | # * This is currently equivalent to +DA2.OW architecture. | 29 | # * This is currently equivalent to +DA2.OW architecture. |
| 30 | # * The preprocessor predefined macro, __LP64__ is defined. | 30 | # * The preprocessor predefined macro, __LP64__ is defined. |
| 31 | # Using +DS to Specify Instruction Scheduling: | 31 | # Using +DS to Specify Instruction Scheduling: |
| 32 | # * By default, the compiler performs scheduling tuned for the system | 32 | # * By default, the compiler performs scheduling tuned for the system |
| 33 | # on which you are compiling, or, if specified, tuned for the setting | 33 | # on which you are compiling, or, if specified, tuned for the setting |
| 34 | # of the +DA option. | 34 | # of the +DA option. |
| 35 | # | 35 | # |
| 36 | # From the online "C/HP-UX Reference Manual": | 36 | # From the online "C/HP-UX Reference Manual": |
| 37 | #-Aa | 37 | #-Aa |
| 38 | # Enables strict ANSI C compliance. | 38 | # Enables strict ANSI C compliance. |
| 39 | # -Ae | 39 | # -Ae |
| 40 | # Enables ANSI C compliance, HP value-added features (as described | 40 | # Enables ANSI C compliance, HP value-added features (as described |
| 41 | # for +e option), and _HPUX_SOURCE name space macro. It is equivalent | 41 | # for +e option), and _HPUX_SOURCE name space macro. It is equivalent |
| 42 | # to -Aa +e -D_HPUX_SOURCE. | 42 | # to -Aa +e -D_HPUX_SOURCE. |
| 43 | # +e | 43 | # +e |
| 44 | # Enables the following HP value added features while compiling in | 44 | # Enables the following HP value added features while compiling in |
| 45 | # ANSI C mode: sized enum, long long, long pointers, compiler supplied | 45 | # ANSI C mode: sized enum, long long, long pointers, compiler supplied |
| 46 | # defaults for missing arguments to intrinsic calls, and $ in identifier | 46 | # defaults for missing arguments to intrinsic calls, and $ in identifier |
| 47 | # HP C extensions. | 47 | # HP C extensions. |
| 48 | # | 48 | # |
| 49 | 49 | ||
| 50 | MAKEFILE_GENERATOR= UNIX | 50 | MAKEFILE_GENERATOR= UNIX |
| 51 | TEMPLATE = app | 51 | TEMPLATE = app |
| 52 | CONFIG += qt warn_on release | 52 | CONFIG += qt warn_on release link_prl |
| 53 | 53 | ||
| 54 | QMAKE_CC = cc | 54 | QMAKE_CC = cc |
| 55 | QMAKE_LEX = flex | 55 | QMAKE_LEX = flex |
| 56 | QMAKE_LEXFLAGS = | 56 | QMAKE_LEXFLAGS = |
| 57 | QMAKE_YACC = yacc | 57 | QMAKE_YACC = yacc |
| 58 | QMAKE_YACCFLAGS = -d | 58 | QMAKE_YACCFLAGS = -d |
| 59 | QMAKE_CFLAGS = -Ae +DA2.0W -w $(CFLAGS_EXTRA) | 59 | QMAKE_CFLAGS = -Ae +DA2.0W -w $(CFLAGS_EXTRA) |
| 60 | QMAKE_CFLAGS_WARN_ON= | 60 | QMAKE_CFLAGS_WARN_ON= |
| 61 | QMAKE_CFLAGS_WARN_OFF= | 61 | QMAKE_CFLAGS_WARN_OFF= -w |
| 62 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O +Osize) | 62 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O +Osize) |
| 63 | QMAKE_CFLAGS_DEBUG= -g | 63 | QMAKE_CFLAGS_DEBUG= -g |
| 64 | QMAKE_CFLAGS_SHLIB= +Z | 64 | QMAKE_CFLAGS_SHLIB= +Z |
| 65 | QMAKE_CFLAGS_YACC= | 65 | QMAKE_CFLAGS_YACC= |
| 66 | QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE | 66 | QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE |
| 67 | 67 | ||
| 68 | QMAKE_CXX = aCC | 68 | QMAKE_CXX = aCC |
| 69 | QMAKE_CXXFLAGS = -Aa +DA2.0W -w -D__STRICT_ANSI__ $(CXXFLAGS_EXTRA) | 69 | QMAKE_CXXFLAGS = -Aa +DA2.0W -w -D__STRICT_ANSI__ -D_HPUX_SOURCE $(CXXFLAGS_EXTRA) |
| 70 | QMAKE_CXXFLAGS_DEPS= +M | ||
| 70 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 71 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 71 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 72 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 72 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 73 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 73 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 74 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 74 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 75 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 75 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 76 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 76 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 77 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 77 | 78 | ||
| 78 | QMAKE_INCDIR = | 79 | QMAKE_INCDIR = |
| 79 | QMAKE_LIBDIR = | 80 | QMAKE_LIBDIR = |
| 80 | QMAKE_INCDIR_X11= /usr/include/X11R6 | 81 | QMAKE_INCDIR_X11= /usr/include/X11R6 |
| 81 | QMAKE_LIBDIR_X11= /usr/lib/X11R6/pa20_64 | 82 | QMAKE_LIBDIR_X11= /usr/lib/X11R6/pa20_64 |
| 82 | QMAKE_INCDIR_QT = $(QTDIR)/include | 83 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 83 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 84 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 84 | QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include | 85 | QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include |
| 85 | QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib/pa20_64 /usr/contrib/X11R6/lib/pa20_64 | 86 | QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib/pa20_64 /usr/contrib/X11R6/lib/pa20_64 |
| 86 | 87 | ||
| 87 | QMAKE_LINK = aCC | 88 | QMAKE_LINK = aCC |
| 88 | QMAKE_LINK_SHLIB= aCC | 89 | QMAKE_LINK_SHLIB= aCC |
| 89 | QMAKE_LFLAGS = +DA2.0W -Wl,+s $(LFLAGS_EXTRA) | 90 | QMAKE_LFLAGS = +DA2.0W -Wl,+s $(LFLAGS_EXTRA) |
| 90 | QMAKE_LFLAGS_RELEASE= -O | 91 | QMAKE_LFLAGS_RELEASE= -O |
| 91 | QMAKE_LFLAGS_DEBUG= -Wl,+tools -g | 92 | QMAKE_LFLAGS_DEBUG= -g |
| 92 | QMAKE_LFLAGS_SHLIB= -b | 93 | QMAKE_LFLAGS_SHLIB= -b -Wl,-a,shared |
| 93 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 94 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 94 | QMAKE_LFLAGS_SONAME= -Wl,+h, | 95 | QMAKE_LFLAGS_SONAME= -Wl,+h, |
| 95 | QMAKE_LFLAGS_THREAD= | 96 | QMAKE_LFLAGS_THREAD= |
| 96 | QMAKE_RPATH = -Wl,+b, | 97 | QMAKE_RPATH = -Wl,+b, |
| 98 | QMAKE_HPUX_SHLIB= 3 | ||
| 99 | QMAKE_EXTENSION_SHLIB= sl | ||
| 97 | 100 | ||
| 98 | QMAKE_LIBS = $(LIBS_EXTRA) | 101 | QMAKE_LIBS = -lm $(LIBS_EXTRA) |
| 99 | QMAKE_LIBS_DYNLOAD= -ldld | 102 | QMAKE_LIBS_DYNLOAD= -ldl |
| 100 | QMAKE_LIBS_X11 = -lXext -lX11 | 103 | QMAKE_LIBS_X11 = -lXext -lX11 |
| 101 | QMAKE_LIBS_X11SM= -lSM -lICE | 104 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 102 | QMAKE_LIBS_QT = -lqt | 105 | QMAKE_LIBS_QT = -lqt |
| 103 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 106 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 104 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 107 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt |
| 105 | QMAKE_LIBS_OPENGL_QT= -lGL -lXm | 108 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu -lXt |
| 106 | QMAKE_LIBS_THREAD= -lpthread | 109 | QMAKE_LIBS_THREAD= -lpthread |
| 107 | QMAKE_LIBS_YACC = -ly | 110 | QMAKE_LIBS_YACC = -ly |
| 108 | 111 | ||
| 109 | QMAKE_MOC = $(QTDIR)/bin/moc | 112 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 110 | QMAKE_UIC = $(QTDIR)/bin/uic | 113 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 111 | 114 | ||
| 112 | QMAKE_AR = ar cqs | 115 | QMAKE_AR = ar cqs |
| 113 | QMAKE_RANLIB = | 116 | QMAKE_RANLIB = |
| 114 | 117 | ||
| 115 | QMAKE_TAR = tar -cf | 118 | QMAKE_TAR = tar -cf |
| 116 | QMAKE_GZIP = gzip -9f | 119 | QMAKE_GZIP = gzip -9f |
| 117 | 120 | ||
| 118 | QMAKE_COPY = cp -f | 121 | QMAKE_COPY = cp -f |
| 119 | QMAKE_MOVE = mv -f | 122 | QMAKE_MOVE = mv -f |
| 120 | QMAKE_DEL_FILE = rm -f | 123 | QMAKE_DEL_FILE = rm -f |
| 121 | QMAKE_DEL_DIR = rmdir | 124 | QMAKE_DEL_DIR = rmdir |
| 125 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 126 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/hpux-acc-64/qplatformdefs.h b/mkspecs/hpux-acc-64/qplatformdefs.h index 8a1410c..1779974 100644 --- a/mkspecs/hpux-acc-64/qplatformdefs.h +++ b/mkspecs/hpux-acc-64/qplatformdefs.h | |||
| @@ -1,80 +1,86 @@ | |||
| 1 | #ifndef QPLATFORMDEFS_H | 1 | #ifndef QPLATFORMDEFS_H |
| 2 | #define QPLATFORMDEFS_H | 2 | #define QPLATFORMDEFS_H |
| 3 | 3 | ||
| 4 | // Get Qt defines/settings | 4 | // Get Qt defines/settings |
| 5 | 5 | ||
| 6 | #include "qglobal.h" | 6 | #include "qglobal.h" |
| 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 | #include <unistd.h> | 10 | #include <unistd.h> |
| 11 | 11 | ||
| 12 | 12 | ||
| 13 | // We are hot - unistd.h should have turned on the specific APIs we requested | 13 | // We are hot - unistd.h should have turned on the specific APIs we requested |
| 14 | 14 | ||
| 15 | 15 | ||
| 16 | #ifdef QT_THREAD_SUPPORT | 16 | #ifdef QT_THREAD_SUPPORT |
| 17 | #include <pthread.h> | 17 | #include <pthread.h> |
| 18 | #endif | 18 | #endif |
| 19 | 19 | ||
| 20 | #include <dirent.h> | 20 | #include <dirent.h> |
| 21 | #include <fcntl.h> | 21 | #include <fcntl.h> |
| 22 | #include <grp.h> | 22 | #include <grp.h> |
| 23 | #include <pwd.h> | 23 | #include <pwd.h> |
| 24 | #include <signal.h> | 24 | #include <signal.h> |
| 25 | #include <dl.h> | 25 | #include <dlfcn.h> |
| 26 | #define QT_HPUX_LD | ||
| 27 | #define QT_NO_LIBRARY_UNLOAD | ||
| 28 | 26 | ||
| 29 | #include <sys/types.h> | 27 | #include <sys/types.h> |
| 30 | #include <sys/ioctl.h> | 28 | #include <sys/ioctl.h> |
| 31 | #include <sys/ipc.h> | 29 | #include <sys/ipc.h> |
| 32 | #include <sys/time.h> | 30 | #include <sys/time.h> |
| 33 | #include <sys/shm.h> | 31 | #include <sys/shm.h> |
| 34 | #include <sys/socket.h> | 32 | #include <sys/socket.h> |
| 35 | #include <sys/stat.h> | 33 | #include <sys/stat.h> |
| 36 | #include <sys/wait.h> | 34 | #include <sys/wait.h> |
| 37 | 35 | ||
| 38 | // DNS header files are not fully covered by X/Open specifications. | 36 | // DNS header files are not fully covered by X/Open specifications. |
| 39 | // In particular nothing is said about res_* :/ | 37 | // In particular nothing is said about res_* :/ |
| 38 | // #ifdef __cplusplus | ||
| 39 | // extern "C" { | ||
| 40 | // #endif | ||
| 41 | // getres() is mangled because of missing extern "C" on | ||
| 42 | // HP-UX 11.x systems missing PHCO_23963 | ||
| 40 | #include <resolv.h> | 43 | #include <resolv.h> |
| 44 | // #ifdef __cplusplus | ||
| 45 | // } | ||
| 46 | // #endif | ||
| 41 | // Undeclared - at least on HP-UX 10.20. | 47 | // Undeclared - at least on HP-UX 10.20. |
| 42 | extern "C" int res_init(); | 48 | extern "C" int res_init(); |
| 43 | 49 | ||
| 44 | 50 | ||
| 45 | #if !defined(QT_NO_COMPAT) | 51 | #if !defined(QT_NO_COMPAT) |
| 46 | #define QT_STATBUF struct stat | 52 | #define QT_STATBUF struct stat |
| 47 | #define QT_STATBUF4TSTATstruct stat | 53 | #define QT_STATBUF4TSTATstruct stat |
| 48 | #define QT_STAT ::stat | 54 | #define QT_STAT ::stat |
| 49 | #define QT_FSTAT ::fstat | 55 | #define QT_FSTAT ::fstat |
| 50 | #define QT_STAT_REG S_IFREG | 56 | #define QT_STAT_REG S_IFREG |
| 51 | #define QT_STAT_DIR S_IFDIR | 57 | #define QT_STAT_DIR S_IFDIR |
| 52 | #define QT_STAT_MASK S_IFMT | 58 | #define QT_STAT_MASK S_IFMT |
| 53 | #define QT_STAT_LNK S_IFLNK | 59 | #define QT_STAT_LNK S_IFLNK |
| 54 | #define QT_FILENO fileno | 60 | #define QT_FILENO fileno |
| 55 | #define QT_OPEN ::open | 61 | #define QT_OPEN ::open |
| 56 | #define QT_CLOSE ::close | 62 | #define QT_CLOSE ::close |
| 57 | #define QT_LSEEK ::lseek | 63 | #define QT_LSEEK ::lseek |
| 58 | #define QT_READ ::read | 64 | #define QT_READ ::read |
| 59 | #define QT_WRITE ::write | 65 | #define QT_WRITE ::write |
| 60 | #define QT_ACCESS ::access | 66 | #define QT_ACCESS ::access |
| 61 | #define QT_GETCWD ::getcwd | 67 | #define QT_GETCWD ::getcwd |
| 62 | #define QT_CHDIR ::chdir | 68 | #define QT_CHDIR ::chdir |
| 63 | #define QT_MKDIR ::mkdir | 69 | #define QT_MKDIR ::mkdir |
| 64 | #define QT_RMDIR ::rmdir | 70 | #define QT_RMDIR ::rmdir |
| 65 | #define QT_OPEN_RDONLY O_RDONLY | 71 | #define QT_OPEN_RDONLY O_RDONLY |
| 66 | #define QT_OPEN_WRONLY O_WRONLY | 72 | #define QT_OPEN_WRONLY O_WRONLY |
| 67 | #define QT_OPEN_RDWR O_RDWR | 73 | #define QT_OPEN_RDWR O_RDWR |
| 68 | #define QT_OPEN_CREAT O_CREAT | 74 | #define QT_OPEN_CREAT O_CREAT |
| 69 | #define QT_OPEN_TRUNC O_TRUNC | 75 | #define QT_OPEN_TRUNC O_TRUNC |
| 70 | #define QT_OPEN_APPEND O_APPEND | 76 | #define QT_OPEN_APPEND O_APPEND |
| 71 | #endif | 77 | #endif |
| 72 | 78 | ||
| 73 | #define QT_SIGNAL_RETTYPEvoid | 79 | #define QT_SIGNAL_RETTYPEvoid |
| 74 | #define QT_SIGNAL_ARGS int | 80 | #define QT_SIGNAL_ARGS int |
| 75 | #define QT_SIGNAL_IGNORESIG_IGN | 81 | #define QT_SIGNAL_IGNORESIG_IGN |
| 76 | 82 | ||
| 77 | #define QT_SOCKLEN_T int | 83 | #define QT_SOCKLEN_T int |
| 78 | 84 | ||
| 79 | 85 | ||
| 80 | #endif // QPLATFORMDEFS_H | 86 | #endif // QPLATFORMDEFS_H |
diff --git a/mkspecs/hpux-acc-o64/qmake.conf b/mkspecs/hpux-acc-o64/qmake.conf index f9f88bb..8aa3b43 100644 --- a/mkspecs/hpux-acc-o64/qmake.conf +++ b/mkspecs/hpux-acc-o64/qmake.conf | |||
| @@ -1,121 +1,125 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for hpux-o64 | 4 | # qmake configuration for hpux-o64 |
| 5 | # | 5 | # |
| 6 | # We define _POSIX_C_SOURCE to 199506L when using threads, therefore | 6 | # We define _POSIX_C_SOURCE to 199506L when using threads, therefore |
| 7 | # we also need to redefine _HPUX_SOURCE. | 7 | # we also need to redefine _HPUX_SOURCE. |
| 8 | # From pthread(3t): | 8 | # From pthread(3t): |
| 9 | # Some documentation will recommend the use of -D_REENTRANT for | 9 | # Some documentation will recommend the use of -D_REENTRANT for |
| 10 | # compilation. While this also functions properly, it is considered | 10 | # compilation. While this also functions properly, it is considered |
| 11 | # an obsolescent form. | 11 | # an obsolescent form. |
| 12 | # See pthread(3t) for more details. | 12 | # See pthread(3t) for more details. |
| 13 | # | 13 | # |
| 14 | # From the "HP aC++ Online Programmer's Guide": | 14 | # From the "HP aC++ Online Programmer's Guide": |
| 15 | # When +DA2.0W is specified: | 15 | # When +DA2.0W is specified: |
| 16 | # * 64-bit SVR4 Executable and Linking Format (ELF) object files | 16 | # * 64-bit SVR4 Executable and Linking Format (ELF) object files |
| 17 | # are generated for PA-RISC 2.0. | 17 | # are generated for PA-RISC 2.0. |
| 18 | # * The preprocessor predefined macro, __LP64__ is defined. | 18 | # * The preprocessor predefined macro, __LP64__ is defined. |
| 19 | # * The correct path for 64-bit system and language libraries is | 19 | # * The correct path for 64-bit system and language libraries is |
| 20 | # selected. | 20 | # selected. |
| 21 | # When +DD32 is specified: | 21 | # When +DD32 is specified: |
| 22 | # * The size of an int, long, or pointer data type is 32-bits. | 22 | # * The size of an int, long, or pointer data type is 32-bits. |
| 23 | # The size of an int data type is 32-bits. The size of a long or | 23 | # The size of an int data type is 32-bits. The size of a long or |
| 24 | # pointer data type is 64-bits. | 24 | # pointer data type is 64-bits. |
| 25 | # * This is the default, currently equivalent to +DA1.1 architecture. | 25 | # * This is the default, currently equivalent to +DA1.1 architecture. |
| 26 | # When +DD64 is specified: | 26 | # When +DD64 is specified: |
| 27 | # * The size of an int data type is 32-bits. The size of a long or | 27 | # * The size of an int data type is 32-bits. The size of a long or |
| 28 | # pointer data type is 64-bits. | 28 | # pointer data type is 64-bits. |
| 29 | # * This is currently equivalent to +DA2.OW architecture. | 29 | # * This is currently equivalent to +DA2.OW architecture. |
| 30 | # * The preprocessor predefined macro, __LP64__ is defined. | 30 | # * The preprocessor predefined macro, __LP64__ is defined. |
| 31 | # Using +DS to Specify Instruction Scheduling: | 31 | # Using +DS to Specify Instruction Scheduling: |
| 32 | # * By default, the compiler performs scheduling tuned for the system | 32 | # * By default, the compiler performs scheduling tuned for the system |
| 33 | # on which you are compiling, or, if specified, tuned for the setting | 33 | # on which you are compiling, or, if specified, tuned for the setting |
| 34 | # of the +DA option. | 34 | # of the +DA option. |
| 35 | # | 35 | # |
| 36 | # From the online "C/HP-UX Reference Manual": | 36 | # From the online "C/HP-UX Reference Manual": |
| 37 | #-Aa | 37 | #-Aa |
| 38 | # Enables strict ANSI C compliance. | 38 | # Enables strict ANSI C compliance. |
| 39 | # -Ae | 39 | # -Ae |
| 40 | # Enables ANSI C compliance, HP value-added features (as described | 40 | # Enables ANSI C compliance, HP value-added features (as described |
| 41 | # for +e option), and _HPUX_SOURCE name space macro. It is equivalent | 41 | # for +e option), and _HPUX_SOURCE name space macro. It is equivalent |
| 42 | # to -Aa +e -D_HPUX_SOURCE. | 42 | # to -Aa +e -D_HPUX_SOURCE. |
| 43 | # +e | 43 | # +e |
| 44 | # Enables the following HP value added features while compiling in | 44 | # Enables the following HP value added features while compiling in |
| 45 | # ANSI C mode: sized enum, long long, long pointers, compiler supplied | 45 | # ANSI C mode: sized enum, long long, long pointers, compiler supplied |
| 46 | # defaults for missing arguments to intrinsic calls, and $ in identifier | 46 | # defaults for missing arguments to intrinsic calls, and $ in identifier |
| 47 | # HP C extensions. | 47 | # HP C extensions. |
| 48 | # | 48 | # |
| 49 | 49 | ||
| 50 | MAKEFILE_GENERATOR= UNIX | 50 | MAKEFILE_GENERATOR= UNIX |
| 51 | TEMPLATE = app | 51 | TEMPLATE = app |
| 52 | CONFIG += qt warn_on release | 52 | CONFIG += qt warn_on release link_prl |
| 53 | 53 | ||
| 54 | QMAKE_CC = cc | 54 | QMAKE_CC = cc |
| 55 | QMAKE_LEX = flex | 55 | QMAKE_LEX = flex |
| 56 | QMAKE_LEXFLAGS = | 56 | QMAKE_LEXFLAGS = |
| 57 | QMAKE_YACC = yacc | 57 | QMAKE_YACC = yacc |
| 58 | QMAKE_YACCFLAGS = -d | 58 | QMAKE_YACCFLAGS = -d |
| 59 | QMAKE_CFLAGS = -Ae +DA2.0 -w $(CFLAGS_EXTRA) | 59 | QMAKE_CFLAGS = -Ae +DA2.0 -w $(CFLAGS_EXTRA) |
| 60 | QMAKE_CFLAGS_WARN_ON= | 60 | QMAKE_CFLAGS_WARN_ON= |
| 61 | QMAKE_CFLAGS_WARN_OFF= | 61 | QMAKE_CFLAGS_WARN_OFF= |
| 62 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O +Oentrysched +Onolimit) | 62 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O +Oentrysched +Onolimit) |
| 63 | QMAKE_CFLAGS_DEBUG= -y -g | 63 | QMAKE_CFLAGS_DEBUG= -y -g |
| 64 | QMAKE_CFLAGS_SHLIB= +Z | 64 | QMAKE_CFLAGS_SHLIB= +Z |
| 65 | QMAKE_CFLAGS_YACC= | 65 | QMAKE_CFLAGS_YACC= |
| 66 | QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE | 66 | QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE |
| 67 | 67 | ||
| 68 | QMAKE_CXX = aCC | 68 | QMAKE_CXX = aCC |
| 69 | QMAKE_CXXFLAGS = +DA2.0 -w -D__STRICT_ANSI__ $(CXXFLAGS_EXTRA) | 69 | QMAKE_CXXFLAGS = +DA2.0 -w -D__STRICT_ANSI__ -D_HPUX_SOURCE $(CXXFLAGS_EXTRA) |
| 70 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 70 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 71 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 71 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 72 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 72 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 73 | QMAKE_CXXFLAGS_DEBUG= -g | 73 | QMAKE_CXXFLAGS_DEBUG= -g |
| 74 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 74 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 75 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 75 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 76 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 76 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 77 | 77 | ||
| 78 | QMAKE_INCDIR = | 78 | QMAKE_INCDIR = |
| 79 | QMAKE_LIBDIR = | 79 | QMAKE_LIBDIR = |
| 80 | QMAKE_INCDIR_X11= /usr/include/X11R6 | 80 | QMAKE_INCDIR_X11= /usr/include/X11R6 |
| 81 | QMAKE_LIBDIR_X11= /usr/lib/X11R6 | 81 | QMAKE_LIBDIR_X11= /usr/lib/X11R6 |
| 82 | QMAKE_INCDIR_QT = $(QTDIR)/include | 82 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 83 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 83 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 84 | QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include | 84 | QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include |
| 85 | QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib | 85 | QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib |
| 86 | 86 | ||
| 87 | QMAKE_LINK = aCC | 87 | QMAKE_LINK = aCC |
| 88 | QMAKE_LINK_SHLIB= aCC | 88 | QMAKE_LINK_SHLIB= aCC |
| 89 | QMAKE_LFLAGS = +DA2.0 -Wl,+s $(LFLAGS_EXTRA) | 89 | QMAKE_LFLAGS = +DA2.0 -Wl,+s $(LFLAGS_EXTRA) |
| 90 | QMAKE_LFLAGS_RELEASE= -O | 90 | QMAKE_LFLAGS_RELEASE= -O |
| 91 | QMAKE_LFLAGS_DEBUG= | 91 | QMAKE_LFLAGS_DEBUG= |
| 92 | QMAKE_LFLAGS_SHLIB= -b | 92 | QMAKE_LFLAGS_SHLIB= -b |
| 93 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 93 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 94 | QMAKE_LFLAGS_SONAME= -Wl,+h, | 94 | QMAKE_LFLAGS_SONAME= -Wl,+h, |
| 95 | QMAKE_RPATH = -Wl,+b, | 95 | QMAKE_RPATH = -Wl,+b, |
| 96 | QMAKE_HPUX_SHLIB= 2 | ||
| 97 | QMAKE_EXTENSION_SHLIB= sl | ||
| 96 | 98 | ||
| 97 | QMAKE_LIBS = $(LIBS_EXTRA) | 99 | QMAKE_LIBS = -lm $(LIBS_EXTRA) |
| 98 | QMAKE_LIBS_DYNLOAD= -ldld | 100 | QMAKE_LIBS_DYNLOAD= -ldld |
| 99 | QMAKE_LIBS_X11 = -lXext -lX11 | 101 | QMAKE_LIBS_X11 = -lXext -lX11 |
| 100 | QMAKE_LIBS_X11SM= -lSM -lICE | 102 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 101 | QMAKE_LIBS_QT = -lqt | 103 | QMAKE_LIBS_QT = -lqt |
| 102 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 104 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 103 | 105 | ||
| 104 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 106 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 105 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 107 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 106 | QMAKE_LIBS_THREAD= -lpthread | 108 | QMAKE_LIBS_THREAD= -lpthread |
| 107 | QMAKE_LIBS_YACC = -ly | 109 | QMAKE_LIBS_YACC = -ly |
| 108 | 110 | ||
| 109 | QMAKE_MOC = $(QTDIR)/bin/moc | 111 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 110 | QMAKE_UIC = $(QTDIR)/bin/uic | 112 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 111 | 113 | ||
| 112 | QMAKE_AR = ar cqs | 114 | QMAKE_AR = ar cqs |
| 113 | QMAKE_RANLIB = | 115 | QMAKE_RANLIB = |
| 114 | 116 | ||
| 115 | QMAKE_TAR = tar -cf | 117 | QMAKE_TAR = tar -cf |
| 116 | QMAKE_GZIP = gzip -9f | 118 | QMAKE_GZIP = gzip -9f |
| 117 | 119 | ||
| 118 | QMAKE_COPY = cp -f | 120 | QMAKE_COPY = cp -f |
| 119 | QMAKE_MOVE = mv -f | 121 | QMAKE_MOVE = mv -f |
| 120 | QMAKE_DEL_FILE = rm -f | 122 | QMAKE_DEL_FILE = rm -f |
| 121 | QMAKE_DEL_DIR = rmdir | 123 | QMAKE_DEL_DIR = rmdir |
| 124 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 125 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/hpux-acc-o64/qplatformdefs.h b/mkspecs/hpux-acc-o64/qplatformdefs.h index 8a1410c..6307fc0 100644 --- a/mkspecs/hpux-acc-o64/qplatformdefs.h +++ b/mkspecs/hpux-acc-o64/qplatformdefs.h | |||
| @@ -1,80 +1,88 @@ | |||
| 1 | #ifndef QPLATFORMDEFS_H | 1 | #ifndef QPLATFORMDEFS_H |
| 2 | #define QPLATFORMDEFS_H | 2 | #define QPLATFORMDEFS_H |
| 3 | 3 | ||
| 4 | // Get Qt defines/settings | 4 | // Get Qt defines/settings |
| 5 | 5 | ||
| 6 | #include "qglobal.h" | 6 | #include "qglobal.h" |
| 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 | #include <unistd.h> | 10 | #include <unistd.h> |
| 11 | 11 | ||
| 12 | 12 | ||
| 13 | // We are hot - unistd.h should have turned on the specific APIs we requested | 13 | // We are hot - unistd.h should have turned on the specific APIs we requested |
| 14 | 14 | ||
| 15 | 15 | ||
| 16 | #ifdef QT_THREAD_SUPPORT | 16 | #ifdef QT_THREAD_SUPPORT |
| 17 | #include <pthread.h> | 17 | #include <pthread.h> |
| 18 | #endif | 18 | #endif |
| 19 | 19 | ||
| 20 | #include <dirent.h> | 20 | #include <dirent.h> |
| 21 | #include <fcntl.h> | 21 | #include <fcntl.h> |
| 22 | #include <grp.h> | 22 | #include <grp.h> |
| 23 | #include <pwd.h> | 23 | #include <pwd.h> |
| 24 | #include <signal.h> | 24 | #include <signal.h> |
| 25 | #include <dl.h> | 25 | #include <dl.h> |
| 26 | #define QT_HPUX_LD | 26 | #define QT_HPUX_LD |
| 27 | #define QT_NO_LIBRARY_UNLOAD | 27 | #define QT_NO_LIBRARY_UNLOAD |
| 28 | 28 | ||
| 29 | #include <sys/types.h> | 29 | #include <sys/types.h> |
| 30 | #include <sys/ioctl.h> | 30 | #include <sys/ioctl.h> |
| 31 | #include <sys/ipc.h> | 31 | #include <sys/ipc.h> |
| 32 | #include <sys/time.h> | 32 | #include <sys/time.h> |
| 33 | #include <sys/shm.h> | 33 | #include <sys/shm.h> |
| 34 | #include <sys/socket.h> | 34 | #include <sys/socket.h> |
| 35 | #include <sys/stat.h> | 35 | #include <sys/stat.h> |
| 36 | #include <sys/wait.h> | 36 | #include <sys/wait.h> |
| 37 | 37 | ||
| 38 | // DNS header files are not fully covered by X/Open specifications. | 38 | // DNS header files are not fully covered by X/Open specifications. |
| 39 | // In particular nothing is said about res_* :/ | 39 | // In particular nothing is said about res_* :/ |
| 40 | // #ifdef __cplusplus | ||
| 41 | // extern "C" { | ||
| 42 | // #endif | ||
| 43 | // getres() is mangled because of missing extern "C" on | ||
| 44 | // HP-UX 11.x systems missing PHCO_23963 | ||
| 40 | #include <resolv.h> | 45 | #include <resolv.h> |
| 46 | // #ifdef __cplusplus | ||
| 47 | // } | ||
| 48 | // #endif | ||
| 41 | // Undeclared - at least on HP-UX 10.20. | 49 | // Undeclared - at least on HP-UX 10.20. |
| 42 | extern "C" int res_init(); | 50 | extern "C" int res_init(); |
| 43 | 51 | ||
| 44 | 52 | ||
| 45 | #if !defined(QT_NO_COMPAT) | 53 | #if !defined(QT_NO_COMPAT) |
| 46 | #define QT_STATBUF struct stat | 54 | #define QT_STATBUF struct stat |
| 47 | #define QT_STATBUF4TSTATstruct stat | 55 | #define QT_STATBUF4TSTATstruct stat |
| 48 | #define QT_STAT ::stat | 56 | #define QT_STAT ::stat |
| 49 | #define QT_FSTAT ::fstat | 57 | #define QT_FSTAT ::fstat |
| 50 | #define QT_STAT_REG S_IFREG | 58 | #define QT_STAT_REG S_IFREG |
| 51 | #define QT_STAT_DIR S_IFDIR | 59 | #define QT_STAT_DIR S_IFDIR |
| 52 | #define QT_STAT_MASK S_IFMT | 60 | #define QT_STAT_MASK S_IFMT |
| 53 | #define QT_STAT_LNK S_IFLNK | 61 | #define QT_STAT_LNK S_IFLNK |
| 54 | #define QT_FILENO fileno | 62 | #define QT_FILENO fileno |
| 55 | #define QT_OPEN ::open | 63 | #define QT_OPEN ::open |
| 56 | #define QT_CLOSE ::close | 64 | #define QT_CLOSE ::close |
| 57 | #define QT_LSEEK ::lseek | 65 | #define QT_LSEEK ::lseek |
| 58 | #define QT_READ ::read | 66 | #define QT_READ ::read |
| 59 | #define QT_WRITE ::write | 67 | #define QT_WRITE ::write |
| 60 | #define QT_ACCESS ::access | 68 | #define QT_ACCESS ::access |
| 61 | #define QT_GETCWD ::getcwd | 69 | #define QT_GETCWD ::getcwd |
| 62 | #define QT_CHDIR ::chdir | 70 | #define QT_CHDIR ::chdir |
| 63 | #define QT_MKDIR ::mkdir | 71 | #define QT_MKDIR ::mkdir |
| 64 | #define QT_RMDIR ::rmdir | 72 | #define QT_RMDIR ::rmdir |
| 65 | #define QT_OPEN_RDONLY O_RDONLY | 73 | #define QT_OPEN_RDONLY O_RDONLY |
| 66 | #define QT_OPEN_WRONLY O_WRONLY | 74 | #define QT_OPEN_WRONLY O_WRONLY |
| 67 | #define QT_OPEN_RDWR O_RDWR | 75 | #define QT_OPEN_RDWR O_RDWR |
| 68 | #define QT_OPEN_CREAT O_CREAT | 76 | #define QT_OPEN_CREAT O_CREAT |
| 69 | #define QT_OPEN_TRUNC O_TRUNC | 77 | #define QT_OPEN_TRUNC O_TRUNC |
| 70 | #define QT_OPEN_APPEND O_APPEND | 78 | #define QT_OPEN_APPEND O_APPEND |
| 71 | #endif | 79 | #endif |
| 72 | 80 | ||
| 73 | #define QT_SIGNAL_RETTYPEvoid | 81 | #define QT_SIGNAL_RETTYPEvoid |
| 74 | #define QT_SIGNAL_ARGS int | 82 | #define QT_SIGNAL_ARGS int |
| 75 | #define QT_SIGNAL_IGNORESIG_IGN | 83 | #define QT_SIGNAL_IGNORESIG_IGN |
| 76 | 84 | ||
| 77 | #define QT_SOCKLEN_T int | 85 | #define QT_SOCKLEN_T int |
| 78 | 86 | ||
| 79 | 87 | ||
| 80 | #endif // QPLATFORMDEFS_H | 88 | #endif // QPLATFORMDEFS_H |
diff --git a/mkspecs/hpux-acc/qmake.conf b/mkspecs/hpux-acc/qmake.conf index c344f26..2cbb1e6 100644 --- a/mkspecs/hpux-acc/qmake.conf +++ b/mkspecs/hpux-acc/qmake.conf | |||
| @@ -1,100 +1,105 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for hpux-acc | 4 | # qmake configuration for hpux-acc |
| 5 | # | 5 | # |
| 6 | # We define _POSIX_C_SOURCE to 199506L when using threads, therefore | 6 | # We define _POSIX_C_SOURCE to 199506L when using threads, therefore |
| 7 | # we also need to redefine _HPUX_SOURCE. See pthread(3t) for more details. | 7 | # we also need to redefine _HPUX_SOURCE. See pthread(3t) for more details. |
| 8 | # | 8 | # |
| 9 | # From the "HP aC++ Online Programmer's Guide": | 9 | # From the "HP aC++ Online Programmer's Guide": |
| 10 | # Using +DS to Specify Instruction Scheduling: | 10 | # Using +DS to Specify Instruction Scheduling: |
| 11 | # * By default, the compiler performs scheduling tuned for the system | 11 | # * By default, the compiler performs scheduling tuned for the system |
| 12 | # on which you are compiling, or, if specified, tuned for the setting | 12 | # on which you are compiling, or, if specified, tuned for the setting |
| 13 | # of the +DA option. | 13 | # of the +DA option. |
| 14 | # | 14 | # |
| 15 | # From the online "C/HP-UX Reference Manual": | 15 | # From the online "C/HP-UX Reference Manual": |
| 16 | #-Aa | 16 | #-Aa |
| 17 | # Enables strict ANSI C compliance. | 17 | # Enables strict ANSI C compliance. |
| 18 | # -Ae | 18 | # -Ae |
| 19 | # Enables ANSI C compliance, HP value-added features (as described | 19 | # Enables ANSI C compliance, HP value-added features (as described |
| 20 | # for +e option), and _HPUX_SOURCE name space macro. It is equivalent | 20 | # for +e option), and _HPUX_SOURCE name space macro. It is equivalent |
| 21 | # to -Aa +e -D_HPUX_SOURCE. | 21 | # to -Aa +e -D_HPUX_SOURCE. |
| 22 | # +e | 22 | # +e |
| 23 | # Enables the following HP value added features while compiling in | 23 | # Enables the following HP value added features while compiling in |
| 24 | # ANSI C mode: sized enum, long long, long pointers, compiler supplied | 24 | # ANSI C mode: sized enum, long long, long pointers, compiler supplied |
| 25 | # defaults for missing arguments to intrinsic calls, and $ in identifier | 25 | # defaults for missing arguments to intrinsic calls, and $ in identifier |
| 26 | # HP C extensions. | 26 | # HP C extensions. |
| 27 | # | 27 | # |
| 28 | 28 | ||
| 29 | MAKEFILE_GENERATOR= UNIX | 29 | MAKEFILE_GENERATOR= UNIX |
| 30 | TEMPLATE = app | 30 | TEMPLATE = app |
| 31 | CONFIG = qt warn_on release | 31 | CONFIG += qt warn_on release link_prl |
| 32 | 32 | ||
| 33 | QMAKE_CC = cc | 33 | QMAKE_CC = cc |
| 34 | QMAKE_LEX = flex | 34 | QMAKE_LEX = flex |
| 35 | QMAKE_LEXFLAGS = | 35 | QMAKE_LEXFLAGS = |
| 36 | QMAKE_YACC = yacc | 36 | QMAKE_YACC = yacc |
| 37 | QMAKE_YACCFLAGS = -d | 37 | QMAKE_YACCFLAGS = -d |
| 38 | QMAKE_CFLAGS = -Ae +DAportable -w +Z $(CFLAGS_EXTRA) | 38 | QMAKE_CFLAGS = -Ae +DAportable -w $(CFLAGS_EXTRA) |
| 39 | QMAKE_CFLAGS_WARN_ON= | 39 | QMAKE_CFLAGS_WARN_ON= |
| 40 | QMAKE_CFLAGS_WARN_OFF= | 40 | QMAKE_CFLAGS_WARN_OFF= -w |
| 41 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) | 41 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) |
| 42 | QMAKE_CFLAGS_DEBUG= -g | 42 | QMAKE_CFLAGS_DEBUG= -g |
| 43 | QMAKE_CFLAGS_SHLIB= | 43 | QMAKE_CFLAGS_SHLIB= +Z |
| 44 | QMAKE_CFLAGS_YACC= | 44 | QMAKE_CFLAGS_YACC= |
| 45 | QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE | 45 | QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE |
| 46 | 46 | ||
| 47 | QMAKE_CXX = aCC | 47 | QMAKE_CXX = aCC |
| 48 | QMAKE_CXXFLAGS = +DAportable -w +Z -D__STRICT_ANSI__ $(CXXFLAGS_EXTRA) | 48 | QMAKE_CXXFLAGS = +DAportable -w -D__STRICT_ANSI__ -D_HPUX_SOURCE $(CXXFLAGS_EXTRA) |
| 49 | QMAKE_CXXFLAGS_DEPS= +M | ||
| 49 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 50 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 50 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 51 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 51 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 52 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 52 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 53 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 53 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 54 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 54 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 55 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 55 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 56 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 56 | 57 | ||
| 57 | QMAKE_INCDIR = | 58 | QMAKE_INCDIR = |
| 58 | QMAKE_LIBDIR = | 59 | QMAKE_LIBDIR = |
| 59 | QMAKE_INCDIR_X11= /usr/include/X11R6 | 60 | QMAKE_INCDIR_X11= /usr/include/X11R6 |
| 60 | QMAKE_LIBDIR_X11= /usr/lib/X11R6 | 61 | QMAKE_LIBDIR_X11= /usr/lib/X11R6 |
| 61 | QMAKE_INCDIR_QT = $(QTDIR)/include | 62 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 62 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 63 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 63 | QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include | 64 | QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include |
| 64 | QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib | 65 | QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib |
| 65 | 66 | ||
| 66 | QMAKE_LINK = aCC | 67 | QMAKE_LINK = aCC |
| 67 | QMAKE_LINK_SHLIB= aCC | 68 | QMAKE_LINK_SHLIB= aCC |
| 68 | QMAKE_LFLAGS = +DAportable -Wl,+s $(LFLAGS_EXTRA) | 69 | QMAKE_LFLAGS = +DAportable -Wl,+s $(LFLAGS_EXTRA) |
| 69 | QMAKE_LFLAGS_RELEASE= -O | 70 | QMAKE_LFLAGS_RELEASE= -O |
| 70 | QMAKE_LFLAGS_DEBUG= | 71 | QMAKE_LFLAGS_DEBUG= -g |
| 71 | QMAKE_LFLAGS_SHLIB= -b -Wl,-a,shared | 72 | QMAKE_LFLAGS_SHLIB= -b -Wl,-a,shared |
| 72 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 73 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 73 | QMAKE_LFLAGS_SONAME= -Wl,+h, | 74 | QMAKE_LFLAGS_SONAME= -Wl,+h, |
| 74 | QMAKE_LFLAGS_THREAD= | 75 | QMAKE_LFLAGS_THREAD= |
| 75 | QMAKE_RPATH = -Wl,+b, | 76 | QMAKE_RPATH = -Wl,+b, |
| 77 | QMAKE_HPUX_SHLIB= 1 | ||
| 78 | QMAKE_EXTENSION_SHLIB= sl | ||
| 76 | 79 | ||
| 77 | QMAKE_LIBS = $(LIBS_EXTRA) | 80 | QMAKE_LIBS = -lm $(LIBS_EXTRA) |
| 78 | QMAKE_LIBS_DYNLOAD= -ldld | 81 | QMAKE_LIBS_DYNLOAD= -ldld |
| 79 | QMAKE_LIBS_X11 = -lXext -lX11 | 82 | QMAKE_LIBS_X11 = -lXext -lX11 |
| 80 | QMAKE_LIBS_X11SM= -lSM -lICE | 83 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 81 | QMAKE_LIBS_QT = -lqt | 84 | QMAKE_LIBS_QT = -lqt |
| 82 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 85 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 83 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 86 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt |
| 84 | QMAKE_LIBS_OPENGL_QT= -lGL -lXm | 87 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu -lXt |
| 85 | QMAKE_LIBS_THREAD= -lpthread | 88 | QMAKE_LIBS_THREAD= -lpthread |
| 86 | QMAKE_LIBS_YACC = -ly | 89 | QMAKE_LIBS_YACC = -ly |
| 87 | 90 | ||
| 88 | QMAKE_MOC = $(QTDIR)/bin/moc | 91 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 89 | QMAKE_UIC = $(QTDIR)/bin/uic | 92 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 90 | 93 | ||
| 91 | QMAKE_AR = ar cqs | 94 | QMAKE_AR = ar cqs |
| 92 | QMAKE_RANLIB = | 95 | QMAKE_RANLIB = |
| 93 | 96 | ||
| 94 | QMAKE_TAR = tar -cf | 97 | QMAKE_TAR = tar -cf |
| 95 | QMAKE_GZIP = gzip -9f | 98 | QMAKE_GZIP = gzip -9f |
| 96 | 99 | ||
| 97 | QMAKE_COPY = cp -f | 100 | QMAKE_COPY = cp -f |
| 98 | QMAKE_MOVE = mv -f | 101 | QMAKE_MOVE = mv -f |
| 99 | QMAKE_DEL_FILE = rm -f | 102 | QMAKE_DEL_FILE = rm -f |
| 100 | QMAKE_DEL_DIR = rmdir | 103 | QMAKE_DEL_DIR = rmdir |
| 104 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 105 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/hpux-acc/qplatformdefs.h b/mkspecs/hpux-acc/qplatformdefs.h index fb74ca7..d6dc587 100644 --- a/mkspecs/hpux-acc/qplatformdefs.h +++ b/mkspecs/hpux-acc/qplatformdefs.h | |||
| @@ -1,86 +1,95 @@ | |||
| 1 | #ifndef QPLATFORMDEFS_H | 1 | #ifndef QPLATFORMDEFS_H |
| 2 | #define QPLATFORMDEFS_H | 2 | #define QPLATFORMDEFS_H |
| 3 | 3 | ||
| 4 | // Get Qt defines/settings | 4 | // Get Qt defines/settings |
| 5 | 5 | ||
| 6 | #include "qglobal.h" | 6 | #include "qglobal.h" |
| 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 | #include <unistd.h> | 10 | #include <unistd.h> |
| 11 | 11 | ||
| 12 | 12 | ||
| 13 | // We are hot - unistd.h should have turned on the specific APIs we requested | 13 | // We are hot - unistd.h should have turned on the specific APIs we requested |
| 14 | 14 | ||
| 15 | 15 | ||
| 16 | #ifdef QT_THREAD_SUPPORT | 16 | #ifdef QT_THREAD_SUPPORT |
| 17 | #include <pthread.h> | 17 | #include <pthread.h> |
| 18 | #endif | 18 | #endif |
| 19 | 19 | ||
| 20 | #include <dirent.h> | 20 | #include <dirent.h> |
| 21 | #include <fcntl.h> | 21 | #include <fcntl.h> |
| 22 | #include <grp.h> | 22 | #include <grp.h> |
| 23 | #include <pwd.h> | 23 | #include <pwd.h> |
| 24 | #include <signal.h> | 24 | #include <signal.h> |
| 25 | #include <dl.h> | 25 | #include <dl.h> |
| 26 | #define QT_HPUX_LD | 26 | #define QT_HPUX_LD |
| 27 | #define QT_NO_LIBRARY_UNLOAD | 27 | #define QT_NO_LIBRARY_UNLOAD |
| 28 | 28 | ||
| 29 | #include <sys/types.h> | 29 | #include <sys/types.h> |
| 30 | #include <sys/ioctl.h> | 30 | #include <sys/ioctl.h> |
| 31 | #include <sys/ipc.h> | 31 | #include <sys/ipc.h> |
| 32 | #include <sys/time.h> | 32 | #include <sys/time.h> |
| 33 | #include <sys/shm.h> | 33 | #include <sys/shm.h> |
| 34 | #include <sys/socket.h> | 34 | #include <sys/socket.h> |
| 35 | #include <sys/stat.h> | 35 | #include <sys/stat.h> |
| 36 | #include <sys/wait.h> | 36 | #include <sys/wait.h> |
| 37 | 37 | ||
| 38 | // DNS header files are not fully covered by X/Open specifications. | 38 | // DNS header files are not fully covered by X/Open specifications. |
| 39 | // In particular nothing is said about res_* :/ | 39 | // In particular nothing is said about res_* :/ |
| 40 | // #ifdef __cplusplus | ||
| 41 | // extern "C" { | ||
| 42 | // #endif | ||
| 43 | // getres() is mangled because of missing extern "C" on | ||
| 44 | // HP-UX 11.x systems missing PHCO_23963 | ||
| 40 | #include <resolv.h> | 45 | #include <resolv.h> |
| 46 | // #ifdef __cplusplus | ||
| 47 | // } | ||
| 48 | // #endif | ||
| 41 | // Undeclared - at least on HP-UX 10.20. | 49 | // Undeclared - at least on HP-UX 10.20. |
| 42 | extern "C" int res_init(); | 50 | extern "C" int res_init(); |
| 43 | 51 | ||
| 44 | #define QT_NO_LIBRARY_UNLOAD | 52 | #define QT_NO_LIBRARY_UNLOAD |
| 45 | 53 | ||
| 46 | #if !defined(QT_NO_COMPAT) | 54 | #if !defined(QT_NO_COMPAT) |
| 47 | #define QT_STATBUF struct stat | 55 | #define QT_STATBUF struct stat |
| 48 | #define QT_STATBUF4TSTATstruct stat | 56 | #define QT_STATBUF4TSTATstruct stat |
| 49 | #define QT_STAT ::stat | 57 | #define QT_STAT ::stat |
| 50 | #define QT_FSTAT ::fstat | 58 | #define QT_FSTAT ::fstat |
| 51 | #define QT_STAT_REG S_IFREG | 59 | #define QT_STAT_REG S_IFREG |
| 52 | #define QT_STAT_DIR S_IFDIR | 60 | #define QT_STAT_DIR S_IFDIR |
| 53 | #define QT_STAT_MASK S_IFMT | 61 | #define QT_STAT_MASK S_IFMT |
| 54 | #define QT_STAT_LNK S_IFLNK | 62 | #define QT_STAT_LNK S_IFLNK |
| 55 | #define QT_FILENO fileno | 63 | #define QT_FILENO fileno |
| 56 | #define QT_OPEN ::open | 64 | #define QT_OPEN ::open |
| 57 | #define QT_CLOSE ::close | 65 | #define QT_CLOSE ::close |
| 58 | #define QT_LSEEK ::lseek | 66 | #define QT_LSEEK ::lseek |
| 59 | #define QT_READ ::read | 67 | #define QT_READ ::read |
| 60 | #define QT_WRITE ::write | 68 | #define QT_WRITE ::write |
| 61 | #define QT_ACCESS ::access | 69 | #define QT_ACCESS ::access |
| 62 | #define QT_GETCWD ::getcwd | 70 | #define QT_GETCWD ::getcwd |
| 63 | #define QT_CHDIR ::chdir | 71 | #define QT_CHDIR ::chdir |
| 64 | #define QT_MKDIR ::mkdir | 72 | #define QT_MKDIR ::mkdir |
| 65 | #define QT_RMDIR ::rmdir | 73 | #define QT_RMDIR ::rmdir |
| 66 | #define QT_OPEN_RDONLY O_RDONLY | 74 | #define QT_OPEN_RDONLY O_RDONLY |
| 67 | #define QT_OPEN_WRONLY O_WRONLY | 75 | #define QT_OPEN_WRONLY O_WRONLY |
| 68 | #define QT_OPEN_RDWR O_RDWR | 76 | #define QT_OPEN_RDWR O_RDWR |
| 69 | #define QT_OPEN_CREAT O_CREAT | 77 | #define QT_OPEN_CREAT O_CREAT |
| 70 | #define QT_OPEN_TRUNC O_TRUNC | 78 | #define QT_OPEN_TRUNC O_TRUNC |
| 71 | #define QT_OPEN_APPEND O_APPEND | 79 | #define QT_OPEN_APPEND O_APPEND |
| 72 | #endif | 80 | #endif |
| 73 | 81 | ||
| 74 | #define QT_SIGNAL_RETTYPEvoid | 82 | #define QT_SIGNAL_RETTYPEvoid |
| 75 | #define QT_SIGNAL_ARGS int | 83 | #define QT_SIGNAL_ARGS int |
| 76 | #define QT_SIGNAL_IGNORESIG_IGN | 84 | #define QT_SIGNAL_IGNORESIG_IGN |
| 77 | 85 | ||
| 78 | #define QT_SOCKLEN_T int | 86 | #define QT_SOCKLEN_T int |
| 79 | 87 | ||
| 80 | // presence of _XOPEN_UNIX can be used to detect HP-UX 10 or higher | 88 | // presence of _XOPEN_UNIX can be used to detect HP-UX 10 or higher |
| 81 | #if !defined(_XOPEN_UNIX) | 89 | #if !defined(_XOPEN_UNIX) |
| 82 | // HP-UX 9's select() didn't accept fd_set, yet. | 90 | // HP-UX 9's select() didn't accept fd_set, yet. |
| 83 | #define select(a,b,c,d,e) select((a), (int *)(b), (int *)(c), (int *)(d), (e)) | 91 | #define select(a,b,c,d,e) select((a), (int *)(b), (int *)(c), (int *)(d), (e)) |
| 84 | #endif | 92 | #endif |
| 85 | 93 | ||
| 94 | |||
| 86 | #endif // QPLATFORMDEFS_H | 95 | #endif // QPLATFORMDEFS_H |
diff --git a/mkspecs/hpux-cc/qmake.conf b/mkspecs/hpux-cc/qmake.conf index fe5d293..950bc99 100644 --- a/mkspecs/hpux-cc/qmake.conf +++ b/mkspecs/hpux-cc/qmake.conf | |||
| @@ -1,97 +1,100 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for hpux-cc | 4 | # qmake configuration for hpux-cc |
| 5 | # | 5 | # |
| 6 | # We define _POSIX_C_SOURCE to 199506L when using threads, therefore | 6 | # We define _POSIX_C_SOURCE to 199506L when using threads, therefore |
| 7 | # we also need to redefine _HPUX_SOURCE. | 7 | # we also need to redefine _HPUX_SOURCE. |
| 8 | # See pthread(3t) for more details. | 8 | # See pthread(3t) for more details. |
| 9 | # | 9 | # |
| 10 | # From the "HP aC++ Online Programmer's Guide": | 10 | # From the "HP aC++ Online Programmer's Guide": |
| 11 | # Using +DS to Specify Instruction Scheduling: | 11 | # Using +DS to Specify Instruction Scheduling: |
| 12 | # * By default, the compiler performs scheduling tuned for the system | 12 | # * By default, the compiler performs scheduling tuned for the system |
| 13 | # on which you are compiling, or, if specified, tuned for the setting | 13 | # on which you are compiling, or, if specified, tuned for the setting |
| 14 | # of the +DA option. | 14 | # of the +DA option. |
| 15 | # | 15 | # |
| 16 | # From the online "C/HP-UX Reference Manual": | 16 | # From the online "C/HP-UX Reference Manual": |
| 17 | #-Aa | 17 | #-Aa |
| 18 | # Enables strict ANSI C compliance. | 18 | # Enables strict ANSI C compliance. |
| 19 | # -Ae | 19 | # -Ae |
| 20 | # Enables ANSI C compliance, HP value-added features (as described | 20 | # Enables ANSI C compliance, HP value-added features (as described |
| 21 | # for +e option), and _HPUX_SOURCE name space macro. It is equivalent | 21 | # for +e option), and _HPUX_SOURCE name space macro. It is equivalent |
| 22 | # to -Aa +e -D_HPUX_SOURCE. | 22 | # to -Aa +e -D_HPUX_SOURCE. |
| 23 | # +e | 23 | # +e |
| 24 | # Enables the following HP value added features while compiling in | 24 | # Enables the following HP value added features while compiling in |
| 25 | # ANSI C mode: sized enum, long long, long pointers, compiler supplied | 25 | # ANSI C mode: sized enum, long long, long pointers, compiler supplied |
| 26 | # defaults for missing arguments to intrinsic calls, and $ in identifier | 26 | # defaults for missing arguments to intrinsic calls, and $ in identifier |
| 27 | # HP C extensions. | 27 | # HP C extensions. |
| 28 | # | 28 | # |
| 29 | 29 | ||
| 30 | MAKEFILE_GENERATOR= UNIX | 30 | MAKEFILE_GENERATOR= UNIX |
| 31 | TEMPLATE = app | 31 | TEMPLATE = app |
| 32 | CONFIG += qt warn_on release | 32 | CONFIG += qt warn_on release link_prl |
| 33 | 33 | ||
| 34 | QMAKE_CC = cc | 34 | QMAKE_CC = cc |
| 35 | QMAKE_LEX = flex | 35 | QMAKE_LEX = flex |
| 36 | QMAKE_LEXFLAGS = | 36 | QMAKE_LEXFLAGS = |
| 37 | QMAKE_YACC = yacc | 37 | QMAKE_YACC = yacc |
| 38 | QMAKE_YACCFLAGS = -d | 38 | QMAKE_YACCFLAGS = -d |
| 39 | QMAKE_CFLAGS = -Ae +DA1.1e -w $(CFLAGS_EXTRA) | 39 | QMAKE_CFLAGS = -Ae +DA1.1e -w $(CFLAGS_EXTRA) |
| 40 | QMAKE_CFLAGS_WARN_ON= | 40 | QMAKE_CFLAGS_WARN_ON= |
| 41 | QMAKE_CFLAGS_WARN_OFF= | 41 | QMAKE_CFLAGS_WARN_OFF= |
| 42 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) | 42 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) |
| 43 | QMAKE_CFLAGS_DEBUG= -g | 43 | QMAKE_CFLAGS_DEBUG= -g |
| 44 | QMAKE_CFLAGS_SHLIB= +Z | 44 | QMAKE_CFLAGS_SHLIB= +Z |
| 45 | QMAKE_CFLAGS_YACC= | 45 | QMAKE_CFLAGS_YACC= |
| 46 | 46 | ||
| 47 | QMAKE_CXX = CC | 47 | QMAKE_CXX = CC |
| 48 | QMAKE_CXXFLAGS = +DA1.1e -w +a1 $(CXXFLAGS_EXTRA) | 48 | QMAKE_CXXFLAGS = +DA1.1e -w +a1 -D_HPUX_SOURCE $(CXXFLAGS_EXTRA) |
| 49 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 49 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 50 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 50 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 51 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 51 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 52 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 52 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 53 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 53 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 54 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 54 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 55 | 55 | ||
| 56 | QMAKE_INCDIR = | 56 | QMAKE_INCDIR = |
| 57 | QMAKE_LIBDIR = | 57 | QMAKE_LIBDIR = |
| 58 | QMAKE_INCDIR_X11= /usr/include/X11R6 | 58 | QMAKE_INCDIR_X11= /usr/include/X11R6 |
| 59 | QMAKE_LIBDIR_X11= /usr/lib/X11R6 | 59 | QMAKE_LIBDIR_X11= /usr/lib/X11R6 |
| 60 | QMAKE_INCDIR_QT = $(QTDIR)/include | 60 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 61 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 61 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 62 | QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include | 62 | QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include |
| 63 | QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib | 63 | QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib |
| 64 | 64 | ||
| 65 | QMAKE_LINK = CC | 65 | QMAKE_LINK = CC |
| 66 | QMAKE_LINK_SHLIB= CC | 66 | QMAKE_LINK_SHLIB= CC |
| 67 | # CC generates template code during linking, and so needs -I's | 67 | # CC generates template code during linking, and so needs -I's |
| 68 | QMAKE_LFLAGS = +DA1.1e -Wl,+s -L/usr/lib -I$$QMAKE_INCDIR_X11 -I$$QMAKE_INCDIR_QT $(LFLAGS_EXTRA) | 68 | QMAKE_LFLAGS = +DA1.1e -Wl,+s -L/usr/lib -I$$QMAKE_INCDIR_X11 -I$$QMAKE_INCDIR_QT $(LFLAGS_EXTRA) |
| 69 | QMAKE_LFLAGS_RELEASE= -O -s | 69 | QMAKE_LFLAGS_RELEASE= -O -s |
| 70 | QMAKE_LFLAGS_DEBUG= | 70 | QMAKE_LFLAGS_DEBUG= |
| 71 | QMAKE_LFLAGS_SHLIB= -b | 71 | QMAKE_LFLAGS_SHLIB= -b |
| 72 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 72 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 73 | QMAKE_LFLAGS_SONAME= -Wl,+h, | 73 | QMAKE_LFLAGS_SONAME= -Wl,+h, |
| 74 | QMAKE_RPATH = -Wl,+b, | 74 | QMAKE_RPATH = -Wl,+b, |
| 75 | QMAKE_HPUX_SHLIB= 1 | ||
| 75 | 76 | ||
| 76 | QMAKE_LIBS = $(LIBS_EXTRA) | 77 | QMAKE_LIBS = -lm $(LIBS_EXTRA) |
| 77 | QMAKE_LIBS_DYNLOAD= -ldld | 78 | QMAKE_LIBS_DYNLOAD= -ldld |
| 78 | QMAKE_LIBS_X11 = -lXext -lX11 | 79 | QMAKE_LIBS_X11 = -lXext -lX11 |
| 79 | QMAKE_LIBS_X11SM= -lSM -lICE | 80 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 80 | QMAKE_LIBS_QT = -lqt | 81 | QMAKE_LIBS_QT = -lqt |
| 81 | 82 | ||
| 82 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 83 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 83 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 84 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 84 | 85 | ||
| 85 | QMAKE_MOC = $(QTDIR)/bin/moc | 86 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 86 | QMAKE_UIC = $(QTDIR)/bin/uic | 87 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 87 | 88 | ||
| 88 | QMAKE_AR = ar cqs | 89 | QMAKE_AR = ar cqs |
| 89 | QMAKE_RANLIB = | 90 | QMAKE_RANLIB = |
| 90 | 91 | ||
| 91 | QMAKE_TAR = tar -cf | 92 | QMAKE_TAR = tar -cf |
| 92 | QMAKE_GZIP = gzip -9f | 93 | QMAKE_GZIP = gzip -9f |
| 93 | 94 | ||
| 94 | QMAKE_COPY = cp -f | 95 | QMAKE_COPY = cp -f |
| 95 | QMAKE_MOVE = mv -f | 96 | QMAKE_MOVE = mv -f |
| 96 | QMAKE_DEL_FILE = rm -f | 97 | QMAKE_DEL_FILE = rm -f |
| 97 | QMAKE_DEL_DIR = rmdir | 98 | QMAKE_DEL_DIR = rmdir |
| 99 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 100 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/hpux-g++/qmake.conf b/mkspecs/hpux-g++/qmake.conf index 0af1de7..22e4cff 100644 --- a/mkspecs/hpux-g++/qmake.conf +++ b/mkspecs/hpux-g++/qmake.conf | |||
| @@ -1,83 +1,87 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for hpux-g++ | 4 | # qmake configuration for hpux-g++ |
| 5 | # | 5 | # |
| 6 | # We define _POSIX_C_SOURCE to 199506L when using threads, therefore | 6 | # We define _POSIX_C_SOURCE to 199506L when using threads, |
| 7 | # we also need to redefine _HPUX_SOURCE. | 7 | # therefore we also need to redefine _HPUX_SOURCE. |
| 8 | # See pthread(3t) for more details. | ||
| 9 | # | 8 | # |
| 10 | 9 | ||
| 11 | MAKEFILE_GENERATOR= UNIX | 10 | MAKEFILE_GENERATOR= UNIX |
| 12 | TEMPLATE = app | 11 | TEMPLATE = app |
| 13 | CONFIG += qt warn_on release | 12 | CONFIG += qt warn_on release link_prl plugin_no_soname |
| 14 | 13 | ||
| 15 | QMAKE_CC = gcc | 14 | QMAKE_CC = gcc |
| 16 | QMAKE_LEX = flex | 15 | QMAKE_LEX = flex |
| 17 | QMAKE_LEXFLAGS = | 16 | QMAKE_LEXFLAGS = |
| 18 | QMAKE_YACC = yacc | 17 | QMAKE_YACC = yacc |
| 19 | QMAKE_YACCFLAGS = -d | 18 | QMAKE_YACCFLAGS = -d |
| 20 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) | 19 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 21 | QMAKE_CFLAGS_DEPS= -M | 20 | QMAKE_CFLAGS_DEPS= -M |
| 22 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 21 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 23 | QMAKE_CFLAGS_WARN_OFF= -w | 22 | QMAKE_CFLAGS_WARN_OFF= -w |
| 24 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 23 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 25 | QMAKE_CFLAGS_DEBUG= -g | 24 | QMAKE_CFLAGS_DEBUG= -g |
| 26 | QMAKE_CFLAGS_SHLIB= -fPIC | 25 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 27 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 26 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 28 | QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE | 27 | QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE |
| 29 | 28 | ||
| 30 | QMAKE_CXX = g++ | 29 | QMAKE_CXX = g++ |
| 31 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 30 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -D_HPUX_SOURCE $(CXXFLAGS_EXTRA) |
| 32 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 31 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 33 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 32 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 34 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 33 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 35 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 34 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 36 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 35 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 37 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 36 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 38 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 37 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 39 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 38 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 40 | 39 | ||
| 41 | QMAKE_INCDIR = | 40 | QMAKE_INCDIR = |
| 42 | QMAKE_LIBDIR = | 41 | QMAKE_LIBDIR = |
| 43 | QMAKE_INCDIR_X11= /usr/include/X11R6 | 42 | QMAKE_INCDIR_X11= |
| 44 | QMAKE_LIBDIR_X11= /usr/lib/X11R6 | 43 | QMAKE_LIBDIR_X11= /usr/lib/X11R6 |
| 45 | QMAKE_INCDIR_QT = $(QTDIR)/include | 44 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 46 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 45 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 47 | QMAKE_INCDIR_OPENGL= /opt/Mesa/include /usr/contrib/X11R6/include | 46 | QMAKE_INCDIR_OPENGL= /opt/Mesa/include /usr/contrib/X11R6/include |
| 48 | QMAKE_LIBDIR_OPENGL= /opt/Mesa/lib /usr/contrib/X11R6/lib | 47 | QMAKE_LIBDIR_OPENGL= /opt/Mesa/lib /usr/contrib/X11R6/lib |
| 49 | 48 | ||
| 50 | QMAKE_LINK = g++ | 49 | QMAKE_LINK = g++ |
| 51 | QMAKE_LINK_SHLIB= g++ | 50 | QMAKE_LINK_SHLIB= g++ |
| 52 | QMAKE_LFLAGS = -Wl,+s $(LFLAGS_EXTRA) | 51 | QMAKE_LFLAGS = -Wl,+s $(LFLAGS_EXTRA) |
| 53 | QMAKE_LFLAGS_RELEASE= | 52 | QMAKE_LFLAGS_RELEASE= |
| 54 | QMAKE_LFLAGS_DEBUG= | 53 | QMAKE_LFLAGS_DEBUG= |
| 55 | QMAKE_LFLAGS_SHLIB= -fPIC -shared | 54 | QMAKE_LFLAGS_SHLIB= -fPIC -shared |
| 56 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 55 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 57 | QMAKE_LFLAGS_SONAME= -Wl,+h, | 56 | QMAKE_LFLAGS_SONAME= -Wl,+h, |
| 57 | QMAKE_LFLAGS_THREAD= | ||
| 58 | QMAKE_RPATH = -Wl,+b, | 58 | QMAKE_RPATH = -Wl,+b, |
| 59 | QMAKE_HPUX_SHLIB= 1 | ||
| 60 | QMAKE_EXTENSION_SHLIB= sl | ||
| 59 | 61 | ||
| 60 | QMAKE_LIBS = $(LIBS_EXTRA) | 62 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 61 | QMAKE_LIBS_DYNLOAD= -ldld | 63 | QMAKE_LIBS_DYNLOAD= -ldld |
| 62 | QMAKE_LIBS_X11 = -lXext -lX11 -lm | 64 | QMAKE_LIBS_X11 = -lXext -lX11 -lm |
| 63 | QMAKE_LIBS_X11SM= -lSM -lICE | 65 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 64 | QMAKE_LIBS_QT = -lqt | 66 | QMAKE_LIBS_QT = -lqt |
| 65 | 67 | QMAKE_LIBS_QT_THREAD= -lqt-mt | |
| 66 | QMAKE_LIBS_OPENGL= | ||
| 67 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | ||
| 68 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 68 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 69 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 69 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 70 | QMAKE_LIBS_THREAD= -lpthread | ||
| 71 | QMAKE_LIBS_YACC = -ly | ||
| 70 | 72 | ||
| 71 | QMAKE_MOC = $(QTDIR)/bin/moc | 73 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 72 | QMAKE_UIC = $(QTDIR)/bin/uic | 74 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 73 | 75 | ||
| 74 | QMAKE_AR = ar cqs | 76 | QMAKE_AR = ar cqs |
| 75 | QMAKE_RANLIB = | 77 | QMAKE_RANLIB = |
| 76 | 78 | ||
| 77 | QMAKE_TAR = tar -cf | 79 | QMAKE_TAR = tar -cf |
| 78 | QMAKE_GZIP = gzip -9f | 80 | QMAKE_GZIP = gzip -9f |
| 79 | 81 | ||
| 80 | QMAKE_COPY = cp -f | 82 | QMAKE_COPY = cp -f |
| 81 | QMAKE_MOVE = mv -f | 83 | QMAKE_MOVE = mv -f |
| 82 | QMAKE_DEL_FILE = rm -f | 84 | QMAKE_DEL_FILE = rm -f |
| 83 | QMAKE_DEL_DIR = rmdir | 85 | QMAKE_DEL_DIR = rmdir |
| 86 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 87 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/hpux-g++/qplatformdefs.h b/mkspecs/hpux-g++/qplatformdefs.h index 447e883..a9080c7 100644 --- a/mkspecs/hpux-g++/qplatformdefs.h +++ b/mkspecs/hpux-g++/qplatformdefs.h | |||
| @@ -1,87 +1,94 @@ | |||
| 1 | #ifndef QPLATFORMDEFS_H | 1 | #ifndef QPLATFORMDEFS_H |
| 2 | #define QPLATFORMDEFS_H | 2 | #define QPLATFORMDEFS_H |
| 3 | 3 | ||
| 4 | // Get Qt defines/settings | 4 | // Get Qt defines/settings |
| 5 | 5 | ||
| 6 | #include "qglobal.h" | 6 | #include "qglobal.h" |
| 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 | #include <unistd.h> | 10 | #include <unistd.h> |
| 11 | 11 | ||
| 12 | 12 | ||
| 13 | // We are hot - unistd.h should have turned on the specific APIs we requested | 13 | // We are hot - unistd.h should have turned on the specific APIs we requested |
| 14 | 14 | ||
| 15 | 15 | ||
| 16 | #ifdef QT_THREAD_SUPPORT | 16 | #ifdef QT_THREAD_SUPPORT |
| 17 | #include <pthread.h> | 17 | #include <pthread.h> |
| 18 | #endif | 18 | #endif |
| 19 | 19 | ||
| 20 | #include <dirent.h> | 20 | #include <dirent.h> |
| 21 | #include <fcntl.h> | 21 | #include <fcntl.h> |
| 22 | #include <grp.h> | 22 | #include <grp.h> |
| 23 | #include <pwd.h> | 23 | #include <pwd.h> |
| 24 | #include <signal.h> | 24 | #include <signal.h> |
| 25 | #include <dl.h> | 25 | #include <dl.h> |
| 26 | #define QT_HPUX_LD | 26 | #define QT_HPUX_LD |
| 27 | #define QT_NO_LIBRARY_UNLOAD | 27 | #define QT_NO_LIBRARY_UNLOAD |
| 28 | 28 | ||
| 29 | #include <sys/types.h> | 29 | #include <sys/types.h> |
| 30 | #include <sys/ioctl.h> | 30 | #include <sys/ioctl.h> |
| 31 | #include <sys/ipc.h> | 31 | #include <sys/ipc.h> |
| 32 | #include <sys/time.h> | 32 | #include <sys/time.h> |
| 33 | #include <sys/shm.h> | 33 | #include <sys/shm.h> |
| 34 | #include <sys/socket.h> | 34 | #include <sys/socket.h> |
| 35 | #include <sys/stat.h> | 35 | #include <sys/stat.h> |
| 36 | #include <sys/wait.h> | 36 | #include <sys/wait.h> |
| 37 | 37 | ||
| 38 | // DNS header files are not fully covered by X/Open specifications. | 38 | // DNS header files are not fully covered by X/Open specifications. |
| 39 | // In particular nothing is said about res_* :/ | 39 | // In particular nothing is said about res_* :/ |
| 40 | #include <netinet/in.h> | 40 | // #ifdef __cplusplus |
| 41 | #include <arpa/nameser.h> | 41 | // extern "C" { |
| 42 | // #endif | ||
| 43 | // getres() is mangled because of missing extern "C" on | ||
| 44 | // HP-UX 11.x systems missing PHCO_23963 | ||
| 42 | #include <resolv.h> | 45 | #include <resolv.h> |
| 46 | // #ifdef __cplusplus | ||
| 47 | // } | ||
| 48 | // #endif | ||
| 43 | // Undeclared - at least on HP-UX 10.20. | 49 | // Undeclared - at least on HP-UX 10.20. |
| 44 | extern "C" int res_init(); | 50 | extern "C" int res_init(); |
| 45 | 51 | ||
| 46 | 52 | ||
| 47 | #if !defined(QT_NO_COMPAT) | 53 | #if !defined(QT_NO_COMPAT) |
| 48 | #define QT_STATBUF struct stat | 54 | #define QT_STATBUF struct stat |
| 49 | #define QT_STATBUF4TSTATstruct stat | 55 | #define QT_STATBUF4TSTATstruct stat |
| 50 | #define QT_STAT ::stat | 56 | #define QT_STAT ::stat |
| 51 | #define QT_FSTAT ::fstat | 57 | #define QT_FSTAT ::fstat |
| 52 | #define QT_STAT_REG S_IFREG | 58 | #define QT_STAT_REG S_IFREG |
| 53 | #define QT_STAT_DIR S_IFDIR | 59 | #define QT_STAT_DIR S_IFDIR |
| 54 | #define QT_STAT_MASK S_IFMT | 60 | #define QT_STAT_MASK S_IFMT |
| 55 | #define QT_STAT_LNK S_IFLNK | 61 | #define QT_STAT_LNK S_IFLNK |
| 56 | #define QT_FILENO fileno | 62 | #define QT_FILENO fileno |
| 57 | #define QT_OPEN ::open | 63 | #define QT_OPEN ::open |
| 58 | #define QT_CLOSE ::close | 64 | #define QT_CLOSE ::close |
| 59 | #define QT_LSEEK ::lseek | 65 | #define QT_LSEEK ::lseek |
| 60 | #define QT_READ ::read | 66 | #define QT_READ ::read |
| 61 | #define QT_WRITE ::write | 67 | #define QT_WRITE ::write |
| 62 | #define QT_ACCESS ::access | 68 | #define QT_ACCESS ::access |
| 63 | #define QT_GETCWD ::getcwd | 69 | #define QT_GETCWD ::getcwd |
| 64 | #define QT_CHDIR ::chdir | 70 | #define QT_CHDIR ::chdir |
| 65 | #define QT_MKDIR ::mkdir | 71 | #define QT_MKDIR ::mkdir |
| 66 | #define QT_RMDIR ::rmdir | 72 | #define QT_RMDIR ::rmdir |
| 67 | #define QT_OPEN_RDONLY O_RDONLY | 73 | #define QT_OPEN_RDONLY O_RDONLY |
| 68 | #define QT_OPEN_WRONLY O_WRONLY | 74 | #define QT_OPEN_WRONLY O_WRONLY |
| 69 | #define QT_OPEN_RDWR O_RDWR | 75 | #define QT_OPEN_RDWR O_RDWR |
| 70 | #define QT_OPEN_CREAT O_CREAT | 76 | #define QT_OPEN_CREAT O_CREAT |
| 71 | #define QT_OPEN_TRUNC O_TRUNC | 77 | #define QT_OPEN_TRUNC O_TRUNC |
| 72 | #define QT_OPEN_APPEND O_APPEND | 78 | #define QT_OPEN_APPEND O_APPEND |
| 73 | #endif | 79 | #endif |
| 74 | 80 | ||
| 75 | #define QT_SIGNAL_RETTYPEvoid | 81 | #define QT_SIGNAL_RETTYPEvoid |
| 76 | #define QT_SIGNAL_ARGS int | 82 | #define QT_SIGNAL_ARGS int |
| 77 | #define QT_SIGNAL_IGNORESIG_IGN | 83 | #define QT_SIGNAL_IGNORESIG_IGN |
| 78 | 84 | ||
| 79 | #define QT_SOCKLEN_T int | 85 | #define QT_SOCKLEN_T int |
| 80 | 86 | ||
| 81 | // presence of _XOPEN_UNIX can be used to detect HP-UX 10 or higher | 87 | // presence of _XOPEN_UNIX can be used to detect HP-UX 10 or higher |
| 82 | #if !defined(_XOPEN_UNIX) | 88 | #if !defined(_XOPEN_UNIX) |
| 83 | // HP-UX 9's select() didn't accept fd_set, yet. | 89 | // HP-UX 9's select() didn't accept fd_set, yet. |
| 84 | #define select(a,b,c,d,e) select((a), (int *)(b), (int *)(c), (int *)(d), (e)) | 90 | #define select(a,b,c,d,e) select((a), (int *)(b), (int *)(c), (int *)(d), (e)) |
| 85 | #endif | 91 | #endif |
| 86 | 92 | ||
| 93 | |||
| 87 | #endif // QPLATFORMDEFS_H | 94 | #endif // QPLATFORMDEFS_H |
diff --git a/mkspecs/hpuxi-acc-32/qmake.conf b/mkspecs/hpuxi-acc-32/qmake.conf new file mode 100644 index 0000000..7687cd9 --- a/dev/null +++ b/mkspecs/hpuxi-acc-32/qmake.conf | |||
| @@ -0,0 +1,124 @@ | |||
| 1 | # | ||
| 2 | # $Id$ | ||
| 3 | # | ||
| 4 | # qmake configuration for hpuxi-acc-32 | ||
| 5 | # | ||
| 6 | # We define _POSIX_C_SOURCE to 199506L when using threads, therefore | ||
| 7 | # we also need to redefine _HPUX_SOURCE. | ||
| 8 | # From pthread(3t): | ||
| 9 | # Some documentation will recommend the use of -D_REENTRANT for | ||
| 10 | # compilation. While this also functions properly, it is considered | ||
| 11 | # an obsolescent form. | ||
| 12 | # See pthread(3t) for more details. | ||
| 13 | # | ||
| 14 | # From the "HP aC++ Online Programmer's Guide": | ||
| 15 | # When +DA2.0W is specified: | ||
| 16 | # * 64-bit SVR4 Executable and Linking Format (ELF) object files | ||
| 17 | # are generated for PA-RISC 2.0. | ||
| 18 | # * The preprocessor predefined macro, __LP64__ is defined. | ||
| 19 | # * The correct path for 64-bit system and language libraries is | ||
| 20 | # selected. | ||
| 21 | # When +DD32 is specified: | ||
| 22 | # * The size of an int, long, or pointer data type is 32-bits. | ||
| 23 | # The size of an int data type is 32-bits. The size of a long or | ||
| 24 | # pointer data type is 64-bits. | ||
| 25 | # * This is the default, currently equivalent to +DA1.1 architecture. | ||
| 26 | # When +DD64 is specified: | ||
| 27 | # * The size of an int data type is 32-bits. The size of a long or | ||
| 28 | # pointer data type is 64-bits. | ||
| 29 | # * This is currently equivalent to +DA2.OW architecture. | ||
| 30 | # * The preprocessor predefined macro, __LP64__ is defined. | ||
| 31 | # Using +DS to Specify Instruction Scheduling: | ||
| 32 | # * By default, the compiler performs scheduling tuned for the system | ||
| 33 | # on which you are compiling, or, if specified, tuned for the setting | ||
| 34 | # of the +DA option. | ||
| 35 | # | ||
| 36 | # From the online "C/HP-UX Reference Manual": | ||
| 37 | #-Aa | ||
| 38 | # Enables strict ANSI C compliance. | ||
| 39 | # -Ae | ||
| 40 | # Enables ANSI C compliance, HP value-added features (as described | ||
| 41 | # for +e option), and _HPUX_SOURCE name space macro. It is equivalent | ||
| 42 | # to -Aa +e -D_HPUX_SOURCE. | ||
| 43 | # +e | ||
| 44 | # Enables the following HP value added features while compiling in | ||
| 45 | # ANSI C mode: sized enum, long long, long pointers, compiler supplied | ||
| 46 | # defaults for missing arguments to intrinsic calls, and $ in identifier | ||
| 47 | # HP C extensions. | ||
| 48 | # | ||
| 49 | |||
| 50 | MAKEFILE_GENERATOR= UNIX | ||
| 51 | TEMPLATE = app | ||
| 52 | CONFIG += qt warn_on release plugin_no_soname | ||
| 53 | |||
| 54 | QMAKE_CC = cc | ||
| 55 | QMAKE_LEX = lex | ||
| 56 | QMAKE_LEXFLAGS = | ||
| 57 | QMAKE_YACC = yacc | ||
| 58 | QMAKE_YACCFLAGS = -d | ||
| 59 | QMAKE_CFLAGS = +DD32 +DSitanium -w $(CFLAGS_EXTRA) | ||
| 60 | QMAKE_CFLAGS_WARN_ON= | ||
| 61 | QMAKE_CFLAGS_WARN_OFF= -w | ||
| 62 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), +O2 +Osize) | ||
| 63 | QMAKE_CFLAGS_DEBUG= -g | ||
| 64 | QMAKE_CFLAGS_SHLIB= +Z | ||
| 65 | QMAKE_CFLAGS_YACC= | ||
| 66 | QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE | ||
| 67 | |||
| 68 | QMAKE_CXX = aCC | ||
| 69 | QMAKE_CXXFLAGS = +DD32 +DSitanium -w -D__STRICT_ANSI__ -D_HPUX_SOURCE $(CXXFLAGS_EXTRA) | ||
| 70 | QMAKE_CXXFLAGS_DEPS= +M | ||
| 71 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | ||
| 72 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | ||
| 73 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | ||
| 74 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | ||
| 75 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | ||
| 76 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | ||
| 77 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | ||
| 78 | |||
| 79 | QMAKE_INCDIR = | ||
| 80 | QMAKE_LIBDIR = | ||
| 81 | QMAKE_INCDIR_X11= /usr/include/X11R6 | ||
| 82 | QMAKE_LIBDIR_X11= /usr/lib/hpux32/X11R6 | ||
| 83 | QMAKE_INCDIR_QT = $(QTDIR)/include | ||
| 84 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | ||
| 85 | QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include | ||
| 86 | QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib/hpux32 /usr/contrib/X11R6/lib/hpux32 | ||
| 87 | |||
| 88 | QMAKE_LINK = aCC | ||
| 89 | QMAKE_LINK_SHLIB= aCC | ||
| 90 | QMAKE_LFLAGS = +DD32 +DSitanium -Wl,+s $(LFLAGS_EXTRA) | ||
| 91 | QMAKE_LFLAGS_RELEASE= +O2 | ||
| 92 | QMAKE_LFLAGS_DEBUG= -g | ||
| 93 | QMAKE_LFLAGS_SHLIB= -b -Wl,-a,shared | ||
| 94 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | ||
| 95 | QMAKE_LFLAGS_SONAME= -Wl,+h, | ||
| 96 | QMAKE_LFLAGS_THREAD= | ||
| 97 | QMAKE_RPATH = | ||
| 98 | |||
| 99 | QMAKE_LIBS = -lm $(LIBS_EXTRA) | ||
| 100 | QMAKE_LIBS_DYNLOAD= -ldl | ||
| 101 | QMAKE_LIBS_X11 = -lXext -lX11 | ||
| 102 | QMAKE_LIBS_X11SM= -lSM -lICE | ||
| 103 | QMAKE_LIBS_QT = -lqt | ||
| 104 | QMAKE_LIBS_QT_THREAD= -lqt-mt | ||
| 105 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt | ||
| 106 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu -lXt | ||
| 107 | QMAKE_LIBS_THREAD= -lpthread | ||
| 108 | QMAKE_LIBS_YACC = -ly | ||
| 109 | |||
| 110 | QMAKE_MOC = $(QTDIR)/bin/moc | ||
| 111 | QMAKE_UIC = $(QTDIR)/bin/uic | ||
| 112 | |||
| 113 | QMAKE_AR = ar cqs | ||
| 114 | QMAKE_RANLIB = | ||
| 115 | |||
| 116 | QMAKE_TAR = tar -cf | ||
| 117 | QMAKE_GZIP = gzip -9f | ||
| 118 | |||
| 119 | QMAKE_COPY = cp -f | ||
| 120 | QMAKE_MOVE = mv -f | ||
| 121 | QMAKE_DEL_FILE = rm -f | ||
| 122 | QMAKE_DEL_DIR = rmdir | ||
| 123 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 124 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/hpuxi-acc-32/qplatformdefs.h b/mkspecs/hpuxi-acc-32/qplatformdefs.h new file mode 100644 index 0000000..6307fc0 --- a/dev/null +++ b/mkspecs/hpuxi-acc-32/qplatformdefs.h | |||
| @@ -0,0 +1,88 @@ | |||
| 1 | #ifndef QPLATFORMDEFS_H | ||
| 2 | #define QPLATFORMDEFS_H | ||
| 3 | |||
| 4 | // Get Qt defines/settings | ||
| 5 | |||
| 6 | #include "qglobal.h" | ||
| 7 | |||
| 8 | // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs | ||
| 9 | |||
| 10 | #include <unistd.h> | ||
| 11 | |||
| 12 | |||
| 13 | // We are hot - unistd.h should have turned on the specific APIs we requested | ||
| 14 | |||
| 15 | |||
| 16 | #ifdef QT_THREAD_SUPPORT | ||
| 17 | #include <pthread.h> | ||
| 18 | #endif | ||
| 19 | |||
| 20 | #include <dirent.h> | ||
| 21 | #include <fcntl.h> | ||
| 22 | #include <grp.h> | ||
| 23 | #include <pwd.h> | ||
| 24 | #include <signal.h> | ||
| 25 | #include <dl.h> | ||
| 26 | #define QT_HPUX_LD | ||
| 27 | #define QT_NO_LIBRARY_UNLOAD | ||
| 28 | |||
| 29 | #include <sys/types.h> | ||
| 30 | #include <sys/ioctl.h> | ||
| 31 | #include <sys/ipc.h> | ||
| 32 | #include <sys/time.h> | ||
| 33 | #include <sys/shm.h> | ||
| 34 | #include <sys/socket.h> | ||
| 35 | #include <sys/stat.h> | ||
| 36 | #include <sys/wait.h> | ||
| 37 | |||
| 38 | // DNS header files are not fully covered by X/Open specifications. | ||
| 39 | // In particular nothing is said about res_* :/ | ||
| 40 | // #ifdef __cplusplus | ||
| 41 | // extern "C" { | ||
| 42 | // #endif | ||
| 43 | // getres() is mangled because of missing extern "C" on | ||
| 44 | // HP-UX 11.x systems missing PHCO_23963 | ||
| 45 | #include <resolv.h> | ||
| 46 | // #ifdef __cplusplus | ||
| 47 | // } | ||
| 48 | // #endif | ||
| 49 | // Undeclared - at least on HP-UX 10.20. | ||
| 50 | extern "C" int res_init(); | ||
| 51 | |||
| 52 | |||
| 53 | #if !defined(QT_NO_COMPAT) | ||
| 54 | #define QT_STATBUF struct stat | ||
| 55 | #define QT_STATBUF4TSTATstruct stat | ||
| 56 | #define QT_STAT ::stat | ||
| 57 | #define QT_FSTAT ::fstat | ||
| 58 | #define QT_STAT_REG S_IFREG | ||
| 59 | #define QT_STAT_DIR S_IFDIR | ||
| 60 | #define QT_STAT_MASK S_IFMT | ||
| 61 | #define QT_STAT_LNK S_IFLNK | ||
| 62 | #define QT_FILENO fileno | ||
| 63 | #define QT_OPEN ::open | ||
| 64 | #define QT_CLOSE ::close | ||
| 65 | #define QT_LSEEK ::lseek | ||
| 66 | #define QT_READ ::read | ||
| 67 | #define QT_WRITE ::write | ||
| 68 | #define QT_ACCESS ::access | ||
| 69 | #define QT_GETCWD ::getcwd | ||
| 70 | #define QT_CHDIR ::chdir | ||
| 71 | #define QT_MKDIR ::mkdir | ||
| 72 | #define QT_RMDIR ::rmdir | ||
| 73 | #define QT_OPEN_RDONLY O_RDONLY | ||
| 74 | #define QT_OPEN_WRONLY O_WRONLY | ||
| 75 | #define QT_OPEN_RDWR O_RDWR | ||
| 76 | #define QT_OPEN_CREAT O_CREAT | ||
| 77 | #define QT_OPEN_TRUNC O_TRUNC | ||
| 78 | #define QT_OPEN_APPEND O_APPEND | ||
| 79 | #endif | ||
| 80 | |||
| 81 | #define QT_SIGNAL_RETTYPEvoid | ||
| 82 | #define QT_SIGNAL_ARGS int | ||
| 83 | #define QT_SIGNAL_IGNORESIG_IGN | ||
| 84 | |||
| 85 | #define QT_SOCKLEN_T int | ||
| 86 | |||
| 87 | |||
| 88 | #endif // QPLATFORMDEFS_H | ||
diff --git a/mkspecs/hpuxi-acc-64/qmake.conf b/mkspecs/hpuxi-acc-64/qmake.conf new file mode 100644 index 0000000..d34912b --- a/dev/null +++ b/mkspecs/hpuxi-acc-64/qmake.conf | |||
| @@ -0,0 +1,124 @@ | |||
| 1 | # | ||
| 2 | # $Id$ | ||
| 3 | # | ||
| 4 | # qmake configuration for hpuxi-acc-64 | ||
| 5 | # | ||
| 6 | # We define _POSIX_C_SOURCE to 199506L when using threads, therefore | ||
| 7 | # we also need to redefine _HPUX_SOURCE. | ||
| 8 | # From pthread(3t): | ||
| 9 | # Some documentation will recommend the use of -D_REENTRANT for | ||
| 10 | # compilation. While this also functions properly, it is considered | ||
| 11 | # an obsolescent form. | ||
| 12 | # See pthread(3t) for more details. | ||
| 13 | # | ||
| 14 | # From the "HP aC++ Online Programmer's Guide": | ||
| 15 | # When +DA2.0W is specified: | ||
| 16 | # * 64-bit SVR4 Executable and Linking Format (ELF) object files | ||
| 17 | # are generated for PA-RISC 2.0. | ||
| 18 | # * The preprocessor predefined macro, __LP64__ is defined. | ||
| 19 | # * The correct path for 64-bit system and language libraries is | ||
| 20 | # selected. | ||
| 21 | # When +DD32 is specified: | ||
| 22 | # * The size of an int, long, or pointer data type is 32-bits. | ||
| 23 | # The size of an int data type is 32-bits. The size of a long or | ||
| 24 | # pointer data type is 64-bits. | ||
| 25 | # * This is the default, currently equivalent to +DA1.1 architecture. | ||
| 26 | # When +DD64 is specified: | ||
| 27 | # * The size of an int data type is 32-bits. The size of a long or | ||
| 28 | # pointer data type is 64-bits. | ||
| 29 | # * This is currently equivalent to +DA2.OW architecture. | ||
| 30 | # * The preprocessor predefined macro, __LP64__ is defined. | ||
| 31 | # Using +DS to Specify Instruction Scheduling: | ||
| 32 | # * By default, the compiler performs scheduling tuned for the system | ||
| 33 | # on which you are compiling, or, if specified, tuned for the setting | ||
| 34 | # of the +DA option. | ||
| 35 | # | ||
| 36 | # From the online "C/HP-UX Reference Manual": | ||
| 37 | #-Aa | ||
| 38 | # Enables strict ANSI C compliance. | ||
| 39 | # -Ae | ||
| 40 | # Enables ANSI C compliance, HP value-added features (as described | ||
| 41 | # for +e option), and _HPUX_SOURCE name space macro. It is equivalent | ||
| 42 | # to -Aa +e -D_HPUX_SOURCE. | ||
| 43 | # +e | ||
| 44 | # Enables the following HP value added features while compiling in | ||
| 45 | # ANSI C mode: sized enum, long long, long pointers, compiler supplied | ||
| 46 | # defaults for missing arguments to intrinsic calls, and $ in identifier | ||
| 47 | # HP C extensions. | ||
| 48 | # | ||
| 49 | |||
| 50 | MAKEFILE_GENERATOR= UNIX | ||
| 51 | TEMPLATE = app | ||
| 52 | CONFIG += qt warn_on release plugin_no_soname | ||
| 53 | |||
| 54 | QMAKE_CC = cc | ||
| 55 | QMAKE_LEX = lex | ||
| 56 | QMAKE_LEXFLAGS = | ||
| 57 | QMAKE_YACC = yacc | ||
| 58 | QMAKE_YACCFLAGS = -d | ||
| 59 | QMAKE_CFLAGS = +DD64 +DSitanium -w $(CFLAGS_EXTRA) | ||
| 60 | QMAKE_CFLAGS_WARN_ON= | ||
| 61 | QMAKE_CFLAGS_WARN_OFF= -w | ||
| 62 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), +O2 +Osize) | ||
| 63 | QMAKE_CFLAGS_DEBUG= -g | ||
| 64 | QMAKE_CFLAGS_SHLIB= +Z | ||
| 65 | QMAKE_CFLAGS_YACC= | ||
| 66 | QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE | ||
| 67 | |||
| 68 | QMAKE_CXX = aCC | ||
| 69 | QMAKE_CXXFLAGS = +DD64 +DSitanium -w -D__STRICT_ANSI__ -D_HPUX_SOURCE $(CXXFLAGS_EXTRA) | ||
| 70 | QMAKE_CXXFLAGS_DEPS= +M | ||
| 71 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | ||
| 72 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | ||
| 73 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | ||
| 74 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | ||
| 75 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | ||
| 76 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | ||
| 77 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | ||
| 78 | |||
| 79 | QMAKE_INCDIR = | ||
| 80 | QMAKE_LIBDIR = | ||
| 81 | QMAKE_INCDIR_X11= /usr/include/X11R6 | ||
| 82 | QMAKE_LIBDIR_X11= /usr/lib/hpux64/X11R6 | ||
| 83 | QMAKE_INCDIR_QT = $(QTDIR)/include | ||
| 84 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | ||
| 85 | QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include | ||
| 86 | QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib/hpux64 /usr/contrib/X11R6/lib/hpux64 | ||
| 87 | |||
| 88 | QMAKE_LINK = aCC | ||
| 89 | QMAKE_LINK_SHLIB= aCC | ||
| 90 | QMAKE_LFLAGS = +DD64 +DSitanium -Wl,+s $(LFLAGS_EXTRA) | ||
| 91 | QMAKE_LFLAGS_RELEASE= +O2 | ||
| 92 | QMAKE_LFLAGS_DEBUG= -g | ||
| 93 | QMAKE_LFLAGS_SHLIB= -b -Wl,-a,shared | ||
| 94 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | ||
| 95 | QMAKE_LFLAGS_SONAME= -Wl,+h, | ||
| 96 | QMAKE_LFLAGS_THREAD= | ||
| 97 | QMAKE_RPATH = | ||
| 98 | |||
| 99 | QMAKE_LIBS = -lm $(LIBS_EXTRA) | ||
| 100 | QMAKE_LIBS_DYNLOAD= -ldl | ||
| 101 | QMAKE_LIBS_X11 = -lXext -lX11 | ||
| 102 | QMAKE_LIBS_X11SM= -lSM -lICE | ||
| 103 | QMAKE_LIBS_QT = -lqt | ||
| 104 | QMAKE_LIBS_QT_THREAD= -lqt-mt | ||
| 105 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt | ||
| 106 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu -lXt | ||
| 107 | QMAKE_LIBS_THREAD= -lpthread | ||
| 108 | QMAKE_LIBS_YACC = -ly | ||
| 109 | |||
| 110 | QMAKE_MOC = $(QTDIR)/bin/moc | ||
| 111 | QMAKE_UIC = $(QTDIR)/bin/uic | ||
| 112 | |||
| 113 | QMAKE_AR = ar cqs | ||
| 114 | QMAKE_RANLIB = | ||
| 115 | |||
| 116 | QMAKE_TAR = tar -cf | ||
| 117 | QMAKE_GZIP = gzip -9f | ||
| 118 | |||
| 119 | QMAKE_COPY = cp -f | ||
| 120 | QMAKE_MOVE = mv -f | ||
| 121 | QMAKE_DEL_FILE = rm -f | ||
| 122 | QMAKE_DEL_DIR = rmdir | ||
| 123 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 124 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/hpuxi-acc-64/qplatformdefs.h b/mkspecs/hpuxi-acc-64/qplatformdefs.h new file mode 100644 index 0000000..6307fc0 --- a/dev/null +++ b/mkspecs/hpuxi-acc-64/qplatformdefs.h | |||
| @@ -0,0 +1,88 @@ | |||
| 1 | #ifndef QPLATFORMDEFS_H | ||
| 2 | #define QPLATFORMDEFS_H | ||
| 3 | |||
| 4 | // Get Qt defines/settings | ||
| 5 | |||
| 6 | #include "qglobal.h" | ||
| 7 | |||
| 8 | // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs | ||
| 9 | |||
| 10 | #include <unistd.h> | ||
| 11 | |||
| 12 | |||
| 13 | // We are hot - unistd.h should have turned on the specific APIs we requested | ||
| 14 | |||
| 15 | |||
| 16 | #ifdef QT_THREAD_SUPPORT | ||
| 17 | #include <pthread.h> | ||
| 18 | #endif | ||
| 19 | |||
| 20 | #include <dirent.h> | ||
| 21 | #include <fcntl.h> | ||
| 22 | #include <grp.h> | ||
| 23 | #include <pwd.h> | ||
| 24 | #include <signal.h> | ||
| 25 | #include <dl.h> | ||
| 26 | #define QT_HPUX_LD | ||
| 27 | #define QT_NO_LIBRARY_UNLOAD | ||
| 28 | |||
| 29 | #include <sys/types.h> | ||
| 30 | #include <sys/ioctl.h> | ||
| 31 | #include <sys/ipc.h> | ||
| 32 | #include <sys/time.h> | ||
| 33 | #include <sys/shm.h> | ||
| 34 | #include <sys/socket.h> | ||
| 35 | #include <sys/stat.h> | ||
| 36 | #include <sys/wait.h> | ||
| 37 | |||
| 38 | // DNS header files are not fully covered by X/Open specifications. | ||
| 39 | // In particular nothing is said about res_* :/ | ||
| 40 | // #ifdef __cplusplus | ||
| 41 | // extern "C" { | ||
| 42 | // #endif | ||
| 43 | // getres() is mangled because of missing extern "C" on | ||
| 44 | // HP-UX 11.x systems missing PHCO_23963 | ||
| 45 | #include <resolv.h> | ||
| 46 | // #ifdef __cplusplus | ||
| 47 | // } | ||
| 48 | // #endif | ||
| 49 | // Undeclared - at least on HP-UX 10.20. | ||
| 50 | extern "C" int res_init(); | ||
| 51 | |||
| 52 | |||
| 53 | #if !defined(QT_NO_COMPAT) | ||
| 54 | #define QT_STATBUF struct stat | ||
| 55 | #define QT_STATBUF4TSTATstruct stat | ||
| 56 | #define QT_STAT ::stat | ||
| 57 | #define QT_FSTAT ::fstat | ||
| 58 | #define QT_STAT_REG S_IFREG | ||
| 59 | #define QT_STAT_DIR S_IFDIR | ||
| 60 | #define QT_STAT_MASK S_IFMT | ||
| 61 | #define QT_STAT_LNK S_IFLNK | ||
| 62 | #define QT_FILENO fileno | ||
| 63 | #define QT_OPEN ::open | ||
| 64 | #define QT_CLOSE ::close | ||
| 65 | #define QT_LSEEK ::lseek | ||
| 66 | #define QT_READ ::read | ||
| 67 | #define QT_WRITE ::write | ||
| 68 | #define QT_ACCESS ::access | ||
| 69 | #define QT_GETCWD ::getcwd | ||
| 70 | #define QT_CHDIR ::chdir | ||
| 71 | #define QT_MKDIR ::mkdir | ||
| 72 | #define QT_RMDIR ::rmdir | ||
| 73 | #define QT_OPEN_RDONLY O_RDONLY | ||
| 74 | #define QT_OPEN_WRONLY O_WRONLY | ||
| 75 | #define QT_OPEN_RDWR O_RDWR | ||
| 76 | #define QT_OPEN_CREAT O_CREAT | ||
| 77 | #define QT_OPEN_TRUNC O_TRUNC | ||
| 78 | #define QT_OPEN_APPEND O_APPEND | ||
| 79 | #endif | ||
| 80 | |||
| 81 | #define QT_SIGNAL_RETTYPEvoid | ||
| 82 | #define QT_SIGNAL_ARGS int | ||
| 83 | #define QT_SIGNAL_IGNORESIG_IGN | ||
| 84 | |||
| 85 | #define QT_SOCKLEN_T int | ||
| 86 | |||
| 87 | |||
| 88 | #endif // QPLATFORMDEFS_H | ||
diff --git a/mkspecs/hurd-g++/qmake.conf b/mkspecs/hurd-g++/qmake.conf index b86f93b..a08c3d1 100644 --- a/mkspecs/hurd-g++/qmake.conf +++ b/mkspecs/hurd-g++/qmake.conf | |||
| @@ -1,77 +1,78 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for hurd-g++ | 4 | # qmake configuration for hurd-g++ |
| 5 | # | 5 | # |
| 6 | # Submitted by uch@nop.or.jp as "gnu-g++". | 6 | # Submitted by uch@nop.or.jp as "gnu-g++". |
| 7 | # Renamed to "hurd-g++" because people were confusing gnu with linux. | 7 | # Renamed to "hurd-g++" because people were confusing GNU/Hurd with GNU/Linux. |
| 8 | # | 8 | # |
| 9 | 9 | ||
| 10 | MAKEFILE_GENERATOR= UNIX | 10 | MAKEFILE_GENERATOR= UNIX |
| 11 | TEMPLATE = app | 11 | TEMPLATE = app |
| 12 | CONFIG += qt warn_on release | 12 | CONFIG += qt warn_on release link_prl |
| 13 | 13 | ||
| 14 | QMAKE_CC = gcc | 14 | QMAKE_CC = gcc |
| 15 | QMAKE_LEX = flex | 15 | QMAKE_LEX = flex |
| 16 | QMAKE_LEXFLAGS = | 16 | QMAKE_LEXFLAGS = |
| 17 | QMAKE_YACC = yacc | 17 | QMAKE_YACC = yacc |
| 18 | QMAKE_YACCFLAGS = -d | 18 | QMAKE_YACCFLAGS = -d |
| 19 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) | 19 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 20 | QMAKE_CFLAGS_DEPS= -M | 20 | QMAKE_CFLAGS_DEPS= -M |
| 21 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 21 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 22 | QMAKE_CFLAGS_WARN_OFF= -w | 22 | QMAKE_CFLAGS_WARN_OFF= -w |
| 23 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 23 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 24 | QMAKE_CFLAGS_DEBUG= -g | 24 | QMAKE_CFLAGS_DEBUG= -g |
| 25 | QMAKE_CFLAGS_SHLIB= -fPIC | 25 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 26 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 26 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 27 | 27 | ||
| 28 | QMAKE_CXX = g++ | 28 | QMAKE_CXX = g++ |
| 29 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 29 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 30 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 30 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 31 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 31 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 32 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 32 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 33 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 33 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 34 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 34 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 35 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 35 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 36 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 36 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 37 | 37 | ||
| 38 | QMAKE_INCDIR = | 38 | QMAKE_INCDIR = |
| 39 | QMAKE_LIBDIR = | 39 | QMAKE_LIBDIR = |
| 40 | QMAKE_INCDIR_X11= /usr/X11R6/include | 40 | QMAKE_INCDIR_X11= /usr/X11R6/include |
| 41 | QMAKE_LIBDIR_X11= /usr/X11R6/lib | 41 | QMAKE_LIBDIR_X11= /usr/X11R6/lib |
| 42 | QMAKE_INCDIR_QT = $(QTDIR)/include | 42 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 44 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 44 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 45 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 45 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 46 | 46 | ||
| 47 | QMAKE_LINK = g++ | 47 | QMAKE_LINK = g++ |
| 48 | QMAKE_LINK_SHLIB= g++ | 48 | QMAKE_LINK_SHLIB= g++ |
| 49 | QMAKE_LFLAGS = -Wl,-rpath=/lib:/usr/X11R6/lib:$(QTDIR)/lib $(LFLAGS_EXTRA) | 49 | QMAKE_LFLAGS = -Wl,-rpath=/lib:/usr/X11R6/lib:$(QTDIR)/lib $(LFLAGS_EXTRA) |
| 50 | QMAKE_LFLAGS_RELEASE= | 50 | QMAKE_LFLAGS_RELEASE= |
| 51 | QMAKE_LFLAGS_DEBUG= | 51 | QMAKE_LFLAGS_DEBUG= |
| 52 | QMAKE_LFLAGS_SHLIB= -shared | 52 | QMAKE_LFLAGS_SHLIB= -shared |
| 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 54 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 54 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 55 | 55 | ||
| 56 | QMAKE_LIBS = $(LIBS_EXTRA) | 56 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 57 | QMAKE_LIBS_DYNLOAD= -ldl | 57 | QMAKE_LIBS_DYNLOAD= -ldl |
| 58 | QMAKE_LIBS_X11 = -lXext -lX11 -lm | 58 | QMAKE_LIBS_X11 = -lXext -lX11 -lm |
| 59 | QMAKE_LIBS_QT = -lqt | 59 | QMAKE_LIBS_QT = -lqt |
| 60 | 60 | ||
| 61 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 61 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 62 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 62 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 63 | 63 | ||
| 64 | QMAKE_MOC = $(QTDIR)/bin/moc | 64 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 65 | QMAKE_UIC = $(QTDIR)/bin/uic | 65 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 66 | 66 | ||
| 67 | QMAKE_AR = ar cqs | 67 | QMAKE_AR = ar cqs |
| 68 | QMAKE_RANLIB = | 68 | QMAKE_RANLIB = |
| 69 | 69 | ||
| 70 | QMAKE_TAR = tar -cf | 70 | QMAKE_TAR = tar -cf |
| 71 | QMAKE_GZIP = gzip -9f | 71 | QMAKE_GZIP = gzip -9f |
| 72 | 72 | ||
| 73 | QMAKE_COPY = cp -f | 73 | QMAKE_COPY = cp -f |
| 74 | QMAKE_MOVE = mv -f | 74 | QMAKE_MOVE = mv -f |
| 75 | QMAKE_DEL_FILE = rm -f | 75 | QMAKE_DEL_FILE = rm -f |
| 76 | QMAKE_DEL_DIR = rmdir | 76 | QMAKE_DEL_DIR = rmdir |
| 77 | 77 | QMAKE_CHK_DIR_EXISTS= test -d | |
| 78 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/irix-cc-64/qmake.conf b/mkspecs/irix-cc-64/qmake.conf index 8035658..be50743 100644 --- a/mkspecs/irix-cc-64/qmake.conf +++ b/mkspecs/irix-cc-64/qmake.conf | |||
| @@ -1,113 +1,115 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for irix-64 | 4 | # qmake configuration for irix-cc-64 |
| 5 | # | 5 | # |
| 6 | # From cc(1): | 6 | # From cc(1): |
| 7 | # -64 | 7 | # -64 |
| 8 | # Generates a 64-bit object. This defaults to -mips4 if -mips3 has | 8 | # Generates a 64-bit object. This defaults to -mips4 if -mips3 has |
| 9 | # not been specified. | 9 | # not been specified. |
| 10 | # -LANG: ... | 10 | # -LANG: ... |
| 11 | # The language feature option group controls the source language | 11 | # The language feature option group controls the source language |
| 12 | # interpretation assumed by the compiler. The individual controls | 12 | # interpretation assumed by the compiler. The individual controls |
| 13 | # in this group are as follows: | 13 | # in this group are as follows: |
| 14 | # ansi-for-init-scope [ = ( ON|OFF ) ] | 14 | # ansi-for-init-scope [ = ( ON|OFF ) ] |
| 15 | # Enables or disables the ANSI scoping rules for for-init | 15 | # Enables or disables the ANSI scoping rules for for-init |
| 16 | # declarations (the scope of the name declared extends to | 16 | # declarations (the scope of the name declared extends to |
| 17 | # the end of the for statement). This enables the behavior | 17 | # the end of the for statement). This enables the behavior |
| 18 | # that is required by the C++ standard. The default value | 18 | # that is required by the C++ standard. The default value |
| 19 | # is OFF, which is the ARM behavior (the scope of the name | 19 | # is OFF, which is the ARM behavior (the scope of the name |
| 20 | # declared extends to the end of the block enclosing the for | 20 | # declared extends to the end of the block enclosing the for |
| 21 | # statement). | 21 | # statement). |
| 22 | # bool [ = ( ON|OFF ) ] | 22 | # bool [ = ( ON|OFF ) ] |
| 23 | # Enables or disables the predefined bool data type, along | 23 | # Enables or disables the predefined bool data type, along |
| 24 | # with the predefined values true and false. Use this option | 24 | # with the predefined values true and false. Use this option |
| 25 | # only to suppress this type in old code that defines bool | 25 | # only to suppress this type in old code that defines bool |
| 26 | # itself. Because this option changes the mangling of function | 26 | # itself. Because this option changes the mangling of function |
| 27 | # names with bool parameters, all files comprising a program | 27 | # names with bool parameters, all files comprising a program |
| 28 | # should be compiled with consistent options. | 28 | # should be compiled with consistent options. |
| 29 | # Default is ON. | 29 | # Default is ON. |
| 30 | # The _BOOL feature macro can be used in #ifdefs to do conditional | 30 | # The _BOOL feature macro can be used in #ifdefs to do conditional |
| 31 | # compilation based on whether or not this option is enabled. | 31 | # compilation based on whether or not this option is enabled. |
| 32 | # std | 32 | # std |
| 33 | # Enables use of the standard C++ library and standard- | 33 | # Enables use of the standard C++ library and standard- |
| 34 | # conforming iostream library. Specifying this flag also | 34 | # conforming iostream library. Specifying this flag also |
| 35 | # triggers other standard-conforming behavior, such as the | 35 | # triggers other standard-conforming behavior, such as the |
| 36 | # new rules for the scope of for loop initializers. | 36 | # new rules for the scope of for loop initializers. |
| 37 | # | 37 | # |
| 38 | 38 | ||
| 39 | MAKEFILE_GENERATOR= UNIX | 39 | MAKEFILE_GENERATOR= UNIX |
| 40 | TEMPLATE = app | 40 | TEMPLATE = app |
| 41 | CONFIG += qt warn_on release | 41 | CONFIG += qt warn_on release link_prl |
| 42 | 42 | ||
| 43 | QMAKE_CC = cc | 43 | QMAKE_CC = cc |
| 44 | QMAKE_LEX = flex | 44 | QMAKE_LEX = flex |
| 45 | QMAKE_LEXFLAGS = | 45 | QMAKE_LEXFLAGS = |
| 46 | QMAKE_YACC = yacc | 46 | QMAKE_YACC = yacc |
| 47 | QMAKE_YACCFLAGS = -d | 47 | QMAKE_YACCFLAGS = -d |
| 48 | QMAKE_CFLAGS = -64 -woff 1021,1209,1233,1314,1355,1375,1506 $(CFLAGS_EXTRA) | 48 | QMAKE_CFLAGS = -64 -woff 1021,1209,1233,1314,1355,1375,1506 $(CFLAGS_EXTRA) |
| 49 | QMAKE_CFLAGS_DEPS= -M | 49 | QMAKE_CFLAGS_DEPS= -M |
| 50 | QMAKE_CFLAGS_WARN_ON= -fullwarn | 50 | QMAKE_CFLAGS_WARN_ON= -fullwarn |
| 51 | QMAKE_CFLAGS_WARN_OFF= | 51 | QMAKE_CFLAGS_WARN_OFF= |
| 52 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -OPT:Olimit=3000) | 52 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -OPT:Olimit=3000) |
| 53 | QMAKE_CFLAGS_DEBUG= -g | 53 | QMAKE_CFLAGS_DEBUG= -g |
| 54 | QMAKE_CFLAGS_SHLIB= | 54 | QMAKE_CFLAGS_SHLIB= |
| 55 | QMAKE_CFLAGS_YACC= -woff 1110,1174,3262 | 55 | QMAKE_CFLAGS_YACC= -woff 1110,1174,3262 |
| 56 | QMAKE_CFLAGS_THREAD= | 56 | QMAKE_CFLAGS_THREAD= |
| 57 | 57 | ||
| 58 | QMAKE_CXX = CC | 58 | QMAKE_CXX = CC |
| 59 | QMAKE_CXXFLAGS = -64 -woff 1021,1209,1233,1314,1355,1375,1506,1681,1682,3496 $(CXXFLAGS_EXTRA) | 59 | QMAKE_CXXFLAGS = -64 -woff 1021,1209,1233,1314,1355,1375,1424,1506,1681,1682,3496 $(CXXFLAGS_EXTRA) |
| 60 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 60 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 61 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 61 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 62 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 62 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 63 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 63 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 64 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 64 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 65 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 65 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 66 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 66 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 67 | QMAKE_CXXFLAGS_THREAD= | 67 | QMAKE_CXXFLAGS_THREAD= |
| 68 | 68 | ||
| 69 | QMAKE_INCDIR = | 69 | QMAKE_INCDIR = |
| 70 | QMAKE_LIBDIR = | 70 | QMAKE_LIBDIR = |
| 71 | QMAKE_INCDIR_X11= | 71 | QMAKE_INCDIR_X11= |
| 72 | QMAKE_LIBDIR_X11= | 72 | QMAKE_LIBDIR_X11= |
| 73 | QMAKE_INCDIR_QT = $(QTDIR)/include | 73 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 74 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 74 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 75 | QMAKE_INCDIR_OPENGL= | 75 | QMAKE_INCDIR_OPENGL= |
| 76 | QMAKE_LIBDIR_OPENGL= | 76 | QMAKE_LIBDIR_OPENGL= |
| 77 | 77 | ||
| 78 | QMAKE_LINK = CC | 78 | QMAKE_LINK = CC |
| 79 | QMAKE_LINK_SHLIB= CC | 79 | QMAKE_LINK_SHLIB= CC |
| 80 | QMAKE_LFLAGS = -64 $(LFLAGS_EXTRA) | 80 | QMAKE_LFLAGS = -64 $(LFLAGS_EXTRA) |
| 81 | QMAKE_LFLAGS_RELEASE= | 81 | QMAKE_LFLAGS_RELEASE= |
| 82 | QMAKE_LFLAGS_DEBUG= | 82 | QMAKE_LFLAGS_DEBUG= |
| 83 | QMAKE_LFLAGS_SHLIB= -shared | 83 | QMAKE_LFLAGS_SHLIB= -shared |
| 84 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 84 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 85 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 85 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 86 | QMAKE_LFLAGS_THREAD= | 86 | QMAKE_LFLAGS_THREAD= |
| 87 | QMAKE_RPATH = -Wl,-rpath, | 87 | QMAKE_RPATH = -Wl,-rpath, |
| 88 | 88 | ||
| 89 | QMAKE_LIBS = $(LIBS_EXTRA) | 89 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 90 | QMAKE_LIBS_DYNLOAD= | 90 | QMAKE_LIBS_DYNLOAD= |
| 91 | QMAKE_LIBS_X11 = -lXext -lX11 -lm | 91 | QMAKE_LIBS_X11 = -lXext -lX11 -lm |
| 92 | QMAKE_LIBS_X11SM= -lSM -lICE | 92 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 93 | QMAKE_LIBS_QT = -lqt | 93 | QMAKE_LIBS_QT = -lqt |
| 94 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 94 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 95 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lm | 95 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lm |
| 96 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 96 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 97 | QMAKE_LIBS_THREAD= -lpthread | 97 | QMAKE_LIBS_THREAD= -lpthread |
| 98 | 98 | ||
| 99 | QMAKE_MOC = $(QTDIR)/bin/moc | 99 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 100 | QMAKE_UIC = $(QTDIR)/bin/uic | 100 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 101 | 101 | ||
| 102 | QMAKE_AR = CC -ar -o | 102 | QMAKE_AR = CC -ar -o |
| 103 | QMAKE_RANLIB = | 103 | QMAKE_RANLIB = |
| 104 | 104 | ||
| 105 | QMAKE_CLEAN = -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files | 105 | QMAKE_CLEAN = -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files |
| 106 | 106 | ||
| 107 | QMAKE_TAR = tar -cf | 107 | QMAKE_TAR = tar -cf |
| 108 | QMAKE_GZIP = gzip -9f | 108 | QMAKE_GZIP = gzip -9f |
| 109 | 109 | ||
| 110 | QMAKE_COPY = cp -f | 110 | QMAKE_COPY = cp -f |
| 111 | QMAKE_MOVE = mv -f | 111 | QMAKE_MOVE = mv -f |
| 112 | QMAKE_DEL_FILE = rm -f | 112 | QMAKE_DEL_FILE = rm -f |
| 113 | QMAKE_DEL_DIR = rmdir | 113 | QMAKE_DEL_DIR = rmdir |
| 114 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 115 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/irix-cc-64/qplatformdefs.h b/mkspecs/irix-cc-64/qplatformdefs.h index c6eaa2f..8666daf 100644 --- a/mkspecs/irix-cc-64/qplatformdefs.h +++ b/mkspecs/irix-cc-64/qplatformdefs.h | |||
| @@ -14,75 +14,79 @@ | |||
| 14 | 14 | ||
| 15 | 15 | ||
| 16 | #ifdef QT_THREAD_SUPPORT | 16 | #ifdef QT_THREAD_SUPPORT |
| 17 | #include <pthread.h> | 17 | #include <pthread.h> |
| 18 | #endif | 18 | #endif |
| 19 | 19 | ||
| 20 | #include <dirent.h> | 20 | #include <dirent.h> |
| 21 | #include <fcntl.h> | 21 | #include <fcntl.h> |
| 22 | #include <grp.h> | 22 | #include <grp.h> |
| 23 | #include <pwd.h> | 23 | #include <pwd.h> |
| 24 | #include <signal.h> | 24 | #include <signal.h> |
| 25 | #include <dlfcn.h> | 25 | #include <dlfcn.h> |
| 26 | 26 | ||
| 27 | #include <sys/types.h> | 27 | #include <sys/types.h> |
| 28 | #include <sys/ioctl.h> | 28 | #include <sys/ioctl.h> |
| 29 | #include <sys/ipc.h> | 29 | #include <sys/ipc.h> |
| 30 | #include <sys/time.h> | 30 | #include <sys/time.h> |
| 31 | #include <sys/shm.h> | 31 | #include <sys/shm.h> |
| 32 | #include <sys/socket.h> | 32 | #include <sys/socket.h> |
| 33 | #include <sys/stat.h> | 33 | #include <sys/stat.h> |
| 34 | #include <sys/wait.h> | 34 | #include <sys/wait.h> |
| 35 | 35 | ||
| 36 | // DNS header files are not fully covered by X/Open specifications. | 36 | // DNS header files are not fully covered by X/Open specifications. |
| 37 | // In particular nothing is said about res_* :/ | 37 | // In particular nothing is said about res_* :/ |
| 38 | // On IRIX header files <netinet/in.h> and <arpa/nameser.h> are not | 38 | // On IRIX header files <netinet/in.h> and <arpa/nameser.h> are not |
| 39 | // included by <resolv.h>. Note that <arpa/nameser.h> must be included | 39 | // included by <resolv.h>. Note that <arpa/nameser.h> must be included |
| 40 | // before <resolv.h>. | 40 | // before <resolv.h>. |
| 41 | #include <netinet/in.h> | 41 | #include <netinet/in.h> |
| 42 | #include <arpa/nameser.h> | 42 | #include <arpa/nameser.h> |
| 43 | #include <resolv.h> | 43 | #include <resolv.h> |
| 44 | 44 | ||
| 45 | 45 | ||
| 46 | #if !defined(QT_NO_COMPAT) | 46 | #if !defined(QT_NO_COMPAT) |
| 47 | #define QT_STATBUF struct stat | 47 | #define QT_STATBUF struct stat |
| 48 | #define QT_STATBUF4TSTATstruct stat | 48 | #define QT_STATBUF4TSTATstruct stat |
| 49 | #define QT_STAT ::stat | 49 | #define QT_STAT ::stat |
| 50 | #define QT_FSTAT ::fstat | 50 | #define QT_FSTAT ::fstat |
| 51 | #define QT_STAT_REG S_IFREG | 51 | #define QT_STAT_REG S_IFREG |
| 52 | #define QT_STAT_DIR S_IFDIR | 52 | #define QT_STAT_DIR S_IFDIR |
| 53 | #define QT_STAT_MASK S_IFMT | 53 | #define QT_STAT_MASK S_IFMT |
| 54 | #define QT_STAT_LNK S_IFLNK | 54 | #define QT_STAT_LNK S_IFLNK |
| 55 | #define QT_FILENO fileno | 55 | #define QT_FILENO fileno |
| 56 | #define QT_OPEN ::open | 56 | #define QT_OPEN ::open |
| 57 | #define QT_CLOSE ::close | 57 | #define QT_CLOSE ::close |
| 58 | #define QT_LSEEK ::lseek | 58 | #define QT_LSEEK ::lseek |
| 59 | #define QT_READ ::read | 59 | #define QT_READ ::read |
| 60 | #define QT_WRITE ::write | 60 | #define QT_WRITE ::write |
| 61 | #define QT_ACCESS ::access | 61 | #define QT_ACCESS ::access |
| 62 | #define QT_GETCWD ::getcwd | 62 | #define QT_GETCWD ::getcwd |
| 63 | #define QT_CHDIR ::chdir | 63 | #define QT_CHDIR ::chdir |
| 64 | #define QT_MKDIR ::mkdir | 64 | #define QT_MKDIR ::mkdir |
| 65 | #define QT_RMDIR ::rmdir | 65 | #define QT_RMDIR ::rmdir |
| 66 | #define QT_OPEN_RDONLY O_RDONLY | 66 | #define QT_OPEN_RDONLY O_RDONLY |
| 67 | #define QT_OPEN_WRONLY O_WRONLY | 67 | #define QT_OPEN_WRONLY O_WRONLY |
| 68 | #define QT_OPEN_RDWR O_RDWR | 68 | #define QT_OPEN_RDWR O_RDWR |
| 69 | #define QT_OPEN_CREAT O_CREAT | 69 | #define QT_OPEN_CREAT O_CREAT |
| 70 | #define QT_OPEN_TRUNC O_TRUNC | 70 | #define QT_OPEN_TRUNC O_TRUNC |
| 71 | #define QT_OPEN_APPEND O_APPEND | 71 | #define QT_OPEN_APPEND O_APPEND |
| 72 | #endif | 72 | #endif |
| 73 | 73 | ||
| 74 | #define QT_SIGNAL_RETTYPEvoid | 74 | #define QT_SIGNAL_RETTYPEvoid |
| 75 | #define QT_SIGNAL_ARGS int | 75 | #define QT_SIGNAL_ARGS int |
| 76 | #define QT_SIGNAL_IGNORESIG_IGN | 76 | #define QT_SIGNAL_IGNORESIG_IGN |
| 77 | 77 | ||
| 78 | #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500) | ||
| 79 | #define QT_SOCKLEN_T size_t | ||
| 80 | #else | ||
| 78 | #define QT_SOCKLEN_T int | 81 | #define QT_SOCKLEN_T int |
| 82 | #endif | ||
| 79 | 83 | ||
| 80 | #if 0 | 84 | #if 0 |
| 81 | // on Irix 6.5 and better only - but how to check for it? | 85 | // on Irix 6.5 and better only - but how to check for it? |
| 82 | #if defined(_SGIAPI) | 86 | #if defined(_SGIAPI) |
| 83 | #define QT_SNPRINTF ::snprintf | 87 | #define QT_SNPRINTF ::snprintf |
| 84 | #define QT_VSNPRINTF ::vsnprintf | 88 | #define QT_VSNPRINTF ::vsnprintf |
| 85 | #endif | 89 | #endif |
| 86 | #endif | 90 | #endif |
| 87 | 91 | ||
| 88 | #endif // QPLATFORMDEFS_H | 92 | #endif // QPLATFORMDEFS_H |
diff --git a/mkspecs/irix-cc-o32/qmake.conf b/mkspecs/irix-cc-o32/qmake.conf index 75114a5..a731849 100644 --- a/mkspecs/irix-cc-o32/qmake.conf +++ b/mkspecs/irix-cc-o32/qmake.conf | |||
| @@ -1,87 +1,89 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for irix-o32 | 4 | # qmake configuration for irix-cc-o32 |
| 5 | # | 5 | # |
| 6 | # From cc(1): | 6 | # From cc(1): |
| 7 | # -o32 or -32 | 7 | # -o32 or -32 |
| 8 | # Generates an (old) 32-bit object. See the o32(5) man page for | 8 | # Generates an (old) 32-bit object. See the o32(5) man page for |
| 9 | # option descriptions and details. This defaults to -mips2 if | 9 | # option descriptions and details. This defaults to -mips2 if |
| 10 | # -mips1 has not been specified. | 10 | # -mips1 has not been specified. |
| 11 | # | 11 | # |
| 12 | 12 | ||
| 13 | MAKEFILE_GENERATOR= UNIX | 13 | MAKEFILE_GENERATOR= UNIX |
| 14 | TEMPLATE = app | 14 | TEMPLATE = app |
| 15 | CONFIG += qt warn_on release | 15 | CONFIG += qt warn_on release link_prl |
| 16 | 16 | ||
| 17 | QMAKE_CC = cc | 17 | QMAKE_CC = cc |
| 18 | QMAKE_LEX = flex | 18 | QMAKE_LEX = flex |
| 19 | QMAKE_LEXFLAGS = | 19 | QMAKE_LEXFLAGS = |
| 20 | QMAKE_YACC = yacc | 20 | QMAKE_YACC = yacc |
| 21 | QMAKE_YACCFLAGS = -d | 21 | QMAKE_YACCFLAGS = -d |
| 22 | QMAKE_CFLAGS_DEPS= -M | 22 | QMAKE_CFLAGS_DEPS= -M |
| 23 | QMAKE_CFLAGS = -o32 -woff 3203,3260,3672 $(CFLAGS_EXTRA) | 23 | QMAKE_CFLAGS = -o32 -woff 3115,3203,3260,3672,3937 $(CFLAGS_EXTRA) |
| 24 | QMAKE_CFLAGS_WARN_ON= -fullwarn | 24 | QMAKE_CFLAGS_WARN_ON= -fullwarn |
| 25 | QMAKE_CFLAGS_WARN_OFF= | 25 | QMAKE_CFLAGS_WARN_OFF= |
| 26 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -Olimit 3000) | 26 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -Olimit 3000) |
| 27 | QMAKE_CFLAGS_DEBUG= -g | 27 | QMAKE_CFLAGS_DEBUG= -g |
| 28 | QMAKE_CFLAGS_SHLIB= | 28 | QMAKE_CFLAGS_SHLIB= |
| 29 | QMAKE_CFLAGS_YACC= -woff 3203,3262 | 29 | QMAKE_CFLAGS_YACC= -woff 3203,3262 |
| 30 | QMAKE_CFLAGS_THREAD= | 30 | QMAKE_CFLAGS_THREAD= |
| 31 | 31 | ||
| 32 | QMAKE_CXX = CC | 32 | QMAKE_CXX = CC |
| 33 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 33 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 34 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 34 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 35 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 35 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 36 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 36 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 37 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 37 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 38 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 38 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 39 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 39 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 40 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 40 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 41 | QMAKE_CXXFLAGS_THREAD= | 41 | QMAKE_CXXFLAGS_THREAD= |
| 42 | 42 | ||
| 43 | QMAKE_INCDIR = | 43 | QMAKE_INCDIR = |
| 44 | QMAKE_LIBDIR = | 44 | QMAKE_LIBDIR = |
| 45 | QMAKE_INCDIR_X11= | 45 | QMAKE_INCDIR_X11= |
| 46 | QMAKE_LIBDIR_X11= | 46 | QMAKE_LIBDIR_X11= |
| 47 | QMAKE_INCDIR_QT = $(QTDIR)/include | 47 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 48 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 48 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 49 | QMAKE_INCDIR_OPENGL= | 49 | QMAKE_INCDIR_OPENGL= |
| 50 | QMAKE_LIBDIR_OPENGL= | 50 | QMAKE_LIBDIR_OPENGL= |
| 51 | 51 | ||
| 52 | QMAKE_LINK = CC | 52 | QMAKE_LINK = CC |
| 53 | QMAKE_LINK_SHLIB= CC | 53 | QMAKE_LINK_SHLIB= CC |
| 54 | QMAKE_LFLAGS = -o32 $(LFLAGS_EXTRA) | 54 | QMAKE_LFLAGS = -o32 $(LFLAGS_EXTRA) |
| 55 | QMAKE_LFLAGS_RELEASE= | 55 | QMAKE_LFLAGS_RELEASE= |
| 56 | QMAKE_LFLAGS_DEBUG= | 56 | QMAKE_LFLAGS_DEBUG= |
| 57 | QMAKE_LFLAGS_SHLIB= -shared | 57 | QMAKE_LFLAGS_SHLIB= -shared |
| 58 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 58 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 59 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 59 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 60 | QMAKE_LFLAGS_THREAD= | 60 | QMAKE_LFLAGS_THREAD= |
| 61 | QMAKE_RPATH = -Wl,-rpath, | 61 | QMAKE_RPATH = -Wl,-rpath, |
| 62 | 62 | ||
| 63 | QMAKE_LIBS = $(LIBS_EXTRA) | 63 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 64 | QMAKE_LIBS_DYNLOAD= | 64 | QMAKE_LIBS_DYNLOAD= |
| 65 | QMAKE_LIBS_X11 = -lXext -lX11 -lm | 65 | QMAKE_LIBS_X11 = -lXext -lX11 -lm |
| 66 | QMAKE_LIBS_X11SM= -lSM -lICE | 66 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 67 | QMAKE_LIBS_QT = -lqt | 67 | QMAKE_LIBS_QT = -lqt |
| 68 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 68 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 69 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lm | 69 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lm |
| 70 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 70 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 71 | QMAKE_LIBS_THREAD= -lpthread | 71 | QMAKE_LIBS_THREAD= -lpthread |
| 72 | 72 | ||
| 73 | QMAKE_MOC = $(QTDIR)/bin/moc | 73 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 74 | QMAKE_UIC = $(QTDIR)/bin/uic | 74 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 75 | 75 | ||
| 76 | QMAKE_AR = ar cq | 76 | QMAKE_AR = ar cq |
| 77 | QMAKE_RANLIB = | 77 | QMAKE_RANLIB = |
| 78 | 78 | ||
| 79 | QMAKE_CLEAN = -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files | 79 | QMAKE_CLEAN = -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files |
| 80 | 80 | ||
| 81 | QMAKE_TAR = tar -cf | 81 | QMAKE_TAR = tar -cf |
| 82 | QMAKE_GZIP = gzip -9f | 82 | QMAKE_GZIP = gzip -9f |
| 83 | 83 | ||
| 84 | QMAKE_COPY = cp -f | 84 | QMAKE_COPY = cp -f |
| 85 | QMAKE_MOVE = mv -f | 85 | QMAKE_MOVE = mv -f |
| 86 | QMAKE_DEL_FILE = rm -f | 86 | QMAKE_DEL_FILE = rm -f |
| 87 | QMAKE_DEL_DIR = rmdir | 87 | QMAKE_DEL_DIR = rmdir |
| 88 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 89 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/irix-cc/qmake.conf b/mkspecs/irix-cc/qmake.conf index 31411af..469a473 100644 --- a/mkspecs/irix-cc/qmake.conf +++ b/mkspecs/irix-cc/qmake.conf | |||
| @@ -1,113 +1,115 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for irix-n32 | 4 | # qmake configuration for irix-cc |
| 5 | # | 5 | # |
| 6 | # From cc(1): | 6 | # From cc(1): |
| 7 | # -n32 | 7 | # -n32 |
| 8 | # Generates a (new) 32-bit object. This defaults to -mips3 if | 8 | # Generates a (new) 32-bit object. This defaults to -mips3 if |
| 9 | # -mips4 has not been specified. | 9 | # -mips4 has not been specified. |
| 10 | # -LANG: ... | 10 | # -LANG: ... |
| 11 | # The language feature option group controls the source language | 11 | # The language feature option group controls the source language |
| 12 | # interpretation assumed by the compiler. The individual controls | 12 | # interpretation assumed by the compiler. The individual controls |
| 13 | # in this group are as follows: | 13 | # in this group are as follows: |
| 14 | # ansi-for-init-scope [ = ( ON|OFF ) ] | 14 | # ansi-for-init-scope [ = ( ON|OFF ) ] |
| 15 | # Enables or disables the ANSI scoping rules for for-init | 15 | # Enables or disables the ANSI scoping rules for for-init |
| 16 | # declarations (the scope of the name declared extends to | 16 | # declarations (the scope of the name declared extends to |
| 17 | # the end of the for statement). This enables the behavior | 17 | # the end of the for statement). This enables the behavior |
| 18 | # that is required by the C++ standard. The default value | 18 | # that is required by the C++ standard. The default value |
| 19 | # is OFF, which is the ARM behavior (the scope of the name | 19 | # is OFF, which is the ARM behavior (the scope of the name |
| 20 | # declared extends to the end of the block enclosing the for | 20 | # declared extends to the end of the block enclosing the for |
| 21 | # statement). | 21 | # statement). |
| 22 | # bool [ = ( ON|OFF ) ] | 22 | # bool [ = ( ON|OFF ) ] |
| 23 | # Enables or disables the predefined bool data type, along | 23 | # Enables or disables the predefined bool data type, along |
| 24 | # with the predefined values true and false. Use this option | 24 | # with the predefined values true and false. Use this option |
| 25 | # only to suppress this type in old code that defines bool | 25 | # only to suppress this type in old code that defines bool |
| 26 | # itself. Because this option changes the mangling of function | 26 | # itself. Because this option changes the mangling of function |
| 27 | # names with bool parameters, all files comprising a program | 27 | # names with bool parameters, all files comprising a program |
| 28 | # should be compiled with consistent options. | 28 | # should be compiled with consistent options. |
| 29 | # Default is ON. | 29 | # Default is ON. |
| 30 | # The _BOOL feature macro can be used in #ifdefs to do conditional | 30 | # The _BOOL feature macro can be used in #ifdefs to do conditional |
| 31 | # compilation based on whether or not this option is enabled. | 31 | # compilation based on whether or not this option is enabled. |
| 32 | # std | 32 | # std |
| 33 | # Enables use of the standard C++ library and standard- | 33 | # Enables use of the standard C++ library and standard- |
| 34 | # conforming iostream library. Specifying this flag also | 34 | # conforming iostream library. Specifying this flag also |
| 35 | # triggers other standard-conforming behavior, such as the | 35 | # triggers other standard-conforming behavior, such as the |
| 36 | # new rules for the scope of for loop initializers. | 36 | # new rules for the scope of for loop initializers. |
| 37 | # | 37 | # |
| 38 | 38 | ||
| 39 | MAKEFILE_GENERATOR= UNIX | 39 | MAKEFILE_GENERATOR= UNIX |
| 40 | TEMPLATE = app | 40 | TEMPLATE = app |
| 41 | CONFIG += qt warn_on release | 41 | CONFIG += qt warn_on release link_prl |
| 42 | 42 | ||
| 43 | QMAKE_CC = cc | 43 | QMAKE_CC = cc |
| 44 | QMAKE_LEX = flex | 44 | QMAKE_LEX = flex |
| 45 | QMAKE_LEXFLAGS = | 45 | QMAKE_LEXFLAGS = |
| 46 | QMAKE_YACC = yacc | 46 | QMAKE_YACC = yacc |
| 47 | QMAKE_YACCFLAGS = -d | 47 | QMAKE_YACCFLAGS = -d |
| 48 | QMAKE_CFLAGS = -n32 -woff 1021,1209,1233,1314,1355,1375,1506 $(CFLAGS_EXTRA) | 48 | QMAKE_CFLAGS = -n32 -woff 1021,1209,1233,1314,1355,1375,1506 $(CFLAGS_EXTRA) |
| 49 | QMAKE_CFLAGS_DEPS= -M | 49 | QMAKE_CFLAGS_DEPS= -M |
| 50 | QMAKE_CFLAGS_WARN_ON= -fullwarn | 50 | QMAKE_CFLAGS_WARN_ON= -fullwarn |
| 51 | QMAKE_CFLAGS_WARN_OFF= | 51 | QMAKE_CFLAGS_WARN_OFF= |
| 52 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -OPT:Olimit=3000) | 52 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -OPT:Olimit=3000) |
| 53 | QMAKE_CFLAGS_DEBUG= -g | 53 | QMAKE_CFLAGS_DEBUG= -g |
| 54 | QMAKE_CFLAGS_SHLIB= | 54 | QMAKE_CFLAGS_SHLIB= |
| 55 | QMAKE_CFLAGS_YACC= -woff 1110,1174,3262 | 55 | QMAKE_CFLAGS_YACC= -woff 1110,1174,3262 |
| 56 | QMAKE_CFLAGS_THREAD= | 56 | QMAKE_CFLAGS_THREAD= |
| 57 | 57 | ||
| 58 | QMAKE_CXX = CC | 58 | QMAKE_CXX = CC |
| 59 | QMAKE_CXXFLAGS = -n32 -woff 1021,1209,1233,1314,1355,1375,1506,1681,1682,3496 $(CXXFLAGS_EXTRA) | 59 | QMAKE_CXXFLAGS = -n32 -woff 1021,1209,1233,1314,1355,1375,1424,1506,1681,1682,3496 $(CXXFLAGS_EXTRA) |
| 60 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 60 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 61 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 61 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 62 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 62 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 63 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 63 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 64 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 64 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 65 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 65 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 66 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 66 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 67 | QMAKE_CXXFLAGS_THREAD= | 67 | QMAKE_CXXFLAGS_THREAD= |
| 68 | 68 | ||
| 69 | QMAKE_INCDIR = | 69 | QMAKE_INCDIR = |
| 70 | QMAKE_LIBDIR = | 70 | QMAKE_LIBDIR = |
| 71 | QMAKE_INCDIR_X11= | 71 | QMAKE_INCDIR_X11= |
| 72 | QMAKE_LIBDIR_X11= | 72 | QMAKE_LIBDIR_X11= |
| 73 | QMAKE_INCDIR_QT = $(QTDIR)/include | 73 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 74 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 74 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 75 | QMAKE_INCDIR_OPENGL= | 75 | QMAKE_INCDIR_OPENGL= |
| 76 | QMAKE_LIBDIR_OPENGL= | 76 | QMAKE_LIBDIR_OPENGL= |
| 77 | 77 | ||
| 78 | QMAKE_LINK = CC | 78 | QMAKE_LINK = CC |
| 79 | QMAKE_LINK_SHLIB= CC | 79 | QMAKE_LINK_SHLIB= CC |
| 80 | QMAKE_LFLAGS = -n32 $(LFLAGS_EXTRA) | 80 | QMAKE_LFLAGS = -n32 $(LFLAGS_EXTRA) |
| 81 | QMAKE_LFLAGS_RELEASE= | 81 | QMAKE_LFLAGS_RELEASE= |
| 82 | QMAKE_LFLAGS_DEBUG= | 82 | QMAKE_LFLAGS_DEBUG= |
| 83 | QMAKE_LFLAGS_SHLIB= -shared | 83 | QMAKE_LFLAGS_SHLIB= -shared |
| 84 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 84 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 85 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 85 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 86 | QMAKE_LFLAGS_THREAD= | 86 | QMAKE_LFLAGS_THREAD= |
| 87 | QMAKE_RPATH = -Wl,-rpath, | 87 | QMAKE_RPATH = -Wl,-rpath, |
| 88 | 88 | ||
| 89 | QMAKE_LIBS = $(LIBS_EXTRA) | 89 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 90 | QMAKE_LIBS_DYNLOAD= | 90 | QMAKE_LIBS_DYNLOAD= |
| 91 | QMAKE_LIBS_X11 = -lXext -lX11 -lm | 91 | QMAKE_LIBS_X11 = -lXext -lX11 -lm |
| 92 | QMAKE_LIBS_X11SM= -lSM -lICE | 92 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 93 | QMAKE_LIBS_QT = -lqt | 93 | QMAKE_LIBS_QT = -lqt |
| 94 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 94 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 95 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lm | 95 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lm |
| 96 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 96 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 97 | QMAKE_LIBS_THREAD= -lpthread | 97 | QMAKE_LIBS_THREAD= -lpthread |
| 98 | 98 | ||
| 99 | QMAKE_MOC = $(QTDIR)/bin/moc | 99 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 100 | QMAKE_UIC = $(QTDIR)/bin/uic | 100 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 101 | 101 | ||
| 102 | QMAKE_AR = CC -ar -o | 102 | QMAKE_AR = CC -ar -o |
| 103 | QMAKE_RANLIB = | 103 | QMAKE_RANLIB = |
| 104 | 104 | ||
| 105 | QMAKE_CLEAN = -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files | 105 | QMAKE_CLEAN = -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files |
| 106 | 106 | ||
| 107 | QMAKE_TAR = tar -cf | 107 | QMAKE_TAR = tar -cf |
| 108 | QMAKE_GZIP = gzip -9f | 108 | QMAKE_GZIP = gzip -9f |
| 109 | 109 | ||
| 110 | QMAKE_COPY = cp -f | 110 | QMAKE_COPY = cp -f |
| 111 | QMAKE_MOVE = mv -f | 111 | QMAKE_MOVE = mv -f |
| 112 | QMAKE_DEL_FILE = rm -f | 112 | QMAKE_DEL_FILE = rm -f |
| 113 | QMAKE_DEL_DIR = rmdir | 113 | QMAKE_DEL_DIR = rmdir |
| 114 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 115 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/irix-cc/qplatformdefs.h b/mkspecs/irix-cc/qplatformdefs.h index c6eaa2f..8666daf 100644 --- a/mkspecs/irix-cc/qplatformdefs.h +++ b/mkspecs/irix-cc/qplatformdefs.h | |||
| @@ -14,75 +14,79 @@ | |||
| 14 | 14 | ||
| 15 | 15 | ||
| 16 | #ifdef QT_THREAD_SUPPORT | 16 | #ifdef QT_THREAD_SUPPORT |
| 17 | #include <pthread.h> | 17 | #include <pthread.h> |
| 18 | #endif | 18 | #endif |
| 19 | 19 | ||
| 20 | #include <dirent.h> | 20 | #include <dirent.h> |
| 21 | #include <fcntl.h> | 21 | #include <fcntl.h> |
| 22 | #include <grp.h> | 22 | #include <grp.h> |
| 23 | #include <pwd.h> | 23 | #include <pwd.h> |
| 24 | #include <signal.h> | 24 | #include <signal.h> |
| 25 | #include <dlfcn.h> | 25 | #include <dlfcn.h> |
| 26 | 26 | ||
| 27 | #include <sys/types.h> | 27 | #include <sys/types.h> |
| 28 | #include <sys/ioctl.h> | 28 | #include <sys/ioctl.h> |
| 29 | #include <sys/ipc.h> | 29 | #include <sys/ipc.h> |
| 30 | #include <sys/time.h> | 30 | #include <sys/time.h> |
| 31 | #include <sys/shm.h> | 31 | #include <sys/shm.h> |
| 32 | #include <sys/socket.h> | 32 | #include <sys/socket.h> |
| 33 | #include <sys/stat.h> | 33 | #include <sys/stat.h> |
| 34 | #include <sys/wait.h> | 34 | #include <sys/wait.h> |
| 35 | 35 | ||
| 36 | // DNS header files are not fully covered by X/Open specifications. | 36 | // DNS header files are not fully covered by X/Open specifications. |
| 37 | // In particular nothing is said about res_* :/ | 37 | // In particular nothing is said about res_* :/ |
| 38 | // On IRIX header files <netinet/in.h> and <arpa/nameser.h> are not | 38 | // On IRIX header files <netinet/in.h> and <arpa/nameser.h> are not |
| 39 | // included by <resolv.h>. Note that <arpa/nameser.h> must be included | 39 | // included by <resolv.h>. Note that <arpa/nameser.h> must be included |
| 40 | // before <resolv.h>. | 40 | // before <resolv.h>. |
| 41 | #include <netinet/in.h> | 41 | #include <netinet/in.h> |
| 42 | #include <arpa/nameser.h> | 42 | #include <arpa/nameser.h> |
| 43 | #include <resolv.h> | 43 | #include <resolv.h> |
| 44 | 44 | ||
| 45 | 45 | ||
| 46 | #if !defined(QT_NO_COMPAT) | 46 | #if !defined(QT_NO_COMPAT) |
| 47 | #define QT_STATBUF struct stat | 47 | #define QT_STATBUF struct stat |
| 48 | #define QT_STATBUF4TSTATstruct stat | 48 | #define QT_STATBUF4TSTATstruct stat |
| 49 | #define QT_STAT ::stat | 49 | #define QT_STAT ::stat |
| 50 | #define QT_FSTAT ::fstat | 50 | #define QT_FSTAT ::fstat |
| 51 | #define QT_STAT_REG S_IFREG | 51 | #define QT_STAT_REG S_IFREG |
| 52 | #define QT_STAT_DIR S_IFDIR | 52 | #define QT_STAT_DIR S_IFDIR |
| 53 | #define QT_STAT_MASK S_IFMT | 53 | #define QT_STAT_MASK S_IFMT |
| 54 | #define QT_STAT_LNK S_IFLNK | 54 | #define QT_STAT_LNK S_IFLNK |
| 55 | #define QT_FILENO fileno | 55 | #define QT_FILENO fileno |
| 56 | #define QT_OPEN ::open | 56 | #define QT_OPEN ::open |
| 57 | #define QT_CLOSE ::close | 57 | #define QT_CLOSE ::close |
| 58 | #define QT_LSEEK ::lseek | 58 | #define QT_LSEEK ::lseek |
| 59 | #define QT_READ ::read | 59 | #define QT_READ ::read |
| 60 | #define QT_WRITE ::write | 60 | #define QT_WRITE ::write |
| 61 | #define QT_ACCESS ::access | 61 | #define QT_ACCESS ::access |
| 62 | #define QT_GETCWD ::getcwd | 62 | #define QT_GETCWD ::getcwd |
| 63 | #define QT_CHDIR ::chdir | 63 | #define QT_CHDIR ::chdir |
| 64 | #define QT_MKDIR ::mkdir | 64 | #define QT_MKDIR ::mkdir |
| 65 | #define QT_RMDIR ::rmdir | 65 | #define QT_RMDIR ::rmdir |
| 66 | #define QT_OPEN_RDONLY O_RDONLY | 66 | #define QT_OPEN_RDONLY O_RDONLY |
| 67 | #define QT_OPEN_WRONLY O_WRONLY | 67 | #define QT_OPEN_WRONLY O_WRONLY |
| 68 | #define QT_OPEN_RDWR O_RDWR | 68 | #define QT_OPEN_RDWR O_RDWR |
| 69 | #define QT_OPEN_CREAT O_CREAT | 69 | #define QT_OPEN_CREAT O_CREAT |
| 70 | #define QT_OPEN_TRUNC O_TRUNC | 70 | #define QT_OPEN_TRUNC O_TRUNC |
| 71 | #define QT_OPEN_APPEND O_APPEND | 71 | #define QT_OPEN_APPEND O_APPEND |
| 72 | #endif | 72 | #endif |
| 73 | 73 | ||
| 74 | #define QT_SIGNAL_RETTYPEvoid | 74 | #define QT_SIGNAL_RETTYPEvoid |
| 75 | #define QT_SIGNAL_ARGS int | 75 | #define QT_SIGNAL_ARGS int |
| 76 | #define QT_SIGNAL_IGNORESIG_IGN | 76 | #define QT_SIGNAL_IGNORESIG_IGN |
| 77 | 77 | ||
| 78 | #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500) | ||
| 79 | #define QT_SOCKLEN_T size_t | ||
| 80 | #else | ||
| 78 | #define QT_SOCKLEN_T int | 81 | #define QT_SOCKLEN_T int |
| 82 | #endif | ||
| 79 | 83 | ||
| 80 | #if 0 | 84 | #if 0 |
| 81 | // on Irix 6.5 and better only - but how to check for it? | 85 | // on Irix 6.5 and better only - but how to check for it? |
| 82 | #if defined(_SGIAPI) | 86 | #if defined(_SGIAPI) |
| 83 | #define QT_SNPRINTF ::snprintf | 87 | #define QT_SNPRINTF ::snprintf |
| 84 | #define QT_VSNPRINTF ::vsnprintf | 88 | #define QT_VSNPRINTF ::vsnprintf |
| 85 | #endif | 89 | #endif |
| 86 | #endif | 90 | #endif |
| 87 | 91 | ||
| 88 | #endif // QPLATFORMDEFS_H | 92 | #endif // QPLATFORMDEFS_H |
diff --git a/mkspecs/irix-g++/qmake.conf b/mkspecs/irix-g++/qmake.conf index 17b6751..fa4422e 100644 --- a/mkspecs/irix-g++/qmake.conf +++ b/mkspecs/irix-g++/qmake.conf | |||
| @@ -1,84 +1,86 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for irix-g++ | 4 | # qmake configuration for irix-g++ |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 9 | CONFIG += qt warn_on release link_prl |
| 10 | 10 | ||
| 11 | QMAKE_CC = gcc | 11 | QMAKE_CC = gcc |
| 12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 17 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | 19 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= -fPIC | 22 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 24 | QMAKE_CFLAGS_THREAD= | 24 | QMAKE_CFLAGS_THREAD= |
| 25 | 25 | ||
| 26 | QMAKE_CXX = g++ | 26 | QMAKE_CXX = g++ |
| 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 28 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 28 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 35 | QMAKE_CXXFLAGS_THREAD= | 35 | QMAKE_CXXFLAGS_THREAD= |
| 36 | 36 | ||
| 37 | QMAKE_INCDIR = | 37 | QMAKE_INCDIR = |
| 38 | QMAKE_LIBDIR = | 38 | QMAKE_LIBDIR = |
| 39 | QMAKE_INCDIR_X11= | 39 | QMAKE_INCDIR_X11= |
| 40 | QMAKE_LIBDIR_X11= | 40 | QMAKE_LIBDIR_X11= |
| 41 | QMAKE_INCDIR_QT = $(QTDIR)/include | 41 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 43 | QMAKE_INCDIR_OPENGL= | 43 | QMAKE_INCDIR_OPENGL= |
| 44 | QMAKE_LIBDIR_OPENGL= | 44 | QMAKE_LIBDIR_OPENGL= |
| 45 | 45 | ||
| 46 | QMAKE_LINK = g++ | 46 | QMAKE_LINK = g++ |
| 47 | QMAKE_LINK_SHLIB= g++ | 47 | QMAKE_LINK_SHLIB= g++ |
| 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 49 | QMAKE_LFLAGS_RELEASE= | 49 | QMAKE_LFLAGS_RELEASE= |
| 50 | QMAKE_LFLAGS_DEBUG= | 50 | QMAKE_LFLAGS_DEBUG= |
| 51 | QMAKE_LFLAGS_SHLIB= -shared | 51 | QMAKE_LFLAGS_SHLIB= -shared -Wl,-LD_LAYOUT:lgot_buffer=1000 |
| 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 53 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 53 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 54 | QMAKE_LFLAGS_THREAD= | 54 | QMAKE_LFLAGS_THREAD= |
| 55 | QMAKE_RPATH = -Wl,-rpath, | 55 | QMAKE_RPATH = -Wl,-rpath, |
| 56 | 56 | ||
| 57 | QMAKE_LIBS = $(LIBS_EXTRA) | 57 | QMAKE_LIBS = -lC $(LIBS_EXTRA) |
| 58 | QMAKE_LIBS_DYNLOAD= | 58 | QMAKE_LIBS_DYNLOAD= |
| 59 | QMAKE_LIBS_X11 = -lXext -lX11 -lm | 59 | QMAKE_LIBS_X11 = -lXext -lX11 -lm |
| 60 | QMAKE_LIBS_X11SM= -lSM -lICE | 60 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 61 | QMAKE_LIBS_QT = -lqt | 61 | QMAKE_LIBS_QT = -lqt |
| 62 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 62 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 63 | # libGLU is using the SGI C++ library internally and this somehow clashes | 63 | # libGLU is using the SGI C++ library internally and this somehow clashes |
| 64 | # with the GNU C++ library (similar name mangling and symbol names?) | 64 | # with the GNU C++ library (similar name mangling and symbol names?) |
| 65 | # so we add -lC so that the SGI C++ library is used first... | 65 | # so we add -lC so that the SGI C++ library is used first... |
| 66 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lC | 66 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 67 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 67 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 68 | QMAKE_LIBS_THREAD= -lpthread | 68 | QMAKE_LIBS_THREAD= -lpthread |
| 69 | 69 | ||
| 70 | QMAKE_MOC = $(QTDIR)/bin/moc | 70 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 71 | QMAKE_UIC = $(QTDIR)/bin/uic | 71 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 72 | 72 | ||
| 73 | QMAKE_AR = ar cq | 73 | QMAKE_AR = ar cq |
| 74 | QMAKE_RANLIB = | 74 | QMAKE_RANLIB = |
| 75 | 75 | ||
| 76 | QMAKE_CLEAN = so_locations | 76 | QMAKE_CLEAN = so_locations |
| 77 | 77 | ||
| 78 | QMAKE_TAR = tar -cf | 78 | QMAKE_TAR = tar -cf |
| 79 | QMAKE_GZIP = gzip -9f | 79 | QMAKE_GZIP = gzip -9f |
| 80 | 80 | ||
| 81 | QMAKE_COPY = cp -f | 81 | QMAKE_COPY = cp -f |
| 82 | QMAKE_MOVE = mv -f | 82 | QMAKE_MOVE = mv -f |
| 83 | QMAKE_DEL_FILE = rm -f | 83 | QMAKE_DEL_FILE = rm -f |
| 84 | QMAKE_DEL_DIR = rmdir | 84 | QMAKE_DEL_DIR = rmdir |
| 85 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 86 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/irix-g++/qplatformdefs.h b/mkspecs/irix-g++/qplatformdefs.h index 757afcc..dc47a03 100644 --- a/mkspecs/irix-g++/qplatformdefs.h +++ b/mkspecs/irix-g++/qplatformdefs.h | |||
| @@ -18,76 +18,80 @@ | |||
| 18 | #endif | 18 | #endif |
| 19 | 19 | ||
| 20 | #include <dirent.h> | 20 | #include <dirent.h> |
| 21 | #include <fcntl.h> | 21 | #include <fcntl.h> |
| 22 | #include <grp.h> | 22 | #include <grp.h> |
| 23 | #include <pwd.h> | 23 | #include <pwd.h> |
| 24 | #include <signal.h> | 24 | #include <signal.h> |
| 25 | #include <dlfcn.h> | 25 | #include <dlfcn.h> |
| 26 | 26 | ||
| 27 | #include <sys/types.h> | 27 | #include <sys/types.h> |
| 28 | #include <sys/ioctl.h> | 28 | #include <sys/ioctl.h> |
| 29 | #include <sys/ipc.h> | 29 | #include <sys/ipc.h> |
| 30 | #include <sys/time.h> | 30 | #include <sys/time.h> |
| 31 | #include <sys/shm.h> | 31 | #include <sys/shm.h> |
| 32 | #include <sys/socket.h> | 32 | #include <sys/socket.h> |
| 33 | #include <sys/stat.h> | 33 | #include <sys/stat.h> |
| 34 | #include <sys/wait.h> | 34 | #include <sys/wait.h> |
| 35 | 35 | ||
| 36 | // DNS header files are not fully covered by X/Open specifications. | 36 | // DNS header files are not fully covered by X/Open specifications. |
| 37 | // In particular nothing is said about res_* :/ | 37 | // In particular nothing is said about res_* :/ |
| 38 | // On IRIX header files <netinet/in.h> and <arpa/nameser.h> are not | 38 | // On IRIX header files <netinet/in.h> and <arpa/nameser.h> are not |
| 39 | // included by <resolv.h>. Note that <arpa/nameser.h> must be included | 39 | // included by <resolv.h>. Note that <arpa/nameser.h> must be included |
| 40 | // before <resolv.h>. | 40 | // before <resolv.h>. |
| 41 | #include <netinet/in.h> | 41 | #include <netinet/in.h> |
| 42 | #include <arpa/nameser.h> | 42 | #include <arpa/nameser.h> |
| 43 | #include <resolv.h> | 43 | #include <resolv.h> |
| 44 | 44 | ||
| 45 | 45 | ||
| 46 | #if !defined(QT_NO_COMPAT) | 46 | #if !defined(QT_NO_COMPAT) |
| 47 | #define QT_STATBUF struct stat | 47 | #define QT_STATBUF struct stat |
| 48 | #define QT_STATBUF4TSTATstruct stat | 48 | #define QT_STATBUF4TSTATstruct stat |
| 49 | #define QT_STAT ::stat | 49 | #define QT_STAT ::stat |
| 50 | #define QT_FSTAT ::fstat | 50 | #define QT_FSTAT ::fstat |
| 51 | #define QT_STAT_REG S_IFREG | 51 | #define QT_STAT_REG S_IFREG |
| 52 | #define QT_STAT_DIR S_IFDIR | 52 | #define QT_STAT_DIR S_IFDIR |
| 53 | #define QT_STAT_MASK S_IFMT | 53 | #define QT_STAT_MASK S_IFMT |
| 54 | #define QT_STAT_LNK S_IFLNK | 54 | #define QT_STAT_LNK S_IFLNK |
| 55 | #define QT_FILENO fileno | 55 | #define QT_FILENO fileno |
| 56 | #define QT_OPEN ::open | 56 | #define QT_OPEN ::open |
| 57 | #define QT_CLOSE ::close | 57 | #define QT_CLOSE ::close |
| 58 | #define QT_LSEEK ::lseek | 58 | #define QT_LSEEK ::lseek |
| 59 | #define QT_READ ::read | 59 | #define QT_READ ::read |
| 60 | #define QT_WRITE ::write | 60 | #define QT_WRITE ::write |
| 61 | #define QT_ACCESS ::access | 61 | #define QT_ACCESS ::access |
| 62 | #define QT_GETCWD ::getcwd | 62 | #define QT_GETCWD ::getcwd |
| 63 | #define QT_CHDIR ::chdir | 63 | #define QT_CHDIR ::chdir |
| 64 | #define QT_MKDIR ::mkdir | 64 | #define QT_MKDIR ::mkdir |
| 65 | #define QT_RMDIR ::rmdir | 65 | #define QT_RMDIR ::rmdir |
| 66 | #define QT_OPEN_RDONLY O_RDONLY | 66 | #define QT_OPEN_RDONLY O_RDONLY |
| 67 | #define QT_OPEN_WRONLY O_WRONLY | 67 | #define QT_OPEN_WRONLY O_WRONLY |
| 68 | #define QT_OPEN_RDWR O_RDWR | 68 | #define QT_OPEN_RDWR O_RDWR |
| 69 | #define QT_OPEN_CREAT O_CREAT | 69 | #define QT_OPEN_CREAT O_CREAT |
| 70 | #define QT_OPEN_TRUNC O_TRUNC | 70 | #define QT_OPEN_TRUNC O_TRUNC |
| 71 | #define QT_OPEN_APPEND O_APPEND | 71 | #define QT_OPEN_APPEND O_APPEND |
| 72 | #endif | 72 | #endif |
| 73 | 73 | ||
| 74 | #define QT_SIGNAL_RETTYPEvoid | 74 | #define QT_SIGNAL_RETTYPEvoid |
| 75 | #if defined(_LANGUAGE_C_PLUS_PLUS) || !defined(_SGIAPI) | 75 | #if defined(_LANGUAGE_C_PLUS_PLUS) || !defined(_SGIAPI) |
| 76 | #define QT_SIGNAL_ARGS int | 76 | #define QT_SIGNAL_ARGS int |
| 77 | #else | 77 | #else |
| 78 | #define QT_SIGNAL_ARGS void | 78 | #define QT_SIGNAL_ARGS void |
| 79 | #endif | 79 | #endif |
| 80 | #define QT_SIGNAL_IGNORESIG_IGN | 80 | #define QT_SIGNAL_IGNORESIG_IGN |
| 81 | 81 | ||
| 82 | #define QT_SOCKLEN_T int | 82 | #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500) |
| 83 | #define QT_SOCKLEN_T size_t | ||
| 84 | #else | ||
| 85 | #define QT_SOCKLEN_T int | ||
| 86 | #endif | ||
| 83 | 87 | ||
| 84 | #if 0 | 88 | #if 0 |
| 85 | // on Irix 6.5 and better only - but how to check for it? | 89 | // on Irix 6.5 and better only - but how to check for it? |
| 86 | #if defined(_SGIAPI) | 90 | #if defined(_SGIAPI) |
| 87 | #define QT_SNPRINTF ::snprintf | 91 | #define QT_SNPRINTF ::snprintf |
| 88 | #define QT_VSNPRINTF ::vsnprintf | 92 | #define QT_VSNPRINTF ::vsnprintf |
| 89 | #endif | 93 | #endif |
| 90 | #endif | 94 | #endif |
| 91 | 95 | ||
| 92 | #endif // QPLATFORMDEFS_H | 96 | #endif // QPLATFORMDEFS_H |
| 93 | 97 | ||
diff --git a/mkspecs/linux-cxx/qmake.conf b/mkspecs/linux-cxx/qmake.conf index 6936fc9..f5d60dc 100644 --- a/mkspecs/linux-cxx/qmake.conf +++ b/mkspecs/linux-cxx/qmake.conf | |||
| @@ -1,75 +1,79 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for Compaq C++ for Linux on Alpha | 4 | # qmake configuration for linux-cxx |
| 5 | # | ||
| 6 | # Written for Compaq C++ for GNU/Linux on Alpha (discontinued). | ||
| 5 | # | 7 | # |
| 6 | 8 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 9 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 10 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 11 | CONFIG += qt warn_on release link_prl |
| 10 | 12 | ||
| 11 | QMAKE_CC = ccc | 13 | QMAKE_CC = ccc |
| 12 | QMAKE_LEX = flex | 14 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 15 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 16 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 17 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = -w $(CFLAGS_EXTRA) | 18 | QMAKE_CFLAGS = -w $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 19 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= | 20 | QMAKE_CFLAGS_WARN_ON= |
| 19 | QMAKE_CFLAGS_WARN_OFF= | 21 | QMAKE_CFLAGS_WARN_OFF= |
| 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 22 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 23 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= | 24 | QMAKE_CFLAGS_SHLIB= |
| 23 | QMAKE_CFLAGS_YACC= -Olimit 1000 | 25 | QMAKE_CFLAGS_YACC= -Olimit 1000 |
| 24 | 26 | ||
| 25 | QMAKE_CXX = cxx | 27 | QMAKE_CXX = cxx |
| 26 | QMAKE_CXXFLAGS = -w $(CXXFLAGS_EXTRA) | 28 | QMAKE_CXXFLAGS = -w $(CXXFLAGS_EXTRA) |
| 27 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 29 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 28 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 29 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 30 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 32 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 31 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 33 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 32 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 34 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 33 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 35 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 34 | 36 | ||
| 35 | QMAKE_INCDIR = | 37 | QMAKE_INCDIR = |
| 36 | QMAKE_LIBDIR = | 38 | QMAKE_LIBDIR = |
| 37 | QMAKE_INCDIR_X11= /usr/X11R6/include | 39 | QMAKE_INCDIR_X11= /usr/X11R6/include |
| 38 | QMAKE_LIBDIR_X11= /usr/X11R6/lib | 40 | QMAKE_LIBDIR_X11= /usr/X11R6/lib |
| 39 | QMAKE_INCDIR_QT = $(QTDIR)/include | 41 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 43 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 44 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 43 | 45 | ||
| 44 | QMAKE_LINK = cxx | 46 | QMAKE_LINK = cxx |
| 45 | QMAKE_LINK_SHLIB= cxx | 47 | QMAKE_LINK_SHLIB= cxx |
| 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 47 | QMAKE_LFLAGS_RELEASE= | 49 | QMAKE_LFLAGS_RELEASE= |
| 48 | QMAKE_LFLAGS_DEBUG= | 50 | QMAKE_LFLAGS_DEBUG= |
| 49 | QMAKE_LFLAGS_SHLIB= -shared | 51 | QMAKE_LFLAGS_SHLIB= -shared |
| 50 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 51 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 53 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 52 | 54 | ||
| 53 | QMAKE_LIBS = $(LIBS_EXTRA) | 55 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 54 | QMAKE_LIBS_DYNLOAD= -ldl | 56 | QMAKE_LIBS_DYNLOAD= -ldl |
| 55 | QMAKE_LIBS_X11 = -lXext -lX11 -lm | 57 | QMAKE_LIBS_X11 = -lXext -lX11 -lm |
| 56 | QMAKE_LIBS_X11SM= -lSM -lICE | 58 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 57 | QMAKE_LIBS_NIS = -lnsl | 59 | QMAKE_LIBS_NIS = -lnsl |
| 58 | QMAKE_LIBS_QT = -lqt | 60 | QMAKE_LIBS_QT = -lqt |
| 59 | 61 | ||
| 60 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 62 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 61 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 63 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 62 | 64 | ||
| 63 | QMAKE_MOC = $(QTDIR)/bin/moc | 65 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 64 | QMAKE_UIC = $(QTDIR)/bin/uic | 66 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 65 | 67 | ||
| 66 | QMAKE_AR = ar cqs | 68 | QMAKE_AR = ar cqs |
| 67 | QMAKE_RANLIB = | 69 | QMAKE_RANLIB = |
| 68 | 70 | ||
| 69 | QMAKE_TAR = tar -cf | 71 | QMAKE_TAR = tar -cf |
| 70 | QMAKE_GZIP = gzip -9f | 72 | QMAKE_GZIP = gzip -9f |
| 71 | 73 | ||
| 72 | QMAKE_COPY = cp -f | 74 | QMAKE_COPY = cp -f |
| 73 | QMAKE_MOVE = mv -f | 75 | QMAKE_MOVE = mv -f |
| 74 | QMAKE_DEL_FILE = rm -f | 76 | QMAKE_DEL_FILE = rm -f |
| 75 | 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/linux-ecc-64/qmake.conf b/mkspecs/linux-ecc-64/qmake.conf new file mode 100644 index 0000000..4916ff1 --- a/dev/null +++ b/mkspecs/linux-ecc-64/qmake.conf | |||
| @@ -0,0 +1,86 @@ | |||
| 1 | # | ||
| 2 | # $Id$ | ||
| 3 | # | ||
| 4 | # qmake configuration for linux-ecc-64 | ||
| 5 | # | ||
| 6 | # Written for Intel C++ 7.1, and 8.0 for Linux. | ||
| 7 | # | ||
| 8 | |||
| 9 | MAKEFILE_GENERATOR= UNIX | ||
| 10 | TEMPLATE = app | ||
| 11 | CONFIG += qt warn_on release link_prl | ||
| 12 | |||
| 13 | QMAKE_CC = ecc | ||
| 14 | QMAKE_LEX = flex | ||
| 15 | QMAKE_LEXFLAGS = | ||
| 16 | QMAKE_YACC = yacc | ||
| 17 | QMAKE_YACCFLAGS = -d | ||
| 18 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) | ||
| 19 | QMAKE_CFLAGS_DEPS= -M | ||
| 20 | QMAKE_CFLAGS_WARN_ON= | ||
| 21 | QMAKE_CFLAGS_WARN_OFF= -w | ||
| 22 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | ||
| 23 | QMAKE_CFLAGS_DEBUG= -g | ||
| 24 | QMAKE_CFLAGS_SHLIB= -KPIC | ||
| 25 | QMAKE_CFLAGS_YACC= | ||
| 26 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | ||
| 27 | |||
| 28 | QMAKE_CXX = ecpc | ||
| 29 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | ||
| 30 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | ||
| 31 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | ||
| 32 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | ||
| 33 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | ||
| 34 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | ||
| 35 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | ||
| 36 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | ||
| 37 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | ||
| 38 | |||
| 39 | QMAKE_INCDIR = | ||
| 40 | QMAKE_LIBDIR = | ||
| 41 | QMAKE_INCDIR_X11= /usr/X11R6/include | ||
| 42 | QMAKE_LIBDIR_X11= /usr/X11R6/lib | ||
| 43 | QMAKE_INCDIR_QT = $(QTDIR)/include | ||
| 44 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | ||
| 45 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | ||
| 46 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | ||
| 47 | |||
| 48 | QMAKE_LINK = ecpc | ||
| 49 | QMAKE_LINK_SHLIB= ecpc | ||
| 50 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | ||
| 51 | QMAKE_LFLAGS_RELEASE= | ||
| 52 | QMAKE_LFLAGS_DEBUG= | ||
| 53 | QMAKE_LFLAGS_SHLIB= -shared | ||
| 54 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | ||
| 55 | QMAKE_LFLAGS_SONAME= -Qoption,ld,-soname, | ||
| 56 | QMAKE_LFLAGS_THREAD= | ||
| 57 | QMAKE_RPATH = -Qoption,ld,-rpath, | ||
| 58 | |||
| 59 | QMAKE_LIBS = $(LIBS_EXTRA) | ||
| 60 | QMAKE_LIBS_DYNLOAD= -ldl | ||
| 61 | QMAKE_LIBS_X11 = -lXext -lX11 -lm | ||
| 62 | QMAKE_LIBS_X11SM= -lSM -lICE | ||
| 63 | QMAKE_LIBS_NIS = -lnsl | ||
| 64 | QMAKE_LIBS_QT = -lqt | ||
| 65 | QMAKE_LIBS_QT_THREAD= -lqt-mt | ||
| 66 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | ||
| 67 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | ||
| 68 | QMAKE_LIBS_THREAD= -lpthread | ||
| 69 | |||
| 70 | QMAKE_MOC = $(QTDIR)/bin/moc | ||
| 71 | QMAKE_UIC = $(QTDIR)/bin/uic | ||
| 72 | |||
| 73 | QMAKE_AR = ar cqs | ||
| 74 | QMAKE_RANLIB = | ||
| 75 | |||
| 76 | QMAKE_CLEAN = -r $(OBJECTS_DIR)/ti_files | ||
| 77 | |||
| 78 | QMAKE_TAR = tar -cf | ||
| 79 | QMAKE_GZIP = gzip -9f | ||
| 80 | |||
| 81 | QMAKE_COPY = cp -f | ||
| 82 | QMAKE_MOVE = mv -f | ||
| 83 | QMAKE_DEL_FILE = rm -f | ||
| 84 | QMAKE_DEL_DIR = rmdir | ||
| 85 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 86 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/linux-ecc-64/qplatformdefs.h b/mkspecs/linux-ecc-64/qplatformdefs.h new file mode 100644 index 0000000..e25bc1e --- a/dev/null +++ b/mkspecs/linux-ecc-64/qplatformdefs.h | |||
| @@ -0,0 +1,106 @@ | |||
| 1 | #ifndef QPLATFORMDEFS_H | ||
| 2 | #define QPLATFORMDEFS_H | ||
| 3 | |||
| 4 | // Get Qt defines/settings | ||
| 5 | |||
| 6 | #include "qglobal.h" | ||
| 7 | |||
| 8 | // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs | ||
| 9 | |||
| 10 | // DNS system header files are a mess! | ||
| 11 | // <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using | ||
| 12 | // 'u_char' and includes <sys/types.h>. Now the problem is that | ||
| 13 | // <sys/types.h> defines 'u_char' only if __USE_BSD is defined. | ||
| 14 | // __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined. | ||
| 15 | #ifndef _BSD_SOURCE | ||
| 16 | # define _BSD_SOURCE | ||
| 17 | #endif | ||
| 18 | |||
| 19 | // 1) need to reset default environment if _BSD_SOURCE is defined | ||
| 20 | // 2) need to specify POSIX thread interfaces explicitly in glibc 2.0 | ||
| 21 | // 3) it seems older glibc need this to include the X/Open stuff | ||
| 22 | #ifndef _GNU_SOURCE | ||
| 23 | # define _GNU_SOURCE | ||
| 24 | #endif | ||
| 25 | |||
| 26 | #include <unistd.h> | ||
| 27 | |||
| 28 | |||
| 29 | // We are hot - unistd.h should have turned on the specific APIs we requested | ||
| 30 | |||
| 31 | |||
| 32 | #ifdef QT_THREAD_SUPPORT | ||
| 33 | #include <pthread.h> | ||
| 34 | #endif | ||
| 35 | |||
| 36 | #include <dirent.h> | ||
| 37 | #include <fcntl.h> | ||
| 38 | #include <grp.h> | ||
| 39 | #include <pwd.h> | ||
| 40 | #include <signal.h> | ||
| 41 | #include <dlfcn.h> | ||
| 42 | |||
| 43 | #include <sys/types.h> | ||
| 44 | #include <sys/ioctl.h> | ||
| 45 | #include <sys/ipc.h> | ||
| 46 | #include <sys/time.h> | ||
| 47 | #include <sys/shm.h> | ||
| 48 | #include <sys/socket.h> | ||
| 49 | #include <sys/stat.h> | ||
| 50 | #include <sys/wait.h> | ||
| 51 | |||
| 52 | // DNS header files are not fully covered by X/Open specifications. | ||
| 53 | // In particular nothing is said about res_* :/ | ||
| 54 | // Header files <netinet/in.h> and <arpa/nameser.h> are not included | ||
| 55 | // by <resolv.h> on older versions of the GNU C library. Note that | ||
| 56 | // <arpa/nameser.h> must be included before <resolv.h>. | ||
| 57 | #include <netinet/in.h> | ||
| 58 | #include <arpa/nameser.h> | ||
| 59 | #include <resolv.h> | ||
| 60 | |||
| 61 | |||
| 62 | #if !defined(QT_NO_COMPAT) | ||
| 63 | #define QT_STATBUF struct stat | ||
| 64 | #define QT_STATBUF4TSTATstruct stat | ||
| 65 | #define QT_STAT ::stat | ||
| 66 | #define QT_FSTAT ::fstat | ||
| 67 | #define QT_STAT_REG S_IFREG | ||
| 68 | #define QT_STAT_DIR S_IFDIR | ||
| 69 | #define QT_STAT_MASK S_IFMT | ||
| 70 | #define QT_STAT_LNK S_IFLNK | ||
| 71 | #define QT_FILENO fileno | ||
| 72 | #define QT_OPEN ::open | ||
| 73 | #define QT_CLOSE ::close | ||
| 74 | #define QT_LSEEK ::lseek | ||
| 75 | #define QT_READ ::read | ||
| 76 | #define QT_WRITE ::write | ||
| 77 | #define QT_ACCESS ::access | ||
| 78 | #define QT_GETCWD ::getcwd | ||
| 79 | #define QT_CHDIR ::chdir | ||
| 80 | #define QT_MKDIR ::mkdir | ||
| 81 | #define QT_RMDIR ::rmdir | ||
| 82 | #define QT_OPEN_RDONLY O_RDONLY | ||
| 83 | #define QT_OPEN_WRONLY O_WRONLY | ||
| 84 | #define QT_OPEN_RDWR O_RDWR | ||
| 85 | #define QT_OPEN_CREAT O_CREAT | ||
| 86 | #define QT_OPEN_TRUNC O_TRUNC | ||
| 87 | #define QT_OPEN_APPEND O_APPEND | ||
| 88 | #endif | ||
| 89 | |||
| 90 | #define QT_SIGNAL_RETTYPEvoid | ||
| 91 | #define QT_SIGNAL_ARGS int | ||
| 92 | #define QT_SIGNAL_IGNORESIG_IGN | ||
| 93 | |||
| 94 | #if defined(__GLIBC__) && (__GLIBC__ >= 2) | ||
| 95 | #define QT_SOCKLEN_T socklen_t | ||
| 96 | #else | ||
| 97 | #define QT_SOCKLEN_T int | ||
| 98 | #endif | ||
| 99 | |||
| 100 | #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) | ||
| 101 | #define QT_SNPRINTF ::snprintf | ||
| 102 | #define QT_VSNPRINTF ::vsnprintf | ||
| 103 | #endif | ||
| 104 | |||
| 105 | |||
| 106 | #endif // QPLATFORMDEFS_H | ||
diff --git a/mkspecs/linux-g++-64/qmake.conf b/mkspecs/linux-g++-64/qmake.conf new file mode 100644 index 0000000..39b018f --- a/dev/null +++ b/mkspecs/linux-g++-64/qmake.conf | |||
| @@ -0,0 +1,90 @@ | |||
| 1 | # | ||
| 2 | # $Id$ | ||
| 3 | # | ||
| 4 | # qmake configuration for linux-g++ | ||
| 5 | # | ||
| 6 | # mkspec for platforms that have both lib and lib64 | ||
| 7 | # directories, like the AMD Opteron. | ||
| 8 | # | ||
| 9 | |||
| 10 | MAKEFILE_GENERATOR= UNIX | ||
| 11 | TEMPLATE = app | ||
| 12 | CONFIG += qt warn_on release incremental link_prl | ||
| 13 | QMAKE_INCREMENTAL_STYLE = sublib | ||
| 14 | |||
| 15 | QMAKE_CC = gcc | ||
| 16 | QMAKE_LEX = flex | ||
| 17 | QMAKE_LEXFLAGS = | ||
| 18 | QMAKE_YACC = yacc | ||
| 19 | QMAKE_YACCFLAGS = -d | ||
| 20 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | ||
| 21 | QMAKE_CFLAGS_DEPS= -M | ||
| 22 | QMAKE_CFLAGS_WARN_ON= -Wall -W | ||
| 23 | QMAKE_CFLAGS_WARN_OFF= -w | ||
| 24 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | ||
| 25 | QMAKE_CFLAGS_DEBUG= -g | ||
| 26 | QMAKE_CFLAGS_SHLIB= -fPIC | ||
| 27 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | ||
| 28 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | ||
| 29 | |||
| 30 | QMAKE_CXX = g++ | ||
| 31 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | ||
| 32 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | ||
| 33 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | ||
| 34 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | ||
| 35 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | ||
| 36 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | ||
| 37 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | ||
| 38 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | ||
| 39 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | ||
| 40 | |||
| 41 | QMAKE_INCDIR = | ||
| 42 | QMAKE_LIBDIR = | ||
| 43 | QMAKE_INCDIR_X11= /usr/X11R6/include | ||
| 44 | QMAKE_LIBDIR_X11= /usr/X11R6/lib64 | ||
| 45 | QMAKE_INCDIR_QT = $(QTDIR)/include | ||
| 46 | QMAKE_LIBDIR_QT = $(QTDIR)/lib64 | ||
| 47 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | ||
| 48 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib64 | ||
| 49 | |||
| 50 | QMAKE_LINK = g++ | ||
| 51 | QMAKE_LINK_SHLIB= g++ | ||
| 52 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | ||
| 53 | QMAKE_LFLAGS_RELEASE= | ||
| 54 | QMAKE_LFLAGS_DEBUG= | ||
| 55 | QMAKE_LFLAGS_SHLIB= -shared | ||
| 56 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | ||
| 57 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | ||
| 58 | QMAKE_LFLAGS_THREAD= | ||
| 59 | QMAKE_RPATH = -Wl,-rpath, | ||
| 60 | |||
| 61 | QMAKE_LIBS = $(LIBS_EXTRA) | ||
| 62 | QMAKE_LIBS_DYNLOAD= -ldl | ||
| 63 | QMAKE_LIBS_X11 = -lXext -lX11 -lm | ||
| 64 | QMAKE_LIBS_X11SM= -lSM -lICE | ||
| 65 | QMAKE_LIBS_NIS = -lnsl | ||
| 66 | QMAKE_LIBS_QT = -lqt | ||
| 67 | QMAKE_LIBS_QT_THREAD= -lqt-mt | ||
| 68 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | ||
| 69 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | ||
| 70 | QMAKE_LIBS_THREAD= -lpthread | ||
| 71 | |||
| 72 | QMAKE_MOC = $(QTDIR)/bin/moc | ||
| 73 | QMAKE_UIC = $(QTDIR)/bin/uic | ||
| 74 | |||
| 75 | QMAKE_AR = ar cqs | ||
| 76 | QMAKE_RANLIB = | ||
| 77 | |||
| 78 | QMAKE_TAR = tar -cf | ||
| 79 | QMAKE_GZIP = gzip -9f | ||
| 80 | |||
| 81 | QMAKE_COPY = cp -f | ||
| 82 | QMAKE_COPY_FILE = $(COPY) | ||
| 83 | QMAKE_COPY_DIR = $(COPY) -r | ||
| 84 | QMAKE_MOVE = mv -f | ||
| 85 | QMAKE_DEL_FILE = rm -f | ||
| 86 | QMAKE_DEL_DIR = rmdir | ||
| 87 | QMAKE_STRIP = strip | ||
| 88 | QMAKE_STRIPFLAGS_LIB += --strip-unneeded | ||
| 89 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 90 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/linux-g++-64/qplatformdefs.h b/mkspecs/linux-g++-64/qplatformdefs.h new file mode 100644 index 0000000..e25bc1e --- a/dev/null +++ b/mkspecs/linux-g++-64/qplatformdefs.h | |||
| @@ -0,0 +1,106 @@ | |||
| 1 | #ifndef QPLATFORMDEFS_H | ||
| 2 | #define QPLATFORMDEFS_H | ||
| 3 | |||
| 4 | // Get Qt defines/settings | ||
| 5 | |||
| 6 | #include "qglobal.h" | ||
| 7 | |||
| 8 | // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs | ||
| 9 | |||
| 10 | // DNS system header files are a mess! | ||
| 11 | // <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using | ||
| 12 | // 'u_char' and includes <sys/types.h>. Now the problem is that | ||
| 13 | // <sys/types.h> defines 'u_char' only if __USE_BSD is defined. | ||
| 14 | // __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined. | ||
| 15 | #ifndef _BSD_SOURCE | ||
| 16 | # define _BSD_SOURCE | ||
| 17 | #endif | ||
| 18 | |||
| 19 | // 1) need to reset default environment if _BSD_SOURCE is defined | ||
| 20 | // 2) need to specify POSIX thread interfaces explicitly in glibc 2.0 | ||
| 21 | // 3) it seems older glibc need this to include the X/Open stuff | ||
| 22 | #ifndef _GNU_SOURCE | ||
| 23 | # define _GNU_SOURCE | ||
| 24 | #endif | ||
| 25 | |||
| 26 | #include <unistd.h> | ||
| 27 | |||
| 28 | |||
| 29 | // We are hot - unistd.h should have turned on the specific APIs we requested | ||
| 30 | |||
| 31 | |||
| 32 | #ifdef QT_THREAD_SUPPORT | ||
| 33 | #include <pthread.h> | ||
| 34 | #endif | ||
| 35 | |||
| 36 | #include <dirent.h> | ||
| 37 | #include <fcntl.h> | ||
| 38 | #include <grp.h> | ||
| 39 | #include <pwd.h> | ||
| 40 | #include <signal.h> | ||
| 41 | #include <dlfcn.h> | ||
| 42 | |||
| 43 | #include <sys/types.h> | ||
| 44 | #include <sys/ioctl.h> | ||
| 45 | #include <sys/ipc.h> | ||
| 46 | #include <sys/time.h> | ||
| 47 | #include <sys/shm.h> | ||
| 48 | #include <sys/socket.h> | ||
| 49 | #include <sys/stat.h> | ||
| 50 | #include <sys/wait.h> | ||
| 51 | |||
| 52 | // DNS header files are not fully covered by X/Open specifications. | ||
| 53 | // In particular nothing is said about res_* :/ | ||
| 54 | // Header files <netinet/in.h> and <arpa/nameser.h> are not included | ||
| 55 | // by <resolv.h> on older versions of the GNU C library. Note that | ||
| 56 | // <arpa/nameser.h> must be included before <resolv.h>. | ||
| 57 | #include <netinet/in.h> | ||
| 58 | #include <arpa/nameser.h> | ||
| 59 | #include <resolv.h> | ||
| 60 | |||
| 61 | |||
| 62 | #if !defined(QT_NO_COMPAT) | ||
| 63 | #define QT_STATBUF struct stat | ||
| 64 | #define QT_STATBUF4TSTATstruct stat | ||
| 65 | #define QT_STAT ::stat | ||
| 66 | #define QT_FSTAT ::fstat | ||
| 67 | #define QT_STAT_REG S_IFREG | ||
| 68 | #define QT_STAT_DIR S_IFDIR | ||
| 69 | #define QT_STAT_MASK S_IFMT | ||
| 70 | #define QT_STAT_LNK S_IFLNK | ||
| 71 | #define QT_FILENO fileno | ||
| 72 | #define QT_OPEN ::open | ||
| 73 | #define QT_CLOSE ::close | ||
| 74 | #define QT_LSEEK ::lseek | ||
| 75 | #define QT_READ ::read | ||
| 76 | #define QT_WRITE ::write | ||
| 77 | #define QT_ACCESS ::access | ||
| 78 | #define QT_GETCWD ::getcwd | ||
| 79 | #define QT_CHDIR ::chdir | ||
| 80 | #define QT_MKDIR ::mkdir | ||
| 81 | #define QT_RMDIR ::rmdir | ||
| 82 | #define QT_OPEN_RDONLY O_RDONLY | ||
| 83 | #define QT_OPEN_WRONLY O_WRONLY | ||
| 84 | #define QT_OPEN_RDWR O_RDWR | ||
| 85 | #define QT_OPEN_CREAT O_CREAT | ||
| 86 | #define QT_OPEN_TRUNC O_TRUNC | ||
| 87 | #define QT_OPEN_APPEND O_APPEND | ||
| 88 | #endif | ||
| 89 | |||
| 90 | #define QT_SIGNAL_RETTYPEvoid | ||
| 91 | #define QT_SIGNAL_ARGS int | ||
| 92 | #define QT_SIGNAL_IGNORESIG_IGN | ||
| 93 | |||
| 94 | #if defined(__GLIBC__) && (__GLIBC__ >= 2) | ||
| 95 | #define QT_SOCKLEN_T socklen_t | ||
| 96 | #else | ||
| 97 | #define QT_SOCKLEN_T int | ||
| 98 | #endif | ||
| 99 | |||
| 100 | #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) | ||
| 101 | #define QT_SNPRINTF ::snprintf | ||
| 102 | #define QT_VSNPRINTF ::vsnprintf | ||
| 103 | #endif | ||
| 104 | |||
| 105 | |||
| 106 | #endif // QPLATFORMDEFS_H | ||
diff --git a/mkspecs/linux-g++/qmake.conf b/mkspecs/linux-g++/qmake.conf index 37a3f6e..882168a 100644 --- a/mkspecs/linux-g++/qmake.conf +++ b/mkspecs/linux-g++/qmake.conf | |||
| @@ -1,82 +1,90 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for linux-g++ | 4 | # qmake configuration for linux-g++ |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release incremental | 9 | CONFIG += qt warn_on release incremental link_prl |
| 10 | QMAKE_INCREMENTAL_STYLE = sublib | 10 | QMAKE_INCREMENTAL_STYLE = sublib |
| 11 | 11 | ||
| 12 | QMAKE_CC = gcc | 12 | QMAKE_CC = gcc |
| 13 | QMAKE_LEX = flex | 13 | QMAKE_LEX = flex |
| 14 | QMAKE_LEXFLAGS = | 14 | QMAKE_LEXFLAGS = |
| 15 | QMAKE_YACC = yacc | 15 | QMAKE_YACC = yacc |
| 16 | QMAKE_YACCFLAGS = -d | 16 | QMAKE_YACCFLAGS = -d |
| 17 | QMAKE_YACCFLAGS_MANGLE = -p $base -b $base | ||
| 18 | QMAKE_YACC_HEADER = $base.tab.h | ||
| 19 | QMAKE_YACC_SOURCE = $base.tab.c | ||
| 17 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 20 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 18 | QMAKE_CFLAGS_DEPS= -M | 21 | QMAKE_CFLAGS_DEPS= -M |
| 19 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 22 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 20 | QMAKE_CFLAGS_WARN_OFF= -w | 23 | QMAKE_CFLAGS_WARN_OFF= -w |
| 21 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 24 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 22 | QMAKE_CFLAGS_DEBUG= -g | 25 | QMAKE_CFLAGS_DEBUG= -g |
| 23 | QMAKE_CFLAGS_SHLIB= -fPIC | 26 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 24 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 27 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 25 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 28 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 26 | 29 | ||
| 27 | QMAKE_CXX = g++ | 30 | QMAKE_CXX = g++ |
| 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 31 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 29 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 32 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 33 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 34 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 32 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 35 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 33 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 36 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 34 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 37 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 35 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 38 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 36 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 39 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 37 | 40 | ||
| 38 | QMAKE_INCDIR = | 41 | QMAKE_INCDIR = |
| 39 | QMAKE_LIBDIR = | 42 | QMAKE_LIBDIR = |
| 40 | QMAKE_INCDIR_X11= /usr/X11R6/include | 43 | QMAKE_INCDIR_X11= /usr/X11R6/include |
| 41 | QMAKE_LIBDIR_X11= /usr/X11R6/lib | 44 | QMAKE_LIBDIR_X11= /usr/X11R6/lib |
| 42 | QMAKE_INCDIR_QT = $(QTDIR)/include | 45 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 46 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 44 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 47 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 45 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 48 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 46 | 49 | ||
| 47 | QMAKE_LINK = g++ | 50 | QMAKE_LINK = g++ |
| 48 | QMAKE_LINK_SHLIB= g++ | 51 | QMAKE_LINK_SHLIB= g++ |
| 49 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 52 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 50 | QMAKE_LFLAGS_RELEASE= | 53 | QMAKE_LFLAGS_RELEASE= |
| 51 | QMAKE_LFLAGS_DEBUG= | 54 | QMAKE_LFLAGS_DEBUG= |
| 52 | QMAKE_LFLAGS_SHLIB= -shared | 55 | QMAKE_LFLAGS_SHLIB= -shared |
| 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 56 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 54 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 57 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 55 | QMAKE_LFLAGS_THREAD= | 58 | QMAKE_LFLAGS_THREAD= |
| 56 | QMAKE_RPATH = -Wl,-rpath, | 59 | QMAKE_RPATH = -Wl,-rpath, |
| 57 | 60 | ||
| 58 | QMAKE_LIBS = $(LIBS_EXTRA) | 61 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 59 | QMAKE_LIBS_DYNLOAD= -ldl | 62 | QMAKE_LIBS_DYNLOAD= -ldl |
| 60 | QMAKE_LIBS_X11 = -lXext -lX11 -lm | 63 | QMAKE_LIBS_X11 = -lXext -lX11 -lm |
| 61 | QMAKE_LIBS_X11SM= -lSM -lICE | 64 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 62 | QMAKE_LIBS_NIS = -lnsl | 65 | QMAKE_LIBS_NIS = -lnsl |
| 63 | QMAKE_LIBS_QT = -lqt | 66 | QMAKE_LIBS_QT = -lqt |
| 64 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 67 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 65 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 68 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 66 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 69 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 67 | QMAKE_LIBS_THREAD= -lpthread | 70 | QMAKE_LIBS_THREAD= -lpthread |
| 68 | 71 | ||
| 69 | QMAKE_MOC = $(QTDIR)/bin/moc | 72 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 70 | QMAKE_UIC = $(QTDIR)/bin/uic | 73 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 71 | 74 | ||
| 72 | QMAKE_AR = ar cqs | 75 | QMAKE_AR = ar cqs |
| 73 | QMAKE_RANLIB = | 76 | QMAKE_RANLIB = |
| 74 | 77 | ||
| 75 | QMAKE_TAR = tar -cf | 78 | QMAKE_TAR = tar -cf |
| 76 | QMAKE_GZIP = gzip -9f | 79 | QMAKE_GZIP = gzip -9f |
| 77 | 80 | ||
| 78 | QMAKE_COPY = cp -f | 81 | QMAKE_COPY = cp -f |
| 82 | QMAKE_COPY_FILE = $(COPY) | ||
| 83 | QMAKE_COPY_DIR = $(COPY) -r | ||
| 79 | QMAKE_MOVE = mv -f | 84 | QMAKE_MOVE = mv -f |
| 80 | QMAKE_DEL_FILE = rm -f | 85 | QMAKE_DEL_FILE = rm -f |
| 81 | QMAKE_DEL_DIR = rmdir | 86 | QMAKE_DEL_DIR = rmdir |
| 82 | QMAKE_STRIP = strip | 87 | QMAKE_STRIP = strip |
| 88 | QMAKE_STRIPFLAGS_LIB += --strip-unneeded | ||
| 89 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 90 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf index 9dc7480..5fcd96b 100644 --- a/mkspecs/linux-icc/qmake.conf +++ b/mkspecs/linux-icc/qmake.conf | |||
| @@ -1,82 +1,86 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for Intel C++ 5.0.1, 6.0, and 7.0 for Linux | 4 | # qmake configuration for linux-icc |
| 5 | # | ||
| 6 | # Written for Intel C++ 5.0.1, 6.0.1, 7.0, and 8.0 for Linux. | ||
| 5 | # | 7 | # |
| 6 | 8 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 9 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 10 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 11 | CONFIG += qt warn_on release link_prl |
| 10 | 12 | ||
| 11 | QMAKE_CC = icc | 13 | QMAKE_CC = icc |
| 12 | QMAKE_LEX = flex | 14 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 15 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 16 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 17 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) | 18 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 19 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= | 20 | QMAKE_CFLAGS_WARN_ON= |
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | 21 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 22 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 23 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= -KPIC | 24 | QMAKE_CFLAGS_SHLIB= -KPIC |
| 23 | QMAKE_CFLAGS_YACC= | 25 | QMAKE_CFLAGS_YACC= |
| 24 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 26 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 25 | 27 | ||
| 26 | QMAKE_CXX = icpc | 28 | QMAKE_CXX = icpc |
| 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 29 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 28 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 30 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 31 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 32 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 33 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 34 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 35 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 36 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 37 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 36 | 38 | ||
| 37 | QMAKE_INCDIR = | 39 | QMAKE_INCDIR = |
| 38 | QMAKE_LIBDIR = | 40 | QMAKE_LIBDIR = |
| 39 | QMAKE_INCDIR_X11= /usr/X11R6/include | 41 | QMAKE_INCDIR_X11= /usr/X11R6/include |
| 40 | QMAKE_LIBDIR_X11= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_X11= /usr/X11R6/lib |
| 41 | QMAKE_INCDIR_QT = $(QTDIR)/include | 43 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 44 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 43 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 45 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 44 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 46 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 45 | 47 | ||
| 46 | QMAKE_LINK = icpc | 48 | QMAKE_LINK = icpc |
| 47 | QMAKE_LINK_SHLIB= icpc | 49 | QMAKE_LINK_SHLIB= icpc |
| 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 50 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 49 | QMAKE_LFLAGS_RELEASE= | 51 | QMAKE_LFLAGS_RELEASE= |
| 50 | QMAKE_LFLAGS_DEBUG= | 52 | QMAKE_LFLAGS_DEBUG= |
| 51 | QMAKE_LFLAGS_SHLIB= -shared | 53 | QMAKE_LFLAGS_SHLIB= -shared |
| 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 54 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 53 | QMAKE_LFLAGS_SONAME= -Qoption,ld,-soname, | 55 | QMAKE_LFLAGS_SONAME= -Qoption,ld,-soname, |
| 54 | QMAKE_LFLAGS_THREAD= | 56 | QMAKE_LFLAGS_THREAD= |
| 55 | QMAKE_RPATH = -Qoption,ld,-rpath, | 57 | QMAKE_RPATH = -Qoption,ld,-rpath, |
| 56 | 58 | ||
| 57 | QMAKE_LIBS = $(LIBS_EXTRA) | 59 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 58 | QMAKE_LIBS_DYNLOAD= -ldl | 60 | QMAKE_LIBS_DYNLOAD= -ldl |
| 59 | QMAKE_LIBS_X11 = -lXext -lX11 -lm | 61 | QMAKE_LIBS_X11 = -lXext -lX11 -lm |
| 60 | QMAKE_LIBS_X11SM= -lSM -lICE | 62 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 61 | QMAKE_LIBS_NIS = -lnsl | 63 | QMAKE_LIBS_NIS = -lnsl |
| 62 | QMAKE_LIBS_QT = -lqt | 64 | QMAKE_LIBS_QT = -lqt |
| 63 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 65 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 64 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 66 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 65 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 67 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 66 | QMAKE_LIBS_THREAD= -lpthread | 68 | QMAKE_LIBS_THREAD= -lpthread |
| 67 | 69 | ||
| 68 | QMAKE_MOC = $(QTDIR)/bin/moc | 70 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 69 | QMAKE_UIC = $(QTDIR)/bin/uic | 71 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 70 | 72 | ||
| 71 | QMAKE_AR = ar cqs | 73 | QMAKE_AR = ar cqs |
| 72 | QMAKE_RANLIB = | 74 | QMAKE_RANLIB = |
| 73 | 75 | ||
| 74 | QMAKE_CLEAN = -r $(OBJECTS_DIR)/ti_files | 76 | QMAKE_CLEAN = -r $(OBJECTS_DIR)/ti_files |
| 75 | 77 | ||
| 76 | QMAKE_TAR = tar -cf | 78 | QMAKE_TAR = tar -cf |
| 77 | QMAKE_GZIP = gzip -9f | 79 | QMAKE_GZIP = gzip -9f |
| 78 | 80 | ||
| 79 | QMAKE_COPY = cp -f | 81 | QMAKE_COPY = cp -f |
| 80 | QMAKE_MOVE = mv -f | 82 | QMAKE_MOVE = mv -f |
| 81 | QMAKE_DEL_FILE = rm -f | 83 | QMAKE_DEL_FILE = rm -f |
| 82 | QMAKE_DEL_DIR = rmdir | 84 | QMAKE_DEL_DIR = rmdir |
| 85 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 86 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf index 5a2a670..30580b8 100644 --- a/mkspecs/linux-kcc/qmake.conf +++ b/mkspecs/linux-kcc/qmake.conf | |||
| @@ -1,89 +1,93 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for KAI C++ 4.0f for Linux | 4 | # qmake configuration for linux-kcc |
| 5 | # | ||
| 6 | # Written for KAI C++ 4.0f for GNU/Linux (discontinued). | ||
| 5 | # | 7 | # |
| 6 | # From the KAI C++ man page for Linux: | 8 | # From the KAI C++ man page for Linux: |
| 7 | # --[no_]thread_safe | 9 | # --[no_]thread_safe |
| 8 | # [Waive or] Request thread-safe handling of system-allocated objects. | 10 | # [Waive or] Request thread-safe handling of system-allocated objects. |
| 9 | # To guarantee thread safety, this option must be used when both | 11 | # To guarantee thread safety, this option must be used when both |
| 10 | # compiling and linking. Thread-safe C++ is not link-compatible with | 12 | # compiling and linking. Thread-safe C++ is not link-compatible with |
| 11 | # (the default) non-thread-safe C++. | 13 | # (the default) non-thread-safe C++. |
| 12 | # | 14 | # |
| 13 | 15 | ||
| 14 | MAKEFILE_GENERATOR= UNIX | 16 | MAKEFILE_GENERATOR= UNIX |
| 15 | TEMPLATE = app | 17 | TEMPLATE = app |
| 16 | CONFIG += qt warn_on release | 18 | CONFIG += qt warn_on release link_prl |
| 17 | 19 | ||
| 18 | QMAKE_CC = KCC | 20 | QMAKE_CC = KCC |
| 19 | QMAKE_LEX = flex | 21 | QMAKE_LEX = flex |
| 20 | QMAKE_LEXFLAGS = | 22 | QMAKE_LEXFLAGS = |
| 21 | QMAKE_YACC = yacc | 23 | QMAKE_YACC = yacc |
| 22 | QMAKE_YACCFLAGS = -d | 24 | QMAKE_YACCFLAGS = -d |
| 23 | QMAKE_CFLAGS = --c --display_error_number --backend -pipe $(CFLAGS_EXTRA) | 25 | QMAKE_CFLAGS = --c --display_error_number --backend -pipe $(CFLAGS_EXTRA) |
| 24 | QMAKE_CFLAGS_DEPS= -M | 26 | QMAKE_CFLAGS_DEPS= -M |
| 25 | QMAKE_CFLAGS_WARN_ON= | 27 | QMAKE_CFLAGS_WARN_ON= |
| 26 | QMAKE_CFLAGS_WARN_OFF= -w | 28 | QMAKE_CFLAGS_WARN_OFF= -w |
| 27 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), +K2) | 29 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), +K2) |
| 28 | QMAKE_CFLAGS_DEBUG= +K0 | 30 | QMAKE_CFLAGS_DEBUG= +K0 |
| 29 | QMAKE_CFLAGS_SHLIB= -fPIC | 31 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 30 | QMAKE_CFLAGS_YACC= --diag_suppress 111,177 | 32 | QMAKE_CFLAGS_YACC= --diag_suppress 111,177 |
| 31 | QMAKE_CFLAGS_THREAD= --thread_safe | 33 | QMAKE_CFLAGS_THREAD= --thread_safe |
| 32 | 34 | ||
| 33 | QMAKE_CXX = KCC | 35 | QMAKE_CXX = KCC |
| 34 | QMAKE_CXXFLAGS = --display_error_number --diag_suppress 611,1142 --backend -pipe $(CXXFLAGS_EXTRA) | 36 | QMAKE_CXXFLAGS = --display_error_number --diag_suppress 611,1142 --backend -pipe $(CXXFLAGS_EXTRA) |
| 35 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 37 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 36 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 38 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 37 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 39 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 38 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 40 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 39 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 41 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 40 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 42 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 41 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 43 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 42 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 44 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 43 | 45 | ||
| 44 | QMAKE_INCDIR = | 46 | QMAKE_INCDIR = |
| 45 | QMAKE_LIBDIR = | 47 | QMAKE_LIBDIR = |
| 46 | QMAKE_INCDIR_X11= /usr/X11R6/include | 48 | QMAKE_INCDIR_X11= /usr/X11R6/include |
| 47 | QMAKE_LIBDIR_X11= /usr/X11R6/lib | 49 | QMAKE_LIBDIR_X11= /usr/X11R6/lib |
| 48 | QMAKE_INCDIR_QT = $(QTDIR)/include | 50 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 49 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 51 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 50 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 52 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 51 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 53 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 52 | 54 | ||
| 53 | QMAKE_LINK = KCC | 55 | QMAKE_LINK = KCC |
| 54 | QMAKE_LINK_SHLIB= KCC | 56 | QMAKE_LINK_SHLIB= KCC |
| 55 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 57 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 56 | QMAKE_LFLAGS_RELEASE= | 58 | QMAKE_LFLAGS_RELEASE= |
| 57 | QMAKE_LFLAGS_DEBUG= | 59 | QMAKE_LFLAGS_DEBUG= |
| 58 | QMAKE_LFLAGS_SHLIB= | 60 | QMAKE_LFLAGS_SHLIB= |
| 59 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 61 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 60 | QMAKE_LFLAGS_SONAME= --soname$$LITERAL_WHITESPACE | 62 | QMAKE_LFLAGS_SONAME= --soname$$LITERAL_WHITESPACE |
| 61 | QMAKE_LFLAGS_THREAD= --thread_safe | 63 | QMAKE_LFLAGS_THREAD= --thread_safe |
| 62 | QMAKE_RPATH = -rpath$$LITERAL_WHITESPACE | 64 | QMAKE_RPATH = -rpath$$LITERAL_WHITESPACE |
| 63 | 65 | ||
| 64 | QMAKE_LIBS = $(LIBS_EXTRA) | 66 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 65 | QMAKE_LIBS_DYNLOAD= -ldl | 67 | QMAKE_LIBS_DYNLOAD= -ldl |
| 66 | QMAKE_LIBS_X11 = -lXext -lX11 -lm | 68 | QMAKE_LIBS_X11 = -lXext -lX11 -lm |
| 67 | QMAKE_LIBS_X11SM= -lSM -lICE | 69 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 68 | QMAKE_LIBS_NIS = -lnsl | 70 | QMAKE_LIBS_NIS = -lnsl |
| 69 | QMAKE_LIBS_QT = -lqt | 71 | QMAKE_LIBS_QT = -lqt |
| 70 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 72 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 71 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 73 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 72 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 74 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 73 | QMAKE_LIBS_THREAD= | 75 | QMAKE_LIBS_THREAD= |
| 74 | 76 | ||
| 75 | QMAKE_MOC = $(QTDIR)/bin/moc | 77 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 76 | QMAKE_UIC = $(QTDIR)/bin/uic | 78 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 77 | 79 | ||
| 78 | QMAKE_AR = ar cqs | 80 | QMAKE_AR = ar cqs |
| 79 | QMAKE_RANLIB = | 81 | QMAKE_RANLIB = |
| 80 | 82 | ||
| 81 | QMAKE_CLEAN = -r $(OBJECTS_DIR)ti_files | 83 | QMAKE_CLEAN = -r $(OBJECTS_DIR)ti_files |
| 82 | 84 | ||
| 83 | QMAKE_TAR = tar -cf | 85 | QMAKE_TAR = tar -cf |
| 84 | QMAKE_GZIP = gzip -9f | 86 | QMAKE_GZIP = gzip -9f |
| 85 | 87 | ||
| 86 | QMAKE_COPY = cp -f | 88 | QMAKE_COPY = cp -f |
| 87 | QMAKE_MOVE = mv -f | 89 | QMAKE_MOVE = mv -f |
| 88 | QMAKE_DEL_FILE = rm -f | 90 | QMAKE_DEL_FILE = rm -f |
| 89 | QMAKE_DEL_DIR = rmdir | 91 | QMAKE_DEL_DIR = rmdir |
| 92 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 93 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/linux-kylix/qmake.conf b/mkspecs/linux-kylix/qmake.conf new file mode 100644 index 0000000..dfbf8e7 --- a/dev/null +++ b/mkspecs/linux-kylix/qmake.conf | |||
| @@ -0,0 +1,84 @@ | |||
| 1 | # | ||
| 2 | # $Id$ | ||
| 3 | # | ||
| 4 | # qmake configuration for linux-kylix | ||
| 5 | # | ||
| 6 | |||
| 7 | MAKEFILE_GENERATOR= UNIX | ||
| 8 | TEMPLATE = app | ||
| 9 | CONFIG += qt warn_on release incremental link_prl | ||
| 10 | QMAKE_INCREMENTAL_STYLE= sublib | ||
| 11 | |||
| 12 | QMAKE_CC = bc++ | ||
| 13 | QMAKE_LEX = flex | ||
| 14 | QMAKE_LEXFLAGS = | ||
| 15 | QMAKE_YACC = yacc | ||
| 16 | QMAKE_YACCFLAGS = -d | ||
| 17 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) | ||
| 18 | QMAKE_CFLAGS_DEPS= -m | ||
| 19 | QMAKE_CFLAGS_WARN_ON= -w | ||
| 20 | QMAKE_CFLAGS_WARN_OFF= -w- | ||
| 21 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | ||
| 22 | QMAKE_CFLAGS_DEBUG= -v -y | ||
| 23 | QMAKE_CFLAGS_SHLIB= | ||
| 24 | QMAKE_CFLAGS_YACC= | ||
| 25 | QMAKE_CFLAGS_THREAD= | ||
| 26 | |||
| 27 | QMAKE_CXX = bc++ | ||
| 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -P $(CXXFLAGS_EXTRA) | ||
| 29 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | ||
| 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | ||
| 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | ||
| 32 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | ||
| 33 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | ||
| 34 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | ||
| 35 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | ||
| 36 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | ||
| 37 | |||
| 38 | QMAKE_INCDIR = | ||
| 39 | QMAKE_LIBDIR = | ||
| 40 | QMAKE_INCDIR_X11= /usr/X11R6/include | ||
| 41 | QMAKE_LIBDIR_X11= /usr/X11R6/lib | ||
| 42 | QMAKE_INCDIR_QT = $(QTDIR)/include | ||
| 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | ||
| 44 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | ||
| 45 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | ||
| 46 | |||
| 47 | QMAKE_LINK = bc++ | ||
| 48 | QMAKE_LINK_SHLIB= bc++ | ||
| 49 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | ||
| 50 | QMAKE_LFLAGS_RELEASE= | ||
| 51 | QMAKE_LFLAGS_DEBUG= -lv -ly | ||
| 52 | QMAKE_LFLAGS_SHLIB= -ltD -lTpd | ||
| 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | ||
| 54 | QMAKE_LFLAGS_SONAME= -lN | ||
| 55 | QMAKE_LFLAGS_THREAD= | ||
| 56 | QMAKE_RPATH = | ||
| 57 | |||
| 58 | QMAKE_LIBS = $(LIBS_EXTRA) | ||
| 59 | QMAKE_LIBS_DYNLOAD= -llibdl | ||
| 60 | QMAKE_LIBS_X11 = -llibXext -llibX11 -llibm | ||
| 61 | QMAKE_LIBS_X11SM= -llibSM -llibICE | ||
| 62 | QMAKE_LIBS_NIS = -llibnsl | ||
| 63 | QMAKE_LIBS_QT = -llibqt | ||
| 64 | QMAKE_LIBS_QT_THREAD= -llibqt-mt | ||
| 65 | QMAKE_LIBS_OPENGL= -llibGLU -llibGL -llibXmu | ||
| 66 | QMAKE_LIBS_OPENGL_QT= -llibGL -llibXmu | ||
| 67 | QMAKE_LIBS_THREAD= -llibpthread | ||
| 68 | |||
| 69 | QMAKE_MOC = $(QTDIR)/bin/moc | ||
| 70 | QMAKE_UIC = $(QTDIR)/bin/uic | ||
| 71 | |||
| 72 | QMAKE_AR = ar cqs | ||
| 73 | QMAKE_RANLIB = | ||
| 74 | |||
| 75 | QMAKE_TAR = tar -cf | ||
| 76 | QMAKE_GZIP = gzip -9f | ||
| 77 | |||
| 78 | QMAKE_COPY = cp -f | ||
| 79 | QMAKE_MOVE = mv -f | ||
| 80 | QMAKE_DEL_FILE = rm -f | ||
| 81 | QMAKE_DEL_DIR = rmdir | ||
| 82 | QMAKE_STRIP = strip | ||
| 83 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 84 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/linux-kylix/qplatformdefs.h b/mkspecs/linux-kylix/qplatformdefs.h new file mode 100644 index 0000000..e25bc1e --- a/dev/null +++ b/mkspecs/linux-kylix/qplatformdefs.h | |||
| @@ -0,0 +1,106 @@ | |||
| 1 | #ifndef QPLATFORMDEFS_H | ||
| 2 | #define QPLATFORMDEFS_H | ||
| 3 | |||
| 4 | // Get Qt defines/settings | ||
| 5 | |||
| 6 | #include "qglobal.h" | ||
| 7 | |||
| 8 | // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs | ||
| 9 | |||
| 10 | // DNS system header files are a mess! | ||
| 11 | // <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using | ||
| 12 | // 'u_char' and includes <sys/types.h>. Now the problem is that | ||
| 13 | // <sys/types.h> defines 'u_char' only if __USE_BSD is defined. | ||
| 14 | // __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined. | ||
| 15 | #ifndef _BSD_SOURCE | ||
| 16 | # define _BSD_SOURCE | ||
| 17 | #endif | ||
| 18 | |||
| 19 | // 1) need to reset default environment if _BSD_SOURCE is defined | ||
| 20 | // 2) need to specify POSIX thread interfaces explicitly in glibc 2.0 | ||
| 21 | // 3) it seems older glibc need this to include the X/Open stuff | ||
| 22 | #ifndef _GNU_SOURCE | ||
| 23 | # define _GNU_SOURCE | ||
| 24 | #endif | ||
| 25 | |||
| 26 | #include <unistd.h> | ||
| 27 | |||
| 28 | |||
| 29 | // We are hot - unistd.h should have turned on the specific APIs we requested | ||
| 30 | |||
| 31 | |||
| 32 | #ifdef QT_THREAD_SUPPORT | ||
| 33 | #include <pthread.h> | ||
| 34 | #endif | ||
| 35 | |||
| 36 | #include <dirent.h> | ||
| 37 | #include <fcntl.h> | ||
| 38 | #include <grp.h> | ||
| 39 | #include <pwd.h> | ||
| 40 | #include <signal.h> | ||
| 41 | #include <dlfcn.h> | ||
| 42 | |||
| 43 | #include <sys/types.h> | ||
| 44 | #include <sys/ioctl.h> | ||
| 45 | #include <sys/ipc.h> | ||
| 46 | #include <sys/time.h> | ||
| 47 | #include <sys/shm.h> | ||
| 48 | #include <sys/socket.h> | ||
| 49 | #include <sys/stat.h> | ||
| 50 | #include <sys/wait.h> | ||
| 51 | |||
| 52 | // DNS header files are not fully covered by X/Open specifications. | ||
| 53 | // In particular nothing is said about res_* :/ | ||
| 54 | // Header files <netinet/in.h> and <arpa/nameser.h> are not included | ||
| 55 | // by <resolv.h> on older versions of the GNU C library. Note that | ||
| 56 | // <arpa/nameser.h> must be included before <resolv.h>. | ||
| 57 | #include <netinet/in.h> | ||
| 58 | #include <arpa/nameser.h> | ||
| 59 | #include <resolv.h> | ||
| 60 | |||
| 61 | |||
| 62 | #if !defined(QT_NO_COMPAT) | ||
| 63 | #define QT_STATBUF struct stat | ||
| 64 | #define QT_STATBUF4TSTATstruct stat | ||
| 65 | #define QT_STAT ::stat | ||
| 66 | #define QT_FSTAT ::fstat | ||
| 67 | #define QT_STAT_REG S_IFREG | ||
| 68 | #define QT_STAT_DIR S_IFDIR | ||
| 69 | #define QT_STAT_MASK S_IFMT | ||
| 70 | #define QT_STAT_LNK S_IFLNK | ||
| 71 | #define QT_FILENO fileno | ||
| 72 | #define QT_OPEN ::open | ||
| 73 | #define QT_CLOSE ::close | ||
| 74 | #define QT_LSEEK ::lseek | ||
| 75 | #define QT_READ ::read | ||
| 76 | #define QT_WRITE ::write | ||
| 77 | #define QT_ACCESS ::access | ||
| 78 | #define QT_GETCWD ::getcwd | ||
| 79 | #define QT_CHDIR ::chdir | ||
| 80 | #define QT_MKDIR ::mkdir | ||
| 81 | #define QT_RMDIR ::rmdir | ||
| 82 | #define QT_OPEN_RDONLY O_RDONLY | ||
| 83 | #define QT_OPEN_WRONLY O_WRONLY | ||
| 84 | #define QT_OPEN_RDWR O_RDWR | ||
| 85 | #define QT_OPEN_CREAT O_CREAT | ||
| 86 | #define QT_OPEN_TRUNC O_TRUNC | ||
| 87 | #define QT_OPEN_APPEND O_APPEND | ||
| 88 | #endif | ||
| 89 | |||
| 90 | #define QT_SIGNAL_RETTYPEvoid | ||
| 91 | #define QT_SIGNAL_ARGS int | ||
| 92 | #define QT_SIGNAL_IGNORESIG_IGN | ||
| 93 | |||
| 94 | #if defined(__GLIBC__) && (__GLIBC__ >= 2) | ||
| 95 | #define QT_SOCKLEN_T socklen_t | ||
| 96 | #else | ||
| 97 | #define QT_SOCKLEN_T int | ||
| 98 | #endif | ||
| 99 | |||
| 100 | #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) | ||
| 101 | #define QT_SNPRINTF ::snprintf | ||
| 102 | #define QT_VSNPRINTF ::vsnprintf | ||
| 103 | #endif | ||
| 104 | |||
| 105 | |||
| 106 | #endif // QPLATFORMDEFS_H | ||
diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf index a200f69..f416183 100644 --- a/mkspecs/linux-pgcc/qmake.conf +++ b/mkspecs/linux-pgcc/qmake.conf | |||
| @@ -1,80 +1,84 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for Portland Group C++ for Intel | 4 | # qmake configuration for linux-pgcc |
| 5 | # | ||
| 6 | # Written for Portland Group C++ for Intel. | ||
| 5 | # | 7 | # |
| 6 | 8 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 9 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 10 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 11 | CONFIG += qt warn_on release link_prl |
| 10 | 12 | ||
| 11 | QMAKE_CC = pgcc | 13 | QMAKE_CC = pgcc |
| 12 | QMAKE_LEX = flex | 14 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 15 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 16 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 17 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) | 18 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 19 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= | 20 | QMAKE_CFLAGS_WARN_ON= |
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | 21 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -fast) | 22 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -fast) |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 23 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= -fpic | 24 | QMAKE_CFLAGS_SHLIB= -fpic |
| 23 | QMAKE_CFLAGS_YACC= | 25 | QMAKE_CFLAGS_YACC= |
| 24 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 26 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 25 | 27 | ||
| 26 | QMAKE_CXX = pgCC | 28 | QMAKE_CXX = pgCC |
| 27 | QMAKE_CXXFLAGS = --display_error_number $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 29 | QMAKE_CXXFLAGS = --display_error_number $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 28 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 30 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 31 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 32 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 33 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 34 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 35 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 36 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 37 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 36 | 38 | ||
| 37 | QMAKE_INCDIR = | 39 | QMAKE_INCDIR = |
| 38 | QMAKE_LIBDIR = | 40 | QMAKE_LIBDIR = |
| 39 | QMAKE_INCDIR_X11= /usr/X11R6/include | 41 | QMAKE_INCDIR_X11= /usr/X11R6/include |
| 40 | QMAKE_LIBDIR_X11= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_X11= /usr/X11R6/lib |
| 41 | QMAKE_INCDIR_QT = $(QTDIR)/include | 43 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 44 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 43 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 45 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 44 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 46 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 45 | 47 | ||
| 46 | QMAKE_LINK = pgCC | 48 | QMAKE_LINK = pgCC |
| 47 | QMAKE_LINK_SHLIB= pgCC | 49 | QMAKE_LINK_SHLIB= pgCC |
| 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 50 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 49 | QMAKE_LFLAGS_RELEASE= | 51 | QMAKE_LFLAGS_RELEASE= |
| 50 | QMAKE_LFLAGS_DEBUG= | 52 | QMAKE_LFLAGS_DEBUG= |
| 51 | QMAKE_LFLAGS_SHLIB= -shared | 53 | QMAKE_LFLAGS_SHLIB= -shared |
| 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 54 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 53 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 55 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 54 | QMAKE_LFLAGS_THREAD= | 56 | QMAKE_LFLAGS_THREAD= |
| 55 | QMAKE_RPATH = -R | 57 | QMAKE_RPATH = -R |
| 56 | 58 | ||
| 57 | QMAKE_LIBS = $(LIBS_EXTRA) | 59 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 58 | QMAKE_LIBS_DYNLOAD= -ldl | 60 | QMAKE_LIBS_DYNLOAD= -ldl |
| 59 | QMAKE_LIBS_X11 = -lXext -lX11 -lm | 61 | QMAKE_LIBS_X11 = -lXext -lX11 -lm |
| 60 | QMAKE_LIBS_X11SM= -lSM -lICE | 62 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 61 | QMAKE_LIBS_NIS = -lnsl | 63 | QMAKE_LIBS_NIS = -lnsl |
| 62 | QMAKE_LIBS_QT = -lqt | 64 | QMAKE_LIBS_QT = -lqt |
| 63 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 65 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 64 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 66 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 65 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 67 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 66 | QMAKE_LIBS_THREAD= -lpthread | 68 | QMAKE_LIBS_THREAD= -lpthread |
| 67 | 69 | ||
| 68 | QMAKE_MOC = $(QTDIR)/bin/moc | 70 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 69 | QMAKE_UIC = $(QTDIR)/bin/uic | 71 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 70 | 72 | ||
| 71 | QMAKE_AR = ar cqs | 73 | QMAKE_AR = ar cqs |
| 72 | QMAKE_RANLIB = | 74 | QMAKE_RANLIB = |
| 73 | 75 | ||
| 74 | QMAKE_TAR = tar -cf | 76 | QMAKE_TAR = tar -cf |
| 75 | QMAKE_GZIP = gzip -9f | 77 | QMAKE_GZIP = gzip -9f |
| 76 | 78 | ||
| 77 | QMAKE_COPY = cp -f | 79 | QMAKE_COPY = cp -f |
| 78 | QMAKE_MOVE = mv -f | 80 | QMAKE_MOVE = mv -f |
| 79 | QMAKE_DEL_FILE = rm -f | 81 | QMAKE_DEL_FILE = rm -f |
| 80 | QMAKE_DEL_DIR = rmdir | 82 | QMAKE_DEL_DIR = rmdir |
| 83 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 84 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/lynxos-g++/qmake.conf b/mkspecs/lynxos-g++/qmake.conf new file mode 100644 index 0000000..12364c1 --- a/dev/null +++ b/mkspecs/lynxos-g++/qmake.conf | |||
| @@ -0,0 +1,87 @@ | |||
| 1 | # | ||
| 2 | # $Id$ | ||
| 3 | # | ||
| 4 | # qmake configuration for lynxos-g++ | ||
| 5 | # | ||
| 6 | # Written for LynxOS 4.0. | ||
| 7 | # | ||
| 8 | |||
| 9 | MAKEFILE_GENERATOR= UNIX | ||
| 10 | TEMPLATE = app | ||
| 11 | CONFIG += qt warn_on release incremental link_prl | ||
| 12 | QMAKE_INCREMENTAL_STYLE = sublib | ||
| 13 | |||
| 14 | QMAKE_CC = gcc | ||
| 15 | QMAKE_LEX = flex | ||
| 16 | QMAKE_LEXFLAGS = | ||
| 17 | QMAKE_YACC = yacc | ||
| 18 | QMAKE_YACCFLAGS = -d | ||
| 19 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | ||
| 20 | QMAKE_CFLAGS_DEPS= -M | ||
| 21 | QMAKE_CFLAGS_WARN_ON= -Wall -W | ||
| 22 | QMAKE_CFLAGS_WARN_OFF= -w | ||
| 23 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | ||
| 24 | QMAKE_CFLAGS_DEBUG= -g | ||
| 25 | QMAKE_CFLAGS_SHLIB= -fPIC | ||
| 26 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | ||
| 27 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | ||
| 28 | |||
| 29 | QMAKE_CXX = g++ | ||
| 30 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | ||
| 31 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | ||
| 32 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | ||
| 33 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | ||
| 34 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | ||
| 35 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | ||
| 36 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | ||
| 37 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | ||
| 38 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | ||
| 39 | |||
| 40 | QMAKE_INCDIR = | ||
| 41 | QMAKE_LIBDIR = | ||
| 42 | QMAKE_INCDIR_X11= /usr/include/X11 | ||
| 43 | QMAKE_LIBDIR_X11= | ||
| 44 | QMAKE_INCDIR_QT = $(QTDIR)/include | ||
| 45 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | ||
| 46 | QMAKE_INCDIR_OPENGL= /usr/include/GL | ||
| 47 | QMAKE_LIBDIR_OPENGL= | ||
| 48 | |||
| 49 | QMAKE_LINK = g++ | ||
| 50 | QMAKE_LINK_SHLIB= g++ | ||
| 51 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | ||
| 52 | QMAKE_LFLAGS_RELEASE= | ||
| 53 | QMAKE_LFLAGS_DEBUG= | ||
| 54 | QMAKE_LFLAGS_SHLIB= -shared | ||
| 55 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | ||
| 56 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | ||
| 57 | QMAKE_LFLAGS_THREAD= | ||
| 58 | QMAKE_RPATH = -Wl,-rpath, | ||
| 59 | |||
| 60 | QMAKE_LIBS = $(LIBS_EXTRA) | ||
| 61 | QMAKE_LIBS_DYNLOAD= -ldl | ||
| 62 | QMAKE_LIBS_X11 = -lXext -lX11 -lm | ||
| 63 | QMAKE_LIBS_X11SM= -lSM -lICE | ||
| 64 | QMAKE_LIBS_NIS = -lnsl | ||
| 65 | QMAKE_LIBS_QT = -lqt | ||
| 66 | QMAKE_LIBS_QT_THREAD= -lqt-mt | ||
| 67 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | ||
| 68 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | ||
| 69 | QMAKE_LIBS_THREAD= -lpthread | ||
| 70 | |||
| 71 | QMAKE_MOC = $(QTDIR)/bin/moc | ||
| 72 | QMAKE_UIC = $(QTDIR)/bin/uic | ||
| 73 | |||
| 74 | QMAKE_AR = ar cqs | ||
| 75 | QMAKE_RANLIB = | ||
| 76 | |||
| 77 | QMAKE_TAR = tar -cf | ||
| 78 | QMAKE_GZIP = gzip -9f | ||
| 79 | |||
| 80 | QMAKE_COPY = cp -f | ||
| 81 | QMAKE_MOVE = mv -f | ||
| 82 | QMAKE_DEL_FILE = rm -f | ||
| 83 | QMAKE_DEL_DIR = rmdir | ||
| 84 | QMAKE_STRIP = strip | ||
| 85 | QMAKE_STRIPFLAGS_LIB += --strip-unneeded | ||
| 86 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 87 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/lynxos-g++/qplatformdefs.h b/mkspecs/lynxos-g++/qplatformdefs.h new file mode 100644 index 0000000..56f4be6 --- a/dev/null +++ b/mkspecs/lynxos-g++/qplatformdefs.h | |||
| @@ -0,0 +1,91 @@ | |||
| 1 | #ifndef QPLATFORMDEFS_H | ||
| 2 | #define QPLATFORMDEFS_H | ||
| 3 | |||
| 4 | // Get Qt defines/settings | ||
| 5 | |||
| 6 | #include "qglobal.h" | ||
| 7 | |||
| 8 | // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs | ||
| 9 | |||
| 10 | #include <unistd.h> | ||
| 11 | |||
| 12 | |||
| 13 | // We are hot - unistd.h should have turned on the specific APIs we requested | ||
| 14 | |||
| 15 | |||
| 16 | #ifdef QT_THREAD_SUPPORT | ||
| 17 | #include <pthread.h> | ||
| 18 | #endif | ||
| 19 | |||
| 20 | #include <dirent.h> | ||
| 21 | #include <fcntl.h> | ||
| 22 | #include <grp.h> | ||
| 23 | #include <pwd.h> | ||
| 24 | #include <signal.h> | ||
| 25 | #include <dlfcn.h> | ||
| 26 | |||
| 27 | #include <sys/types.h> | ||
| 28 | #include <sys/ioctl.h> | ||
| 29 | #include <sys/ipc.h> | ||
| 30 | #include <sys/time.h> | ||
| 31 | #include <sys/shm.h> | ||
| 32 | #include <sys/socket.h> | ||
| 33 | #include <sys/stat.h> | ||
| 34 | #include <sys/wait.h> | ||
| 35 | |||
| 36 | // DNS header files are not fully covered by X/Open specifications. | ||
| 37 | // In particular nothing is said about res_* :/ | ||
| 38 | // Header files <netinet/in.h> and <arpa/nameser.h> are not included | ||
| 39 | // by <resolv.h> on older versions of the GNU C library. Note that | ||
| 40 | // <arpa/nameser.h> must be included before <resolv.h>. | ||
| 41 | #include <arpa/inet.h> | ||
| 42 | #include <netinet/in.h> | ||
| 43 | #include <arpa/nameser.h> | ||
| 44 | #include <resolv.h> | ||
| 45 | |||
| 46 | |||
| 47 | #if !defined(QT_NO_COMPAT) | ||
| 48 | #define QT_STATBUF struct stat | ||
| 49 | #define QT_STATBUF4TSTATstruct stat | ||
| 50 | #define QT_STAT ::stat | ||
| 51 | #define QT_FSTAT ::fstat | ||
| 52 | #define QT_STAT_REG S_IFREG | ||
| 53 | #define QT_STAT_DIR S_IFDIR | ||
| 54 | #define QT_STAT_MASK S_IFMT | ||
| 55 | #define QT_STAT_LNK S_IFLNK | ||
| 56 | #define QT_FILENO fileno | ||
| 57 | #define QT_OPEN ::open | ||
| 58 | #define QT_CLOSE ::close | ||
| 59 | #define QT_LSEEK ::lseek | ||
| 60 | #define QT_READ ::read | ||
| 61 | #define QT_WRITE ::write | ||
| 62 | #define QT_ACCESS ::access | ||
| 63 | #define QT_GETCWD ::getcwd | ||
| 64 | #define QT_CHDIR ::chdir | ||
| 65 | #define QT_MKDIR ::mkdir | ||
| 66 | #define QT_RMDIR ::rmdir | ||
| 67 | #define QT_OPEN_RDONLY O_RDONLY | ||
| 68 | #define QT_OPEN_WRONLY O_WRONLY | ||
| 69 | #define QT_OPEN_RDWR O_RDWR | ||
| 70 | #define QT_OPEN_CREAT O_CREAT | ||
| 71 | #define QT_OPEN_TRUNC O_TRUNC | ||
| 72 | #define QT_OPEN_APPEND O_APPEND | ||
| 73 | #endif | ||
| 74 | |||
| 75 | #define QT_SIGNAL_RETTYPEvoid | ||
| 76 | #define QT_SIGNAL_ARGS int | ||
| 77 | #define QT_SIGNAL_IGNORESIG_IGN | ||
| 78 | |||
| 79 | #if defined(__GLIBC__) && (__GLIBC__ >= 2) | ||
| 80 | #define QT_SOCKLEN_T socklen_t | ||
| 81 | #else | ||
| 82 | #define QT_SOCKLEN_T int | ||
| 83 | #endif | ||
| 84 | |||
| 85 | #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) | ||
| 86 | #define QT_SNPRINTF ::snprintf | ||
| 87 | #define QT_VSNPRINTF ::vsnprintf | ||
| 88 | #endif | ||
| 89 | |||
| 90 | |||
| 91 | #endif // QPLATFORMDEFS_H | ||
diff --git a/mkspecs/macx-g++/Info.plist.app b/mkspecs/macx-g++/Info.plist.app index 9d6c42a..4da07e9 100644 --- a/mkspecs/macx-g++/Info.plist.app +++ b/mkspecs/macx-g++/Info.plist.app | |||
| @@ -1,16 +1,18 @@ | |||
| 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
| 2 | <!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd"> | 2 | <!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd"> |
| 3 | <plist version="0.9"> | 3 | <plist version="0.9"> |
| 4 | <dict> | 4 | <dict> |
| 5 | <key>CFBundleIconFile</key> | 5 | <key>CFBundleIconFile</key> |
| 6 | <string>application.icns</string> | 6 | <string>@ICON@</string> |
| 7 | <key>CFBundlePackageType</key> | 7 | <key>CFBundlePackageType</key> |
| 8 | <string>APPL</string> | 8 | <string>APPL</string> |
| 9 | <key>CFBundleGetInfoString</key> | 9 | <key>CFBundleGetInfoString</key> |
| 10 | <string>Created by Qt/QMake</string> | 10 | <string>Created by Qt/QMake</string> |
| 11 | <key>CFBundleSignature</key> | 11 | <key>CFBundleSignature</key> |
| 12 | <string>ttxt</string> | 12 | <string>ttxt</string> |
| 13 | <key>CFBundleExecutable</key> | ||
| 14 | <string>@EXECUTABLE@</string> | ||
| 13 | <key>NOTE</key> | 15 | <key>NOTE</key> |
| 14 | <string>Please, do NOT change this file -- It was generated by Qt/QMake.</string> | 16 | <string>Please, do NOT change this file -- It was generated by Qt/QMake.</string> |
| 15 | </dict> | 17 | </dict> |
| 16 | </plist> | 18 | </plist> |
diff --git a/mkspecs/macx-g++/qmake.conf b/mkspecs/macx-g++/qmake.conf index dc8da5c..67bc525 100644 --- a/mkspecs/macx-g++/qmake.conf +++ b/mkspecs/macx-g++/qmake.conf | |||
| @@ -1,80 +1,90 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for macx-g++ (Mac OS X + command-line compiler) | 4 | # qmake configuration for macx-g++ (Mac OS X + command-line compiler) |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release resource_fork incremental global_init_link_order lib_version_first plugin_no_soname | 9 | CONFIG += qt warn_on release resource_fork incremental global_init_link_order lib_version_first plugin_no_soname link_prl |
| 10 | QMAKE_INCREMENTAL_STYLE = sublibs | 10 | QMAKE_INCREMENTAL_STYLE = sublibs |
| 11 | 11 | ||
| 12 | QMAKE_CC = $(TB)cc | 12 | QMAKE_CC = cc |
| 13 | QMAKE_LEX = flex | 13 | QMAKE_LEX = flex |
| 14 | QMAKE_LEXFLAGS = | 14 | QMAKE_LEXFLAGS = |
| 15 | QMAKE_YACC = yacc | 15 | QMAKE_YACC = yacc |
| 16 | QMAKE_YACCFLAGS = -d | 16 | QMAKE_YACCFLAGS = -d |
| 17 | QMAKE_YACCFLAGS_MANGLE = -p $base -b $base | ||
| 18 | QMAKE_YACC_HEADER = $base.tab.h | ||
| 19 | QMAKE_YACC_SOURCE = $base.tab.c | ||
| 17 | QMAKE_RESOURCE = /Developer/Tools/Rez | 20 | QMAKE_RESOURCE = /Developer/Tools/Rez |
| 18 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 21 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 19 | QMAKE_CFLAGS_DEPS= -M | 22 | QMAKE_CFLAGS_DEPS= -M |
| 20 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 23 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 21 | QMAKE_CFLAGS_WARN_OFF= -w | 24 | QMAKE_CFLAGS_WARN_OFF= -w |
| 22 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 25 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -Os) |
| 23 | QMAKE_CFLAGS_DEBUG= -g | 26 | QMAKE_CFLAGS_DEBUG= -g |
| 24 | QMAKE_CFLAGS_SHLIB= -fPIC | 27 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 25 | QMAKE_EXTENSION_SHLIB= dylib | 28 | QMAKE_EXTENSION_SHLIB= dylib |
| 26 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 29 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 27 | 30 | ||
| 28 | QMAKE_CXX = $(TB)c++ | 31 | QMAKE_CXX = c++ |
| 29 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 32 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 30 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 33 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 31 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 34 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 32 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 35 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 33 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 36 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 34 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 37 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 35 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 38 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 36 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 39 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 37 | 40 | ||
| 38 | QMAKE_INCDIR = /usr/local/include | ||
| 39 | QMAKE_LIBDIR = | 41 | QMAKE_LIBDIR = |
| 40 | QMAKE_INCDIR_QT = $(QTDIR)/include | 42 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 41 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 42 | QMAKE_INCDIR_OPENGL= /System/Library/Frameworks/OpenGL.framework/Headers \ | 44 | QMAKE_INCDIR_OPENGL= /System/Library/Frameworks/OpenGL.framework/Headers \ |
| 43 | /System/Library/Frameworks/AGL.framework/Headers/ | 45 | /System/Library/Frameworks/AGL.framework/Headers/ |
| 44 | 46 | ||
| 45 | QMAKE_LINK = $$QMAKE_CXX | 47 | QMAKE_LINK = $$QMAKE_CXX |
| 46 | QMAKE_LINK_SHLIB= $$QMAKE_CXX | 48 | QMAKE_LINK_SHLIB= $$QMAKE_CXX |
| 47 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 49 | QMAKE_LFLAGS = -headerpad_max_install_names $(LFLAGS_EXTRA) |
| 48 | #QMAKE_LFLAGS_PREBIND = -prebind -seg1addr 0x90000000 | 50 | #QMAKE_LFLAGS_PREBIND = -seg1addr 0x90000000 |
| 49 | QMAKE_LFLAGS_RELEASE= | 51 | QMAKE_LFLAGS_RELEASE= |
| 50 | QMAKE_LFLAGS_DEBUG= | 52 | QMAKE_LFLAGS_DEBUG= |
| 51 | QMAKE_LFLAGS_SHAPP= -prebind | 53 | QMAKE_LFLAGS_APP= -prebind |
| 52 | QMAKE_LFLAGS_SHLIB= -dynamiclib | 54 | QMAKE_LFLAGS_SHLIB= -prebind -dynamiclib |
| 53 | QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace | 55 | QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace |
| 54 | QMAKE_LFLAGS_PLUGIN= -bundle | 56 | QMAKE_LFLAGS_PLUGIN= -bundle |
| 55 | QMAKE_LFLAGS_SONAME= -install_name$${LITERAL_WHITESPACE}@executable_path/../Frameworks/ | 57 | #You probably don't want to mess with this, instead look at install_name_tool(1) |
| 58 | #QMAKE_LFLAGS_SONAME= -install_name$${LITERAL_WHITESPACE}@executable_path/../Frameworks/ | ||
| 59 | QMAKE_LFLAGS_SONAME= -install_name$${LITERAL_WHITESPACE} | ||
| 56 | QMAKE_LFLAGS_THREAD= | 60 | QMAKE_LFLAGS_THREAD= |
| 61 | |||
| 62 | QMAKE_LFLAGS_VERSION = -current_version$${LITERAL_WHITESPACE} | ||
| 63 | QMAKE_LFLAGS_COMPAT_VERSION = -compatibility_version$${LITERAL_WHITESPACE} | ||
| 64 | |||
| 57 | QMAKE_RPATH = | 65 | QMAKE_RPATH = |
| 58 | 66 | ||
| 59 | QMAKE_LIBS_DYNLOAD= | 67 | QMAKE_LIBS_DYNLOAD= |
| 60 | QMAKE_LIBS_QT = -lqt | 68 | QMAKE_LIBS_QT = -lqt |
| 61 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 69 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 62 | QMAKE_LIBS_OPENGL= -framework OpenGL -framework AGL | 70 | QMAKE_LIBS_OPENGL= -framework OpenGL -framework AGL |
| 63 | QMAKE_LIBS_OPENGL_QT= $$QMAKE_LIBS_OPENGL | 71 | QMAKE_LIBS_OPENGL_QT= $$QMAKE_LIBS_OPENGL |
| 64 | QMAKE_LIBS_THREAD= | 72 | QMAKE_LIBS_THREAD= |
| 65 | 73 | ||
| 66 | QMAKE_MOC = $(QTDIR)/bin/moc | 74 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 67 | QMAKE_UIC = $(QTDIR)/bin/uic | 75 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 68 | 76 | ||
| 69 | QMAKE_AR = ar cq | 77 | QMAKE_AR = ar cq |
| 70 | QMAKE_RANLIB = ranlib -s | 78 | QMAKE_RANLIB = ranlib -s |
| 71 | 79 | ||
| 72 | QMAKE_TAR = tar -cf | 80 | QMAKE_TAR = tar -cf |
| 73 | QMAKE_GZIP = gzip -9f | 81 | QMAKE_GZIP = gzip -9f |
| 74 | 82 | ||
| 75 | QMAKE_COPY = cp -f | 83 | QMAKE_COPY = cp -f |
| 76 | QMAKE_COPY_FILE = $$QMAKE_COPY | 84 | QMAKE_COPY_FILE = $$QMAKE_COPY |
| 77 | QMAKE_COPY_DIR = $$QMAKE_COPY -r | 85 | QMAKE_COPY_DIR = $$QMAKE_COPY -r |
| 78 | QMAKE_MOVE = mv -f | 86 | QMAKE_MOVE = mv -f |
| 79 | QMAKE_DEL_FILE = rm -f | 87 | QMAKE_DEL_FILE = rm -f |
| 80 | QMAKE_DEL_DIR = rmdir | 88 | QMAKE_DEL_DIR = rmdir |
| 89 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 90 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/macx-mwerks/qmake.conf b/mkspecs/macx-mwerks/qmake.conf index 15f4325..ad9b47d 100644 --- a/mkspecs/macx-mwerks/qmake.conf +++ b/mkspecs/macx-mwerks/qmake.conf | |||
| @@ -1,24 +1,24 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for macx-mwerks (Mac OS X + Metrowerks compiler) | 4 | # qmake configuration for macx-mwerks (Mac OS X + Metrowerks compiler) |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= METROWERKS | 7 | MAKEFILE_GENERATOR= METROWERKS |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt release warn_off separate_volume | 9 | CONFIG += qt release warn_off separate_volume link_prl |
| 10 | 10 | ||
| 11 | DEFINES += QT_NO_STL __MACOSX__ __CF_USE_FRAMEWORK_INCLUDES__ | 11 | DEFINES += QT_NO_STL __MACOSX__ __CF_USE_FRAMEWORK_INCLUDES__ |
| 12 | 12 | ||
| 13 | CODEWARRIOR_LINKER= Mach-O PPC Linker | 13 | CODEWARRIOR_LINKER= Mach-O PPC Linker |
| 14 | QMAKE_EXTENSION_SHLIB= dylib | 14 | QMAKE_EXTENSION_SHLIB= dylib |
| 15 | QMAKE_VOLUMENAME= OS X Volume | 15 | QMAKE_VOLUMENAME= OS X Volume |
| 16 | FRAMEWORKPATH = {System}/Library/Frameworks/ | 16 | FRAMEWORKPATH = {System}/Library/Frameworks/ |
| 17 | QMAKE_CRT_OBJECTS= crt1.o | 17 | QMAKE_CRT_OBJECTS= crt1.o |
| 18 | QMAKE_INCDIR_QT = $(QTDIR)/include | 18 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 19 | QMAKE_LIBS = $(LIBS_EXTRA) | 19 | QMAKE_LIBS = -framework System $(LIBS_EXTRA) |
| 20 | QMAKE_LIBS_QT = -L$(QTDIR)/lib/ -lqt | 20 | QMAKE_LIBS_QT = -L$(QTDIR)/lib/ -lqt |
| 21 | QMAKE_INCDIR_OPENGL= /System/Library/Frameworks/OpenGL.framework/Headers \ | 21 | QMAKE_INCDIR_OPENGL= /System/Library/Frameworks/OpenGL.framework/Headers \ |
| 22 | /System/Library/Frameworks/AGL.framework/Headers/ | 22 | /System/Library/Frameworks/AGL.framework/Headers/ |
| 23 | QMAKE_LIBS_OPENGL= -framework OpenGL -framework AGL | 23 | QMAKE_LIBS_OPENGL= -framework OpenGL -framework AGL |
| 24 | QMAKE_LIBS_OPENGL_QT= $$QMAKE_LIBS_OPENGL | 24 | QMAKE_LIBS_OPENGL_QT= $$QMAKE_LIBS_OPENGL |
diff --git a/mkspecs/macx-pbuilder/Info.plist.app b/mkspecs/macx-pbuilder/Info.plist.app index 9d6c42a..4da07e9 100755 --- a/mkspecs/macx-pbuilder/Info.plist.app +++ b/mkspecs/macx-pbuilder/Info.plist.app | |||
| @@ -1,16 +1,18 @@ | |||
| 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
| 2 | <!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd"> | 2 | <!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd"> |
| 3 | <plist version="0.9"> | 3 | <plist version="0.9"> |
| 4 | <dict> | 4 | <dict> |
| 5 | <key>CFBundleIconFile</key> | 5 | <key>CFBundleIconFile</key> |
| 6 | <string>application.icns</string> | 6 | <string>@ICON@</string> |
| 7 | <key>CFBundlePackageType</key> | 7 | <key>CFBundlePackageType</key> |
| 8 | <string>APPL</string> | 8 | <string>APPL</string> |
| 9 | <key>CFBundleGetInfoString</key> | 9 | <key>CFBundleGetInfoString</key> |
| 10 | <string>Created by Qt/QMake</string> | 10 | <string>Created by Qt/QMake</string> |
| 11 | <key>CFBundleSignature</key> | 11 | <key>CFBundleSignature</key> |
| 12 | <string>ttxt</string> | 12 | <string>ttxt</string> |
| 13 | <key>CFBundleExecutable</key> | ||
| 14 | <string>@EXECUTABLE@</string> | ||
| 13 | <key>NOTE</key> | 15 | <key>NOTE</key> |
| 14 | <string>Please, do NOT change this file -- It was generated by Qt/QMake.</string> | 16 | <string>Please, do NOT change this file -- It was generated by Qt/QMake.</string> |
| 15 | </dict> | 17 | </dict> |
| 16 | </plist> | 18 | </plist> |
diff --git a/mkspecs/macx-pbuilder/qmake.conf b/mkspecs/macx-pbuilder/qmake.conf index 6d765a8..da820ac 100755 --- a/mkspecs/macx-pbuilder/qmake.conf +++ b/mkspecs/macx-pbuilder/qmake.conf | |||
| @@ -1,79 +1,81 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for macx-pbuilder (Mac OS X + Project Builder) | 4 | # qmake configuration for macx-pbuilder (Mac OS X + Project Builder) |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= PROJECTBUILDER | 7 | MAKEFILE_GENERATOR= PROJECTBUILDER |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release lib_version_first incremental resource_fork plugin_no_soname | 9 | CONFIG += qt warn_on release lib_version_first incremental plugin_no_soname link_prl |
| 10 | 10 | ||
| 11 | QMAKE_CC = cc | 11 | QMAKE_CC = |
| 12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_RESOURCE = /Developer/Tools/Rez | 16 | QMAKE_RESOURCE = /Developer/Tools/Rez |
| 17 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 17 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 18 | QMAKE_CFLAGS_DEPS= -M | 18 | QMAKE_CFLAGS_DEPS= -M |
| 19 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 19 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 20 | QMAKE_CFLAGS_WARN_OFF= | 20 | QMAKE_CFLAGS_WARN_OFF= |
| 21 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O3) | 21 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -Os) |
| 22 | QMAKE_CFLAGS_DEBUG= -g | 22 | QMAKE_CFLAGS_DEBUG= -g |
| 23 | QMAKE_CFLAGS_SHLIB= -fPIC | 23 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 24 | QMAKE_EXTENSION_SHLIB= dylib | 24 | QMAKE_EXTENSION_SHLIB= dylib |
| 25 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 25 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 26 | 26 | ||
| 27 | QMAKE_CXX = c++ | 27 | QMAKE_CXX = |
| 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 29 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 29 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 32 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 32 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 33 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 33 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 34 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 34 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 35 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 35 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 36 | 36 | ||
| 37 | QMAKE_INCDIR = /usr/local/include \ | 37 | QMAKE_INCDIR = /usr/local/include \ |
| 38 | /System/Library/Frameworks/CarbonCore.framework/Headers | 38 | /System/Library/Frameworks/CarbonCore.framework/Headers |
| 39 | QMAKE_LIBDIR = | 39 | QMAKE_LIBDIR = |
| 40 | QMAKE_INCDIR_QT = $(QTDIR)/include | 40 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 41 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 41 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 42 | QMAKE_INCDIR_OPENGL= /System/Library/Frameworks/OpenGL.framework/Headers \ | 42 | QMAKE_INCDIR_OPENGL= /System/Library/Frameworks/OpenGL.framework/Headers \ |
| 43 | /System/Library/Frameworks/AGL.framework/Headers/ | 43 | /System/Library/Frameworks/AGL.framework/Headers/ |
| 44 | 44 | ||
| 45 | QMAKE_LINK = c++ | 45 | QMAKE_LINK = c++ |
| 46 | QMAKE_LINK_SHLIB= c++ | 46 | QMAKE_LINK_SHLIB= c++ |
| 47 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 47 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 48 | QMAKE_LFLAGS_RELEASE= | 48 | QMAKE_LFLAGS_RELEASE= |
| 49 | QMAKE_LFLAGS_DEBUG= | 49 | QMAKE_LFLAGS_DEBUG= |
| 50 | QMAKE_LFLAGS_SHAPP= -prebind | 50 | QMAKE_LFLAGS_APP= -prebind |
| 51 | QMAKE_LFLAGS_SHLIB= -dynamiclib | 51 | QMAKE_LFLAGS_SHLIB= -dynamiclib |
| 52 | QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace | 52 | QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace |
| 53 | QMAKE_LFLAGS_PLUGIN= -bundle | 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 54 | QMAKE_LFLAGS_SONAME= -install_name$${LITERAL_WHITESPACE}@executable_path/../Frameworks/ | 54 | #QMAKE_LFLAGS_SONAME= -install_name$${LITERAL_WHITESPACE}@executable_path/../Frameworks/ |
| 55 | QMAKE_LFLAGS_THREAD= | 55 | QMAKE_LFLAGS_THREAD= |
| 56 | QMAKE_RPATH = | 56 | QMAKE_RPATH = |
| 57 | 57 | ||
| 58 | QMAKE_LIBS_DYNLOAD= | 58 | QMAKE_LIBS_DYNLOAD= |
| 59 | QMAKE_LIBS_QT = -lqt | 59 | QMAKE_LIBS_QT = -lqt |
| 60 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 60 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 61 | QMAKE_LIBS_THREAD= | 61 | QMAKE_LIBS_THREAD= |
| 62 | QMAKE_LIBS_OPENGL= -framework OpenGL -framework AGL | 62 | QMAKE_LIBS_OPENGL= -framework OpenGL -framework AGL |
| 63 | QMAKE_LIBS_OPENGL_QT= $$QMAKE_LIBS_OPENGL | 63 | QMAKE_LIBS_OPENGL_QT= $$QMAKE_LIBS_OPENGL |
| 64 | 64 | ||
| 65 | QMAKE_MOC = $(QTDIR)/bin/moc | 65 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 66 | QMAKE_UIC = $(QTDIR)/bin/uic | 66 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 67 | 67 | ||
| 68 | QMAKE_AR = ar cq | 68 | QMAKE_AR = ar cq |
| 69 | QMAKE_RANLIB = ranlib -s | 69 | QMAKE_RANLIB = ranlib -s |
| 70 | 70 | ||
| 71 | QMAKE_TAR = tar -cf | 71 | QMAKE_TAR = tar -cf |
| 72 | QMAKE_GZIP = gzip -9f | 72 | QMAKE_GZIP = gzip -9f |
| 73 | 73 | ||
| 74 | QMAKE_COPY = cp -f | 74 | QMAKE_COPY = cp -f |
| 75 | QMAKE_COPY_FILE = $$QMAKE_COPY | 75 | QMAKE_COPY_FILE = $$QMAKE_COPY |
| 76 | QMAKE_COPY_DIR = $$QMAKE_COPY -r | 76 | QMAKE_COPY_DIR = $$QMAKE_COPY -r |
| 77 | QMAKE_MOVE = mv -f | 77 | QMAKE_MOVE = mv -f |
| 78 | QMAKE_DEL_FILE = rm -f | 78 | QMAKE_DEL_FILE = rm -f |
| 79 | QMAKE_DEL_DIR = rmdir | 79 | QMAKE_DEL_DIR = rmdir |
| 80 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 81 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/netbsd-g++/qmake.conf b/mkspecs/netbsd-g++/qmake.conf index 6df9f06..df4e707 100644 --- a/mkspecs/netbsd-g++/qmake.conf +++ b/mkspecs/netbsd-g++/qmake.conf | |||
| @@ -1,80 +1,82 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for netbsd-g++ | 4 | # qmake configuration for netbsd-g++ |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 9 | CONFIG += qt warn_on release link_prl |
| 10 | 10 | ||
| 11 | QMAKE_CC = gcc | 11 | QMAKE_CC = gcc |
| 12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 17 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | 19 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= -fPIC | 22 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 24 | QMAKE_CFLAGS_THREAD= -pthread | 24 | QMAKE_CFLAGS_THREAD= -pthread |
| 25 | 25 | ||
| 26 | QMAKE_CXX = g++ | 26 | QMAKE_CXX = g++ |
| 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 28 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 28 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 36 | 36 | ||
| 37 | QMAKE_INCDIR = /usr/local/include | 37 | QMAKE_INCDIR = /usr/local/include |
| 38 | QMAKE_LIBDIR = /usr/local/lib | 38 | QMAKE_LIBDIR = /usr/local/lib |
| 39 | QMAKE_INCDIR_X11= /usr/X11R6/include | 39 | QMAKE_INCDIR_X11= /usr/X11R6/include |
| 40 | QMAKE_LIBDIR_X11= /usr/X11R6/lib | 40 | QMAKE_LIBDIR_X11= /usr/X11R6/lib |
| 41 | QMAKE_INCDIR_QT = $(QTDIR)/include | 41 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 43 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 43 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 44 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 44 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 45 | 45 | ||
| 46 | QMAKE_LINK = g++ | 46 | QMAKE_LINK = g++ |
| 47 | QMAKE_LINK_SHLIB= g++ | 47 | QMAKE_LINK_SHLIB= g++ |
| 48 | QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS) | 48 | QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS) |
| 49 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 49 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 50 | QMAKE_LFLAGS_RELEASE= | 50 | QMAKE_LFLAGS_RELEASE= |
| 51 | QMAKE_LFLAGS_DEBUG= | 51 | QMAKE_LFLAGS_DEBUG= |
| 52 | QMAKE_LFLAGS_SHLIB= -shared | 52 | QMAKE_LFLAGS_SHLIB= -shared |
| 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 54 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 54 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 55 | QMAKE_LFLAGS_THREAD= -pthread | 55 | QMAKE_LFLAGS_THREAD= -pthread |
| 56 | QMAKE_RPATH = -Wl,-rpath, | 56 | QMAKE_RPATH = -Wl,-rpath, |
| 57 | 57 | ||
| 58 | QMAKE_LIBS = $(LIBS_EXTRA) | 58 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 59 | QMAKE_LIBS_DYNLOAD= | 59 | QMAKE_LIBS_DYNLOAD= |
| 60 | QMAKE_LIBS_X11 = -lXext -lX11 -lm | 60 | QMAKE_LIBS_X11 = -lXext -lX11 -lm |
| 61 | QMAKE_LIBS_X11SM= -lSM -lICE | 61 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 62 | QMAKE_LIBS_QT = -lqt | 62 | QMAKE_LIBS_QT = -lqt |
| 63 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 63 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 64 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 64 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 65 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 65 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 66 | QMAKE_LIBS_THREAD= | 66 | QMAKE_LIBS_THREAD= |
| 67 | 67 | ||
| 68 | QMAKE_MOC = $(QTDIR)/bin/moc | 68 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 69 | QMAKE_UIC = $(QTDIR)/bin/uic | 69 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 70 | 70 | ||
| 71 | QMAKE_AR = ar cqs | 71 | QMAKE_AR = ar cqs |
| 72 | QMAKE_RANLIB = ranlib | 72 | QMAKE_RANLIB = ranlib |
| 73 | 73 | ||
| 74 | QMAKE_TAR = tar -cf | 74 | QMAKE_TAR = tar -cf |
| 75 | QMAKE_GZIP = gzip -9f | 75 | QMAKE_GZIP = gzip -9f |
| 76 | 76 | ||
| 77 | QMAKE_COPY = cp -f | 77 | QMAKE_COPY = cp -f |
| 78 | QMAKE_MOVE = mv -f | 78 | QMAKE_MOVE = mv -f |
| 79 | QMAKE_DEL_FILE = rm -f | 79 | QMAKE_DEL_FILE = rm -f |
| 80 | QMAKE_DEL_DIR = rmdir | 80 | QMAKE_DEL_DIR = rmdir |
| 81 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 82 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/openbsd-g++/qmake.conf b/mkspecs/openbsd-g++/qmake.conf index 8f2dbf4..fdbbf55 100644 --- a/mkspecs/openbsd-g++/qmake.conf +++ b/mkspecs/openbsd-g++/qmake.conf | |||
| @@ -1,81 +1,83 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for openbsd-g++ | 4 | # qmake configuration for openbsd-g++ |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 9 | CONFIG += qt warn_on release link_prl |
| 10 | 10 | ||
| 11 | QMAKE_CC = gcc | 11 | QMAKE_CC = gcc |
| 12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 17 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | 19 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= -fPIC | 22 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 24 | QMAKE_CFLAGS_THREAD= -pthread | 24 | QMAKE_CFLAGS_THREAD= -pthread |
| 25 | 25 | ||
| 26 | QMAKE_CXX = g++ | 26 | QMAKE_CXX = g++ |
| 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 28 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 28 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 36 | 36 | ||
| 37 | QMAKE_INCDIR = /usr/local/include | 37 | QMAKE_INCDIR = /usr/local/include |
| 38 | QMAKE_LIBDIR = /usr/local/lib | 38 | QMAKE_LIBDIR = /usr/local/lib |
| 39 | QMAKE_INCDIR_X11= /usr/X11R6/include | 39 | QMAKE_INCDIR_X11= /usr/X11R6/include |
| 40 | QMAKE_LIBDIR_X11= /usr/X11R6/lib | 40 | QMAKE_LIBDIR_X11= /usr/X11R6/lib |
| 41 | QMAKE_INCDIR_QT = $(QTDIR)/include | 41 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 43 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 43 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 44 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 44 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 45 | 45 | ||
| 46 | QMAKE_LINK = g++ | 46 | QMAKE_LINK = g++ |
| 47 | QMAKE_LINK_SHLIB= g++ | 47 | QMAKE_LINK_SHLIB= g++ |
| 48 | QMAKE_LINK_SHLIB_CMD= $$QMAKE_LINK_SHLIB $(LFLAGS) \ | 48 | QMAKE_LINK_SHLIB_CMD= $$QMAKE_LINK_SHLIB $(LFLAGS) \ |
| 49 | $$QMAKE_CFLAGS_SHLIB $$QMAKE_LFLAGS \ | 49 | $$QMAKE_CFLAGS_SHLIB $$QMAKE_LFLAGS \ |
| 50 | -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS) | 50 | -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS) |
| 51 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 51 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 52 | QMAKE_LFLAGS_RELEASE= | 52 | QMAKE_LFLAGS_RELEASE= |
| 53 | QMAKE_LFLAGS_DEBUG= | 53 | QMAKE_LFLAGS_DEBUG= |
| 54 | QMAKE_LFLAGS_SHLIB= -shared | 54 | QMAKE_LFLAGS_SHLIB= -shared |
| 55 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 55 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 56 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 56 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 57 | QMAKE_LFLAGS_THREAD= -pthread | 57 | QMAKE_LFLAGS_THREAD= -pthread |
| 58 | 58 | ||
| 59 | QMAKE_LIBS = $(LIBS_EXTRA) | 59 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 60 | QMAKE_LIBS_DYNLOAD= | 60 | QMAKE_LIBS_DYNLOAD= |
| 61 | QMAKE_LIBS_X11 = -lXext -lX11 -lm | 61 | QMAKE_LIBS_X11 = -lXext -lX11 -lm |
| 62 | QMAKE_LIBS_X11SM= -lSM -lICE | 62 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 63 | QMAKE_LIBS_QT = -lqt | 63 | QMAKE_LIBS_QT = -lqt |
| 64 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 64 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 65 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 65 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 66 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 66 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 67 | QMAKE_LIBS_THREAD= | 67 | QMAKE_LIBS_THREAD= |
| 68 | 68 | ||
| 69 | QMAKE_MOC = $(QTDIR)/bin/moc | 69 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 70 | QMAKE_UIC = $(QTDIR)/bin/uic | 70 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 71 | 71 | ||
| 72 | QMAKE_AR = ar q | 72 | QMAKE_AR = ar q |
| 73 | QMAKE_RANLIB = ranlib | 73 | QMAKE_RANLIB = ranlib |
| 74 | 74 | ||
| 75 | QMAKE_TAR = tar -cf | 75 | QMAKE_TAR = tar -cf |
| 76 | QMAKE_GZIP = gzip -9f | 76 | QMAKE_GZIP = gzip -9f |
| 77 | 77 | ||
| 78 | QMAKE_COPY = cp -f | 78 | QMAKE_COPY = cp -f |
| 79 | QMAKE_MOVE = mv -f | 79 | QMAKE_MOVE = mv -f |
| 80 | QMAKE_DEL_FILE = rm -f | 80 | QMAKE_DEL_FILE = rm -f |
| 81 | QMAKE_DEL_DIR = rmdir | 81 | QMAKE_DEL_DIR = rmdir |
| 82 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 83 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/pyfix.py b/mkspecs/pyfix.py new file mode 100644 index 0000000..7b86f42 --- a/dev/null +++ b/mkspecs/pyfix.py | |||
| @@ -0,0 +1,82 @@ | |||
| 1 | import os | ||
| 2 | |||
| 3 | # patch the following | ||
| 4 | # QMAKE_CFLAGS add $(CFLAGS_EXTRA) | ||
| 5 | # QMAKE_CXXFLAGS add $(CXXFLAGS_EXTRA) | ||
| 6 | # QMAKE_LFLAGS add $(LFLAGS_EXTRA) | ||
| 7 | # QMAKE_LIBS add $(LIBS_EXTRA) | ||
| 8 | |||
| 9 | # QMAKE_CFLAGS_RELEASE include old argument | ||
| 10 | # | ||
| 11 | |||
| 12 | add_map = { "QMAKE_CFLAGS" : "$(CFLAGS_EXTRA)", | ||
| 13 | "QMAKE_CXXFLAGS" : "$(CXXFLAGS_EXTRA)", | ||
| 14 | "QMAKE_LFLAGS" : "$(LFLAGS_EXTRA)", | ||
| 15 | "QMAKE_LIBS" : "$(LIBS_EXTRA)" } | ||
| 16 | |||
| 17 | rep_map = { "QMAKE_CFLAGS_RELEASE" : ["$(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE),", ")"] } | ||
| 18 | |||
| 19 | |||
| 20 | def split_text(line): | ||
| 21 | """ | ||
| 22 | SPlits the text in the form of "key = value" | ||
| 23 | and returns a two tuple-tuple | ||
| 24 | """ | ||
| 25 | ## disabled strip and split tab stuff | ||
| 26 | left = line.find('=') | ||
| 27 | if left == -1: | ||
| 28 | raise Exception, "No src line" | ||
| 29 | key = line[0:left].strip() | ||
| 30 | val = line[left+1:].strip() | ||
| 31 | return (key,val) | ||
| 32 | |||
| 33 | def apply_line(line): | ||
| 34 | """ | ||
| 35 | Apply changes to a line. This will not handle the exception | ||
| 36 | thrown by split_text | ||
| 37 | """ | ||
| 38 | key,val = split_text(line) | ||
| 39 | |||
| 40 | tabs = '\t' | ||
| 41 | if len(key) <= 14: | ||
| 42 | tabs = tabs + '\t' | ||
| 43 | spac = '' | ||
| 44 | if len(val) != 0: | ||
| 45 | spac = ' ' | ||
| 46 | |||
| 47 | # for minimal changes on the file we've three returns | ||
| 48 | if add_map.has_key(key): | ||
| 49 | val = val + spac + add_map[key] | ||
| 50 | return key + tabs + '= ' + val + '\n' | ||
| 51 | elif rep_map.has_key(key): | ||
| 52 | val = rep_map[key][0] + ' ' + val + rep_map[key][1] | ||
| 53 | return key + tabs + '= ' + val + '\n' | ||
| 54 | return line | ||
| 55 | |||
| 56 | |||
| 57 | |||
| 58 | def apply_on_file(fi): | ||
| 59 | """ | ||
| 60 | Apply the maps on files | ||
| 61 | """ | ||
| 62 | lines = [] | ||
| 63 | for line in file(fi): | ||
| 64 | try: | ||
| 65 | line = apply_line(line) | ||
| 66 | except: | ||
| 67 | pass | ||
| 68 | lines.append(line) | ||
| 69 | |||
| 70 | f = file(fi,'w') | ||
| 71 | for line in lines: | ||
| 72 | f.write(line) | ||
| 73 | |||
| 74 | def fix_it(): | ||
| 75 | for root, dirs, files in os.walk('./mkspecs'): | ||
| 76 | for fil in files: | ||
| 77 | print root + '/' + fil | ||
| 78 | apply_on_file(root+'/'+fil) | ||
| 79 | |||
| 80 | |||
| 81 | if __name__ == '__main__': | ||
| 82 | fix_it() | ||
diff --git a/mkspecs/qnx-g++/qmake.conf b/mkspecs/qnx-g++/qmake.conf index adca607..4b71b75 100644 --- a/mkspecs/qnx-g++/qmake.conf +++ b/mkspecs/qnx-g++/qmake.conf | |||
| @@ -1,81 +1,83 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for qnx-g++ | 4 | # qmake configuration for qnx-g++ |
| 5 | # | 5 | # |
| 6 | # QNX RTOS v6 with X11 | 6 | # Written for QNX RTOS v6 with X11. |
| 7 | # | 7 | # |
| 8 | 8 | ||
| 9 | MAKEFILE_GENERATOR= UNIX | 9 | MAKEFILE_GENERATOR= UNIX |
| 10 | TEMPLATE = app | 10 | TEMPLATE = app |
| 11 | CONFIG += qt warn_on release | 11 | CONFIG += qt warn_on release link_prl |
| 12 | 12 | ||
| 13 | QMAKE_CC = gcc | 13 | QMAKE_CC = gcc |
| 14 | QMAKE_LEX = flex | 14 | QMAKE_LEX = flex |
| 15 | QMAKE_LEXFLAGS = | 15 | QMAKE_LEXFLAGS = |
| 16 | QMAKE_YACC = yacc | 16 | QMAKE_YACC = yacc |
| 17 | QMAKE_YACCFLAGS = -d | 17 | QMAKE_YACCFLAGS = -d |
| 18 | QMAKE_CFLAGS = -pipe -fno-inline -fno-pack-struct $(CFLAGS_EXTRA) | 18 | QMAKE_CFLAGS = -pipe -fno-inline -fno-pack-struct $(CFLAGS_EXTRA) |
| 19 | QMAKE_CFLAGS_DEPS= -M | 19 | QMAKE_CFLAGS_DEPS= -M |
| 20 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 20 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 21 | QMAKE_CFLAGS_WARN_OFF= -w | 21 | QMAKE_CFLAGS_WARN_OFF= -w |
| 22 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) | 22 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) |
| 23 | QMAKE_CFLAGS_DEBUG= -g | 23 | QMAKE_CFLAGS_DEBUG= -g |
| 24 | QMAKE_CFLAGS_SHLIB= -fPIC | 24 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 25 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses -fno-inline -fno-pack-struct | 25 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses -fno-inline -fno-pack-struct |
| 26 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 26 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 27 | 27 | ||
| 28 | QMAKE_CXX = g++ | 28 | QMAKE_CXX = g++ |
| 29 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 29 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 30 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 30 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 31 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 31 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 32 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 32 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 33 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 33 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 34 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 34 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 35 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 35 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 36 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 36 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 37 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 37 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 38 | 38 | ||
| 39 | QMAKE_INCDIR = | 39 | QMAKE_INCDIR = |
| 40 | QMAKE_LIBDIR = | 40 | QMAKE_LIBDIR = |
| 41 | QMAKE_INCDIR_X11= /usr/X11R6/include | 41 | QMAKE_INCDIR_X11= /usr/X11R6/include |
| 42 | QMAKE_LIBDIR_X11= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_X11= /usr/X11R6/lib |
| 43 | QMAKE_INCDIR_QT = $(QTDIR)/include | 43 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 44 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 44 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 45 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 45 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 46 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 46 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 47 | 47 | ||
| 48 | QMAKE_LINK = g++ | 48 | QMAKE_LINK = g++ |
| 49 | QMAKE_LINK_SHLIB= g++ | 49 | QMAKE_LINK_SHLIB= g++ |
| 50 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 50 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 51 | QMAKE_LFLAGS_RELEASE= | 51 | QMAKE_LFLAGS_RELEASE= |
| 52 | QMAKE_LFLAGS_DEBUG= | 52 | QMAKE_LFLAGS_DEBUG= |
| 53 | QMAKE_LFLAGS_SHLIB= -shared | 53 | QMAKE_LFLAGS_SHLIB= -shared |
| 54 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 54 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 55 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 55 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 56 | QMAKE_LFLAGS_THREAD= | 56 | QMAKE_LFLAGS_THREAD= |
| 57 | QMAKE_RPATH = -Wl,-rpath, | 57 | QMAKE_RPATH = -Wl,-rpath, |
| 58 | 58 | ||
| 59 | QMAKE_LIBS = $(LIBS_EXTRA) | 59 | QMAKE_LIBS = -lunix $(LIBS_EXTRA) |
| 60 | QMAKE_LIBS_DYNLOAD= -ldl | 60 | QMAKE_LIBS_DYNLOAD= -ldl |
| 61 | QMAKE_LIBS_X11 = -lXext -lX11 -lm | 61 | QMAKE_LIBS_X11 = -lXext -lX11 -lm |
| 62 | QMAKE_LIBS_X11SM= -lSM -lICE | 62 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 63 | QMAKE_LIBS_QT = -lqt | 63 | QMAKE_LIBS_QT = -lqt |
| 64 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 64 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 65 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 65 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 66 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 66 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 67 | QMAKE_LIBS_THREAD= | 67 | QMAKE_LIBS_THREAD= |
| 68 | 68 | ||
| 69 | QMAKE_MOC = $(QTDIR)/bin/moc | 69 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 70 | QMAKE_UIC = $(QTDIR)/bin/uic | 70 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 71 | 71 | ||
| 72 | QMAKE_AR = ar cqs | 72 | QMAKE_AR = ar cqs |
| 73 | QMAKE_RANLIB = | 73 | QMAKE_RANLIB = |
| 74 | 74 | ||
| 75 | QMAKE_TAR = tar -cf | 75 | QMAKE_TAR = tar -cf |
| 76 | QMAKE_GZIP = gzip -9f | 76 | QMAKE_GZIP = gzip -9f |
| 77 | 77 | ||
| 78 | QMAKE_COPY = cp -f | 78 | QMAKE_COPY = cp -f |
| 79 | QMAKE_MOVE = mv -f | 79 | QMAKE_MOVE = mv -f |
| 80 | QMAKE_DEL_FILE = rm -f | 80 | QMAKE_DEL_FILE = rm -f |
| 81 | QMAKE_DEL_DIR = rmdir | 81 | QMAKE_DEL_DIR = rmdir |
| 82 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 83 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/freebsd-generic-g++/qmake.conf b/mkspecs/qws/freebsd-generic-g++/qmake.conf index 82b22d7..0a9ea90 100644 --- a/mkspecs/qws/freebsd-generic-g++/qmake.conf +++ b/mkspecs/qws/freebsd-generic-g++/qmake.conf | |||
| @@ -1,71 +1,76 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for freebsd-g++ with Qt/Embedded | 4 | # qmake configuration for freebsd-g++ with Qt/Embedded |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
| 10 | 10 | ||
| 11 | QMAKE_CC = gcc | 11 | QMAKE_CC = gcc |
| 12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 17 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | 19 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -fno-default-inline) | 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -fno-default-inline) |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= -fPIC | 22 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 24 | QMAKE_CFLAGS_THREAD= -pthread -D_THREAD_SAFE | 24 | QMAKE_CFLAGS_THREAD= -pthread -D_THREAD_SAFE |
| 25 | 25 | ||
| 26 | QMAKE_CXX = g++ | 26 | QMAKE_CXX = g++ |
| 27 | QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS | 27 | QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS |
| 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_NO_QWS_LINUXFB -DQT_NO_QWS_TRANSFORMED -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) | 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_NO_QWS_LINUXFB -DQT_NO_QWS_TRANSFORMED -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
| 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 36 | 36 | ||
| 37 | # Addon software goes into /usr/local on the BSDs, by default we will look there | 37 | # Addon software goes into /usr/local on the BSDs, by default we will look there |
| 38 | QMAKE_INCDIR = /usr/local/include | 38 | QMAKE_INCDIR = /usr/local/include |
| 39 | QMAKE_LIBDIR = /usr/local/lib | 39 | QMAKE_LIBDIR = /usr/local/lib |
| 40 | QMAKE_INCDIR_QT = $(QTDIR)/include | 40 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 41 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 41 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 42 | QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include | ||
| 43 | QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib | ||
| 42 | 44 | ||
| 43 | QMAKE_LINK = g++ | 45 | QMAKE_LINK = g++ |
| 44 | QMAKE_LINK_SHLIB= g++ | 46 | QMAKE_LINK_SHLIB= g++ |
| 45 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 47 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 46 | QMAKE_LFLAGS_RELEASE= | 48 | QMAKE_LFLAGS_RELEASE= |
| 47 | QMAKE_LFLAGS_DEBUG= | 49 | QMAKE_LFLAGS_DEBUG= |
| 48 | QMAKE_LFLAGS_SHLIB = -shared | 50 | QMAKE_LFLAGS_SHLIB = -shared |
| 49 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB | 51 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |
| 50 | QMAKE_LFLAGS_SONAME = -Wl,-soname, | 52 | QMAKE_LFLAGS_SONAME = -Wl,-soname, |
| 51 | QMAKE_LFLAGS_THREAD = -pthread | 53 | QMAKE_LFLAGS_THREAD = -pthread |
| 52 | QMAKE_RPATH = -Wl,-rpath, | 54 | QMAKE_RPATH = -Wl,-rpath, |
| 53 | 55 | ||
| 54 | QMAKE_LIBS = $(LIBS_EXTRA) | 56 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 55 | QMAKE_LIBS_QT = -lqte | 57 | QMAKE_LIBS_QT = -lqte |
| 56 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 58 | QMAKE_LIBS_QT_THREAD = -lqte-mt |
| 57 | QMAKE_LIBS_THREAD = | 59 | QMAKE_LIBS_THREAD = |
| 60 | QMAKE_LIBS_QTOPIA= -lqtopia -lqpe | ||
| 58 | 61 | ||
| 59 | QMAKE_MOC = $(QTDIR)/bin/moc | 62 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 60 | QMAKE_UIC = $(QTDIR)/bin/uic | 63 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 61 | 64 | ||
| 62 | QMAKE_AR = ar cqs | 65 | QMAKE_AR = ar cqs |
| 63 | QMAKE_RANLIB = | 66 | QMAKE_RANLIB = |
| 64 | 67 | ||
| 65 | QMAKE_TAR = tar -cf | 68 | QMAKE_TAR = tar -cf |
| 66 | QMAKE_GZIP = gzip -9f | 69 | QMAKE_GZIP = gzip -9f |
| 67 | 70 | ||
| 68 | QMAKE_COPY = cp -f | 71 | QMAKE_COPY = cp -f |
| 69 | QMAKE_MOVE = mv -f | 72 | QMAKE_MOVE = mv -f |
| 70 | QMAKE_DEL_FILE = rm -f | 73 | QMAKE_DEL_FILE = rm -f |
| 71 | QMAKE_DEL_DIR = rmdir | 74 | QMAKE_DEL_DIR = rmdir |
| 75 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 76 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h b/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h new file mode 100644 index 0000000..a164a73 --- a/dev/null +++ b/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h | |||
| @@ -0,0 +1,103 @@ | |||
| 1 | #ifndef QPLATFORMDEFS_H | ||
| 2 | #define QPLATFORMDEFS_H | ||
| 3 | |||
| 4 | // Get Qt defines/settings | ||
| 5 | |||
| 6 | #include "qglobal.h" | ||
| 7 | |||
| 8 | // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs | ||
| 9 | |||
| 10 | #include <unistd.h> | ||
| 11 | |||
| 12 | |||
| 13 | // We are hot - unistd.h should have turned on the specific APIs we requested | ||
| 14 | |||
| 15 | |||
| 16 | #ifdef QT_THREAD_SUPPORT | ||
| 17 | #include <pthread.h> | ||
| 18 | #endif | ||
| 19 | |||
| 20 | #include <dirent.h> | ||
| 21 | #include <fcntl.h> | ||
| 22 | #include <grp.h> | ||
| 23 | #include <pwd.h> | ||
| 24 | #include <signal.h> | ||
| 25 | #include <dlfcn.h> | ||
| 26 | |||
| 27 | #include <sys/types.h> | ||
| 28 | #include <sys/ioctl.h> | ||
| 29 | #include <sys/ipc.h> | ||
| 30 | #include <sys/time.h> | ||
| 31 | #include <sys/shm.h> | ||
| 32 | #include <sys/socket.h> | ||
| 33 | #include <sys/stat.h> | ||
| 34 | #include <sys/wait.h> | ||
| 35 | |||
| 36 | // DNS header files are not fully covered by X/Open specifications. | ||
| 37 | // In particular nothing is said about res_* :/ | ||
| 38 | // On BSDs header files <netinet/in.h> and <arpa/nameser.h> are not | ||
| 39 | // included by <resolv.h>. Note that <arpa/nameser.h> must be included | ||
| 40 | // before <resolv.h>. | ||
| 41 | #include <netinet/in.h> | ||
| 42 | #define class c_class // FreeeBSD 3.x | ||
| 43 | #include <arpa/nameser.h> | ||
| 44 | #undef class | ||
| 45 | #include <resolv.h> | ||
| 46 | |||
| 47 | |||
| 48 | #if !defined(QT_NO_COMPAT) | ||
| 49 | #define QT_STATBUF struct stat | ||
| 50 | #define QT_STATBUF4TSTATstruct stat | ||
| 51 | #define QT_STAT ::stat | ||
| 52 | #define QT_FSTAT ::fstat | ||
| 53 | #define QT_STAT_REG S_IFREG | ||
| 54 | #define QT_STAT_DIR S_IFDIR | ||
| 55 | #define QT_STAT_MASK S_IFMT | ||
| 56 | #define QT_STAT_LNK S_IFLNK | ||
| 57 | #define QT_FILENO fileno | ||
| 58 | #define QT_OPEN ::open | ||
| 59 | #define QT_CLOSE ::close | ||
| 60 | #define QT_LSEEK ::lseek | ||
| 61 | #define QT_READ ::read | ||
| 62 | #define QT_WRITE ::write | ||
| 63 | #define QT_ACCESS ::access | ||
| 64 | #define QT_GETCWD ::getcwd | ||
| 65 | #define QT_CHDIR ::chdir | ||
| 66 | #define QT_MKDIR ::mkdir | ||
| 67 | #define QT_RMDIR ::rmdir | ||
| 68 | #define QT_OPEN_RDONLY O_RDONLY | ||
| 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 | #endif | ||
| 75 | |||
| 76 | #define QT_SIGNAL_RETTYPEvoid | ||
| 77 | #define QT_SIGNAL_ARGS int | ||
| 78 | #define QT_SIGNAL_IGNORESIG_IGN | ||
| 79 | |||
| 80 | #if __FreeBSD_version < 400000 | ||
| 81 | // FreeBSD 1.0 - 3.5.1 | ||
| 82 | # define QT_SOCKLEN_T int | ||
| 83 | #else | ||
| 84 | // FreeBSD 4.0 - 5.0 | ||
| 85 | # define QT_SOCKLEN_T socklen_t | ||
| 86 | #endif | ||
| 87 | |||
| 88 | #define QT_SNPRINTF ::snprintf | ||
| 89 | #define QT_VSNPRINTF ::vsnprintf | ||
| 90 | |||
| 91 | // Older FreeBSD versions may still use the a.out format instead of ELF. | ||
| 92 | // From the FreeBSD man pages: | ||
| 93 | // In previous implementations, it was necessary to prepend an | ||
| 94 | // underscore to all external symbols in order to gain symbol | ||
| 95 | // compatibility with object code compiled from the C language. | ||
| 96 | // This is still the case when using the (obsolete) -aout option to | ||
| 97 | // the C language compiler. | ||
| 98 | #ifndef __ELF__ | ||
| 99 | #define QT_AOUT_UNDERSCORE | ||
| 100 | #endif | ||
| 101 | |||
| 102 | |||
| 103 | #endif // QPLATFORMDEFS_H | ||
diff --git a/mkspecs/qws/linux-arm-g++/qmake.conf b/mkspecs/qws/linux-arm-g++/qmake.conf index a5c08ae..244f9a8 100644 --- a/mkspecs/qws/linux-arm-g++/qmake.conf +++ b/mkspecs/qws/linux-arm-g++/qmake.conf | |||
| @@ -1,76 +1,81 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler | 4 | # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
| 10 | 10 | ||
| 11 | QMAKE_CC = arm-linux-gcc | 11 | QMAKE_CC = arm-linux-gcc |
| 12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 18 | QMAKE_CFLAGS_WARN_OFF= | 18 | QMAKE_CFLAGS_WARN_OFF= |
| 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
| 21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 24 | 24 | ||
| 25 | QMAKE_CXX = arm-linux-g++ | 25 | QMAKE_CXX = arm-linux-g++ |
| 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
| 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 34 | 34 | ||
| 35 | QMAKE_INCDIR = | 35 | QMAKE_INCDIR = |
| 36 | QMAKE_LIBDIR = | 36 | QMAKE_LIBDIR = |
| 37 | QMAKE_INCDIR_X11= | 37 | QMAKE_INCDIR_X11= |
| 38 | QMAKE_LIBDIR_X11= | 38 | QMAKE_LIBDIR_X11= |
| 39 | QMAKE_INCDIR_QT = $(QTDIR)/include | 39 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 43 | QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include | ||
| 44 | QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib | ||
| 43 | 45 | ||
| 44 | QMAKE_LINK = arm-linux-gcc | 46 | QMAKE_LINK = arm-linux-g++ |
| 45 | QMAKE_LINK_SHLIB= arm-linux-gcc | 47 | QMAKE_LINK_SHLIB= arm-linux-g++ |
| 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 47 | QMAKE_LFLAGS_RELEASE= | 49 | QMAKE_LFLAGS_RELEASE= |
| 48 | QMAKE_LFLAGS_DEBUG= | 50 | QMAKE_LFLAGS_DEBUG= |
| 49 | QMAKE_LFLAGS_SHLIB = -shared | 51 | QMAKE_LFLAGS_SHLIB = -shared |
| 50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |
| 51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, | 53 | QMAKE_LFLAGS_SONAME = -Wl,-soname, |
| 52 | QMAKE_LFLAGS_THREAD = | 54 | QMAKE_LFLAGS_THREAD = |
| 53 | QMAKE_RPATH = -Wl,-rpath, | 55 | QMAKE_RPATH = -Wl,-rpath, |
| 54 | 56 | ||
| 55 | QMAKE_LIBS = $(LIBS_EXTRA) | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 56 | QMAKE_LIBS_DYNLOAD = -ldl | 58 | QMAKE_LIBS_DYNLOAD = -ldl |
| 57 | QMAKE_LIBS_X11 = | 59 | QMAKE_LIBS_X11 = |
| 58 | QMAKE_LIBS_X11SM= | 60 | QMAKE_LIBS_X11SM= |
| 59 | QMAKE_LIBS_QT = -lqte | 61 | QMAKE_LIBS_QT = -lqte |
| 60 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 62 | QMAKE_LIBS_QT_THREAD = -lqte-mt |
| 61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 63 | QMAKE_LIBS_QT_OPENGL= -lqgl |
| 64 | QMAKE_LIBS_QTOPIA= -lqtopia -lqpe | ||
| 62 | QMAKE_LIBS_THREAD = -lpthread | 65 | QMAKE_LIBS_THREAD = -lpthread |
| 63 | 66 | ||
| 64 | QMAKE_MOC = $(QTDIR)/bin/moc | 67 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 65 | QMAKE_UIC = $(QTDIR)/bin/uic | 68 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 66 | 69 | ||
| 67 | QMAKE_AR = ar cqs | 70 | QMAKE_AR = ar cqs |
| 68 | QMAKE_RANLIB = | 71 | QMAKE_RANLIB = |
| 69 | 72 | ||
| 70 | QMAKE_TAR = tar -cf | 73 | QMAKE_TAR = tar -cf |
| 71 | QMAKE_GZIP = gzip -9f | 74 | QMAKE_GZIP = gzip -9f |
| 72 | 75 | ||
| 73 | QMAKE_COPY = cp -f | 76 | QMAKE_COPY = cp -f |
| 74 | QMAKE_MOVE = mv -f | 77 | QMAKE_MOVE = mv -f |
| 75 | QMAKE_DEL_FILE = rm -f | 78 | QMAKE_DEL_FILE = rm -f |
| 76 | QMAKE_DEL_DIR = rmdir | 79 | QMAKE_DEL_DIR = rmdir |
| 80 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 81 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/linux-generic-g++/qmake.conf b/mkspecs/qws/linux-generic-g++/qmake.conf index 2610b12..4e837d6 100644 --- a/mkspecs/qws/linux-generic-g++/qmake.conf +++ b/mkspecs/qws/linux-generic-g++/qmake.conf | |||
| @@ -1,76 +1,82 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for linux-g++ | 4 | # qmake configuration for linux-g++ |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
| 10 | 10 | ||
| 11 | QMAKE_CC = $(CCACHE) $(DISTCC) gcc | 11 | QMAKE_CC = $(CCACHE) $(DISTCC) gcc |
| 12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 18 | QMAKE_CFLAGS_WARN_OFF= | 18 | QMAKE_CFLAGS_WARN_OFF= |
| 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
| 21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 24 | 24 | ||
| 25 | QMAKE_CXX = $(CCACHE) $(DISTCC) g++ | 25 | QMAKE_CXX = $(CCACHE) $(DISTCC) g++ |
| 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
| 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 34 | 34 | ||
| 35 | QMAKE_INCDIR = | 35 | QMAKE_INCDIR = |
| 36 | QMAKE_LIBDIR = | 36 | QMAKE_LIBDIR = |
| 37 | QMAKE_INCDIR_X11= | 37 | QMAKE_INCDIR_X11= |
| 38 | QMAKE_LIBDIR_X11= | 38 | QMAKE_LIBDIR_X11= |
| 39 | QMAKE_INCDIR_QT = $(QTDIR)/include | 39 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 43 | QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include/ | ||
| 44 | QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib | ||
| 43 | 45 | ||
| 44 | QMAKE_LINK = g++ | 46 | QMAKE_LINK = g++ |
| 45 | QMAKE_LINK_SHLIB= g++ | 47 | QMAKE_LINK_SHLIB= g++ |
| 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 47 | QMAKE_LFLAGS_RELEASE= | 49 | QMAKE_LFLAGS_RELEASE= |
| 48 | QMAKE_LFLAGS_DEBUG= | 50 | QMAKE_LFLAGS_DEBUG= |
| 49 | QMAKE_LFLAGS_SHLIB = -shared | 51 | QMAKE_LFLAGS_SHLIB = -shared |
| 50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |
| 51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, | 53 | QMAKE_LFLAGS_SONAME = -Wl,-soname, |
| 52 | QMAKE_LFLAGS_THREAD = | 54 | QMAKE_LFLAGS_THREAD = |
| 53 | QMAKE_RPATH = -Wl,-rpath, | 55 | QMAKE_RPATH = -Wl,-rpath, |
| 54 | 56 | ||
| 55 | QMAKE_LIBS = $(LIBS_EXTRA) | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 56 | QMAKE_LIBS_DYNLOAD = -ldl | 58 | QMAKE_LIBS_DYNLOAD = -ldl |
| 57 | QMAKE_LIBS_X11 = | 59 | QMAKE_LIBS_X11 = |
| 58 | QMAKE_LIBS_X11SM= | 60 | QMAKE_LIBS_X11SM= |
| 59 | QMAKE_LIBS_QT = -lqte | 61 | QMAKE_LIBS_QT = -lqte |
| 60 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 62 | QMAKE_LIBS_QT_THREAD = -lqte-mt |
| 61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 63 | QMAKE_LIBS_QT_OPENGL= -lqgl |
| 64 | QMAKE_LIBS_QTOPIA= -lqtopia -lqpe | ||
| 62 | QMAKE_LIBS_THREAD = -lpthread | 65 | QMAKE_LIBS_THREAD = -lpthread |
| 63 | 66 | ||
| 64 | QMAKE_MOC = $(QTDIR)/bin/moc | 67 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 65 | QMAKE_UIC = $(QTDIR)/bin/uic | 68 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 66 | 69 | ||
| 67 | QMAKE_AR = ar cqs | 70 | QMAKE_AR = ar cqs |
| 68 | QMAKE_RANLIB = | 71 | QMAKE_RANLIB = |
| 69 | 72 | ||
| 70 | QMAKE_TAR = tar -cf | 73 | QMAKE_TAR = tar -cf |
| 71 | QMAKE_GZIP = gzip -9f | 74 | QMAKE_GZIP = gzip -9f |
| 72 | 75 | ||
| 73 | QMAKE_COPY = cp -f | 76 | QMAKE_COPY = cp -f |
| 74 | QMAKE_MOVE = mv -f | 77 | QMAKE_MOVE = mv -f |
| 75 | QMAKE_DEL_FILE = rm -f | 78 | QMAKE_DEL_FILE = rm -f |
| 76 | QMAKE_DEL_DIR = rmdir | 79 | QMAKE_DEL_DIR = rmdir |
| 80 | QMAKE_STRIP = strip | ||
| 81 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 82 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/linux-ipaq-g++/qmake.conf b/mkspecs/qws/linux-ipaq-g++/qmake.conf index be91a64..b42f2d6 100644 --- a/mkspecs/qws/linux-ipaq-g++/qmake.conf +++ b/mkspecs/qws/linux-ipaq-g++/qmake.conf | |||
| @@ -1,76 +1,81 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler | 4 | # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
| 10 | 10 | ||
| 11 | QMAKE_CC = arm-linux-gcc | 11 | QMAKE_CC = arm-linux-gcc |
| 12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 18 | QMAKE_CFLAGS_WARN_OFF= | 18 | QMAKE_CFLAGS_WARN_OFF= |
| 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
| 21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 24 | 24 | ||
| 25 | QMAKE_CXX = arm-linux-g++ -DQT_QWS_IPAQ | 25 | QMAKE_CXX = arm-linux-g++ -DQT_QWS_IPAQ |
| 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
| 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 34 | 34 | ||
| 35 | QMAKE_INCDIR = | 35 | QMAKE_INCDIR = |
| 36 | QMAKE_LIBDIR = | 36 | QMAKE_LIBDIR = |
| 37 | QMAKE_INCDIR_X11= | 37 | QMAKE_INCDIR_X11= |
| 38 | QMAKE_LIBDIR_X11= | 38 | QMAKE_LIBDIR_X11= |
| 39 | QMAKE_INCDIR_QT = $(QTDIR)/include | 39 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 43 | QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include | ||
| 44 | QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib | ||
| 43 | 45 | ||
| 44 | QMAKE_LINK = arm-linux-gcc | 46 | QMAKE_LINK = arm-linux-g++ |
| 45 | QMAKE_LINK_SHLIB= arm-linux-gcc | 47 | QMAKE_LINK_SHLIB= arm-linux-g++ |
| 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 47 | QMAKE_LFLAGS_RELEASE= | 49 | QMAKE_LFLAGS_RELEASE= |
| 48 | QMAKE_LFLAGS_DEBUG= | 50 | QMAKE_LFLAGS_DEBUG= |
| 49 | QMAKE_LFLAGS_SHLIB = -shared | 51 | QMAKE_LFLAGS_SHLIB = -shared |
| 50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |
| 51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, | 53 | QMAKE_LFLAGS_SONAME = -Wl,-soname, |
| 52 | QMAKE_LFLAGS_THREAD = | 54 | QMAKE_LFLAGS_THREAD = |
| 53 | QMAKE_RPATH = -Wl,-rpath-link, | 55 | QMAKE_RPATH = -Wl,-rpath, |
| 54 | 56 | ||
| 55 | QMAKE_LIBS = $(LIBS_EXTRA) | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 56 | QMAKE_LIBS_DYNLOAD = -ldl | 58 | QMAKE_LIBS_DYNLOAD = -ldl |
| 57 | QMAKE_LIBS_X11 = | 59 | QMAKE_LIBS_X11 = |
| 58 | QMAKE_LIBS_X11SM= | 60 | QMAKE_LIBS_X11SM= |
| 59 | QMAKE_LIBS_QT = -lqte | 61 | QMAKE_LIBS_QT = -lqte |
| 60 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 62 | QMAKE_LIBS_QT_THREAD = -lqte-mt |
| 61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 63 | QMAKE_LIBS_QT_OPENGL= -lqgl |
| 64 | QMAKE_LIBS_QTOPIA= -lqtopia -lqpe | ||
| 62 | QMAKE_LIBS_THREAD = -lpthread | 65 | QMAKE_LIBS_THREAD = -lpthread |
| 63 | 66 | ||
| 64 | QMAKE_MOC = $(QTDIR)/bin/moc | 67 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 65 | QMAKE_UIC = $(QTDIR)/bin/uic | 68 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 66 | 69 | ||
| 67 | QMAKE_AR = ar cqs | 70 | QMAKE_AR = ar cqs |
| 68 | QMAKE_RANLIB = | 71 | QMAKE_RANLIB = |
| 69 | 72 | ||
| 70 | QMAKE_TAR = tar -cf | 73 | QMAKE_TAR = tar -cf |
| 71 | QMAKE_GZIP = gzip -9f | 74 | QMAKE_GZIP = gzip -9f |
| 72 | 75 | ||
| 73 | QMAKE_COPY = cp -f | 76 | QMAKE_COPY = cp -f |
| 74 | QMAKE_MOVE = mv -f | 77 | QMAKE_MOVE = mv -f |
| 75 | QMAKE_DEL_FILE = rm -f | 78 | QMAKE_DEL_FILE = rm -f |
| 76 | QMAKE_DEL_DIR = rmdir | 79 | QMAKE_DEL_DIR = rmdir |
| 80 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 81 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/linux-mips-g++/qmake.conf b/mkspecs/qws/linux-mips-g++/qmake.conf index f5d2033..f9a410a 100644 --- a/mkspecs/qws/linux-mips-g++/qmake.conf +++ b/mkspecs/qws/linux-mips-g++/qmake.conf | |||
| @@ -1,76 +1,81 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for linux-g++ using the mipsel-linux-g++ crosscompiler | 4 | # qmake configuration for linux-g++ using the mipsel-linux-g++ crosscompiler |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
| 10 | 10 | ||
| 11 | QMAKE_CC = mipsel-linux-gcc | 11 | QMAKE_CC = mipsel-linux-gcc |
| 12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 18 | QMAKE_CFLAGS_WARN_OFF= | 18 | QMAKE_CFLAGS_WARN_OFF= |
| 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
| 21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 24 | 24 | ||
| 25 | QMAKE_CXX = mipsel-linux-g++ | 25 | QMAKE_CXX = mipsel-linux-g++ |
| 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
| 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 34 | 34 | ||
| 35 | QMAKE_INCDIR = | 35 | QMAKE_INCDIR = |
| 36 | QMAKE_LIBDIR = | 36 | QMAKE_LIBDIR = |
| 37 | QMAKE_INCDIR_X11= | 37 | QMAKE_INCDIR_X11= |
| 38 | QMAKE_LIBDIR_X11= | 38 | QMAKE_LIBDIR_X11= |
| 39 | QMAKE_INCDIR_QT = $(QTDIR)/include | 39 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 43 | QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include | ||
| 44 | QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib | ||
| 43 | 45 | ||
| 44 | QMAKE_LINK = mipsel-linux-g++ | 46 | QMAKE_LINK = mipsel-linux-g++ |
| 45 | QMAKE_LINK_SHLIB= mipsel-linux-g++ | 47 | QMAKE_LINK_SHLIB= mipsel-linux-g++ |
| 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 47 | QMAKE_LFLAGS_RELEASE= | 49 | QMAKE_LFLAGS_RELEASE= |
| 48 | QMAKE_LFLAGS_DEBUG= | 50 | QMAKE_LFLAGS_DEBUG= |
| 49 | QMAKE_LFLAGS_SHLIB = -shared | 51 | QMAKE_LFLAGS_SHLIB = -shared |
| 50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |
| 51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, | 53 | QMAKE_LFLAGS_SONAME = -Wl,-soname, |
| 52 | QMAKE_LFLAGS_THREAD = | 54 | QMAKE_LFLAGS_THREAD = |
| 53 | QMAKE_RPATH = -Wl,-rpath, | 55 | QMAKE_RPATH = -Wl,-rpath, |
| 54 | 56 | ||
| 55 | QMAKE_LIBS = $(LIBS_EXTRA) | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 56 | QMAKE_LIBS_DYNLOAD = -ldl | 58 | QMAKE_LIBS_DYNLOAD = -ldl |
| 57 | QMAKE_LIBS_X11 = | 59 | QMAKE_LIBS_X11 = |
| 58 | QMAKE_LIBS_X11SM= | 60 | QMAKE_LIBS_X11SM= |
| 59 | QMAKE_LIBS_QT = -lqte | 61 | QMAKE_LIBS_QT = -lqte |
| 60 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 62 | QMAKE_LIBS_QT_THREAD = -lqte-mt |
| 61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 63 | QMAKE_LIBS_QT_OPENGL= -lqgl |
| 64 | QMAKE_LIBS_QTOPIA= -lqtopia -lqpe | ||
| 62 | QMAKE_LIBS_THREAD = -lpthread | 65 | QMAKE_LIBS_THREAD = -lpthread |
| 63 | 66 | ||
| 64 | QMAKE_MOC = $(QTDIR)/bin/moc | 67 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 65 | QMAKE_UIC = $(QTDIR)/bin/uic | 68 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 66 | 69 | ||
| 67 | QMAKE_AR = ar cqs | 70 | QMAKE_AR = ar cqs |
| 68 | QMAKE_RANLIB = | 71 | QMAKE_RANLIB = |
| 69 | 72 | ||
| 70 | QMAKE_TAR = tar -cf | 73 | QMAKE_TAR = tar -cf |
| 71 | QMAKE_GZIP = gzip -9f | 74 | QMAKE_GZIP = gzip -9f |
| 72 | 75 | ||
| 73 | QMAKE_COPY = cp -f | 76 | QMAKE_COPY = cp -f |
| 74 | QMAKE_MOVE = mv -f | 77 | QMAKE_MOVE = mv -f |
| 75 | QMAKE_DEL_FILE = rm -f | 78 | QMAKE_DEL_FILE = rm -f |
| 76 | QMAKE_DEL_DIR = rmdir | 79 | QMAKE_DEL_DIR = rmdir |
| 80 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 81 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/linux-ramses-g++/qmake.conf b/mkspecs/qws/linux-ramses-g++/qmake.conf index 612c7a4..028c157 100644 --- a/mkspecs/qws/linux-ramses-g++/qmake.conf +++ b/mkspecs/qws/linux-ramses-g++/qmake.conf | |||
| @@ -1,83 +1,86 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler | 4 | # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 9 | CONFIG += qt warn_on release |
| 10 | 10 | ||
| 11 | OZDIR = /usr/src/ramses/oz | 11 | OZDIR = /usr/src/ramses/oz |
| 12 | QTDIR = $$QTDIR/build/qt-2.3.5 | 12 | QTDIR = $$QTDIR/build/qt-2.3.5 |
| 13 | STAGING_DIR = $$OZDIR/output/staging | 13 | STAGING_DIR = $$OZDIR/output/staging |
| 14 | STAGING_BIN = $$STAGING_DIR/build/bin | 14 | STAGING_BIN = $$STAGING_DIR/build/bin |
| 15 | STAGING_LIB = $$STAGING_DIR/target/lib | 15 | STAGING_LIB = $$STAGING_DIR/target/lib |
| 16 | STAGING_INC = $$STAGING_DIR/include | 16 | STAGING_INC = $$STAGING_DIR/include |
| 17 | 17 | ||
| 18 | QMAKE_CC = ccache arm-linux-gcc | 18 | QMAKE_CC = ccache arm-linux-gcc |
| 19 | QMAKE_LEX = flex | 19 | QMAKE_LEX = flex |
| 20 | QMAKE_LEXFLAGS = | 20 | QMAKE_LEXFLAGS = |
| 21 | QMAKE_YACC = yacc | 21 | QMAKE_YACC = yacc |
| 22 | QMAKE_YACCFLAGS = -d | 22 | QMAKE_YACCFLAGS = -d |
| 23 | QMAKE_CFLAGS = -I$$STAGING_INC -pipe $(CFLAGS_EXTRA) | 23 | QMAKE_CFLAGS = -I$$STAGING_INC -pipe $(CFLAGS_EXTRA) |
| 24 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 24 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 25 | QMAKE_CFLAGS_WARN_OFF= | 25 | QMAKE_CFLAGS_WARN_OFF= |
| 26 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 26 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 27 | QMAKE_CFLAGS_DEBUG= -g | 27 | QMAKE_CFLAGS_DEBUG= -g |
| 28 | QMAKE_CFLAGS_SHLIB= -fPIC | 28 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 29 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 29 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 30 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 30 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 31 | 31 | ||
| 32 | QMAKE_CXX = ccache arm-linux-g++ -DQT_QWS_RAMSES -DQT_QWS_DEVFS -DQT_QWS_CUSTOM | 32 | QMAKE_CXX = ccache arm-linux-g++ -DQT_QWS_RAMSES -DQT_QWS_DEVFS -DQT_QWS_CUSTOM |
| 33 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) | 33 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
| 34 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 34 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 35 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 35 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 36 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 36 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 37 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 37 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 38 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 38 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 39 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 39 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 40 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 40 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 41 | 41 | ||
| 42 | QMAKE_INCDIR = | 42 | QMAKE_INCDIR = |
| 43 | QMAKE_LIBDIR = | 43 | QMAKE_LIBDIR = |
| 44 | QMAKE_INCDIR_X11= | 44 | QMAKE_INCDIR_X11= |
| 45 | QMAKE_LIBDIR_X11= | 45 | QMAKE_LIBDIR_X11= |
| 46 | QMAKE_INCDIR_QT = $(QTDIR)/include | 46 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 47 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 47 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 48 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 48 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 49 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 49 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 50 | 50 | ||
| 51 | QMAKE_LINK = arm-linux-gcc | 51 | QMAKE_LINK = arm-linux-gcc |
| 52 | QMAKE_LINK_SHLIB= arm-linux-gcc | 52 | QMAKE_LINK_SHLIB= arm-linux-gcc |
| 53 | QMAKE_LFLAGS = -L$$STAGING_LIB -Wl,-rpath,$$STAGING_LIB -Wl,-rpath-link,$$STAGING_LIB -lpng -ljpeg -lz $(LFLAGS_EXTRA) | 53 | QMAKE_LFLAGS = -L$$STAGING_LIB -Wl,-rpath,$$STAGING_LIB -Wl,-rpath-link,$$STAGING_LIB -lpng -ljpeg -lz $(LFLAGS_EXTRA) |
| 54 | QMAKE_LFLAGS_RELEASE= | 54 | QMAKE_LFLAGS_RELEASE= |
| 55 | QMAKE_LFLAGS_DEBUG= | 55 | QMAKE_LFLAGS_DEBUG= |
| 56 | QMAKE_LFLAGS_SHLIB = -shared | 56 | QMAKE_LFLAGS_SHLIB = -shared |
| 57 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB | 57 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |
| 58 | QMAKE_LFLAGS_SONAME = -Wl,-soname, | 58 | QMAKE_LFLAGS_SONAME = -Wl,-soname, |
| 59 | QMAKE_LFLAGS_THREAD = | 59 | QMAKE_LFLAGS_THREAD = |
| 60 | QMAKE_RPATH = -Wl,-rpath, | 60 | QMAKE_RPATH = -Wl,-rpath, |
| 61 | 61 | ||
| 62 | QMAKE_LIBS = $(LIBS_EXTRA) | 62 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 63 | QMAKE_LIBS_DYNLOAD = -ldl | 63 | QMAKE_LIBS_DYNLOAD = -ldl |
| 64 | QMAKE_LIBS_X11 = | 64 | QMAKE_LIBS_X11 = |
| 65 | QMAKE_LIBS_X11SM= | 65 | QMAKE_LIBS_X11SM= |
| 66 | QMAKE_LIBS_QT = -lqte | 66 | QMAKE_LIBS_QT = -lqte |
| 67 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 67 | QMAKE_LIBS_QT_THREAD = -lqte-mt |
| 68 | QMAKE_LIBS_QT_OPENGL= -lqgl | 68 | QMAKE_LIBS_QT_OPENGL= -lqgl |
| 69 | QMAKE_LIBS_THREAD = -lpthread | 69 | QMAKE_LIBS_THREAD = -lpthread |
| 70 | 70 | ||
| 71 | QMAKE_MOC = $(QTDIR)/bin/moc | 71 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 72 | QMAKE_UIC = $(QTDIR)/bin/uic | 72 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 73 | 73 | ||
| 74 | QMAKE_AR = ar cqs | 74 | QMAKE_AR = ar cqs |
| 75 | QMAKE_RANLIB = | 75 | QMAKE_RANLIB = |
| 76 | 76 | ||
| 77 | QMAKE_TAR = tar -cf | 77 | QMAKE_TAR = tar -cf |
| 78 | QMAKE_GZIP = gzip -9f | 78 | QMAKE_GZIP = gzip -9f |
| 79 | 79 | ||
| 80 | QMAKE_COPY = cp -f | 80 | QMAKE_COPY = cp -f |
| 81 | QMAKE_MOVE = mv -f | 81 | QMAKE_MOVE = mv -f |
| 82 | QMAKE_DEL_FILE = rm -f | 82 | QMAKE_DEL_FILE = rm -f |
| 83 | QMAKE_DEL_DIR = rmdir | 83 | QMAKE_DEL_DIR = rmdir |
| 84 | QMAKE_STRIP = strip | ||
| 85 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 86 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/linux-sharp-g++/qmake.conf b/mkspecs/qws/linux-sharp-g++/qmake.conf index e90ea59..27b2e91 100644 --- a/mkspecs/qws/linux-sharp-g++/qmake.conf +++ b/mkspecs/qws/linux-sharp-g++/qmake.conf | |||
| @@ -1,76 +1,81 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler | 4 | # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
| 10 | 10 | ||
| 11 | QMAKE_CC = arm-linux-gcc | 11 | QMAKE_CC = arm-linux-gcc |
| 12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 18 | QMAKE_CFLAGS_WARN_OFF= | 18 | QMAKE_CFLAGS_WARN_OFF= |
| 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
| 21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 24 | 24 | ||
| 25 | QMAKE_CXX = arm-linux-g++ -DQT_QWS_SL5XXX -DQT_QWS_SHARP -DQT_QWS_EBX -DQT_QWS_CUSTOM | 25 | QMAKE_CXX = arm-linux-g++ -DQT_QWS_SL5XX -DQT_QWS_SHARP |
| 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
| 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 34 | 34 | ||
| 35 | QMAKE_INCDIR = | 35 | QMAKE_INCDIR = |
| 36 | QMAKE_LIBDIR = | 36 | QMAKE_LIBDIR = |
| 37 | QMAKE_INCDIR_X11= | 37 | QMAKE_INCDIR_X11= |
| 38 | QMAKE_LIBDIR_X11= | 38 | QMAKE_LIBDIR_X11= |
| 39 | QMAKE_INCDIR_QT = $(QTDIR)/include | 39 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 43 | QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include | ||
| 44 | QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib | ||
| 43 | 45 | ||
| 44 | QMAKE_LINK = arm-linux-gcc | 46 | QMAKE_LINK = arm-linux-g++ |
| 45 | QMAKE_LINK_SHLIB= arm-linux-gcc | 47 | QMAKE_LINK_SHLIB= arm-linux-g++ |
| 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 47 | QMAKE_LFLAGS_RELEASE= | 49 | QMAKE_LFLAGS_RELEASE= |
| 48 | QMAKE_LFLAGS_DEBUG= | 50 | QMAKE_LFLAGS_DEBUG= |
| 49 | QMAKE_LFLAGS_SHLIB = -shared | 51 | QMAKE_LFLAGS_SHLIB = -shared |
| 50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |
| 51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, | 53 | QMAKE_LFLAGS_SONAME = -Wl,-soname, |
| 52 | QMAKE_LFLAGS_THREAD = | 54 | QMAKE_LFLAGS_THREAD = |
| 53 | QMAKE_RPATH = -Wl,-rpath-link, | 55 | QMAKE_RPATH = -Wl,-rpath-link, |
| 54 | 56 | ||
| 55 | QMAKE_LIBS = $(LIBS_EXTRA) | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 56 | QMAKE_LIBS_DYNLOAD = -ldl | 58 | QMAKE_LIBS_DYNLOAD = -ldl |
| 57 | QMAKE_LIBS_X11 = | 59 | QMAKE_LIBS_X11 = |
| 58 | QMAKE_LIBS_X11SM= | 60 | QMAKE_LIBS_X11SM= |
| 59 | QMAKE_LIBS_QT = -lqte | 61 | QMAKE_LIBS_QT = -lqte |
| 60 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 62 | QMAKE_LIBS_QT_THREAD = -lqte-mt |
| 61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 63 | QMAKE_LIBS_QT_OPENGL= -lqgl |
| 64 | QMAKE_LIBS_QTOPIA= -lqtopia -lqpe | ||
| 62 | QMAKE_LIBS_THREAD = -lpthread | 65 | QMAKE_LIBS_THREAD = -lpthread |
| 63 | 66 | ||
| 64 | QMAKE_MOC = $(QTDIR)/bin/moc | 67 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 65 | QMAKE_UIC = $(QTDIR)/bin/uic | 68 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 66 | 69 | ||
| 67 | QMAKE_AR = ar cqs | 70 | QMAKE_AR = ar cqs |
| 68 | QMAKE_RANLIB = | 71 | QMAKE_RANLIB = |
| 69 | 72 | ||
| 70 | QMAKE_TAR = tar -cf | 73 | QMAKE_TAR = tar -cf |
| 71 | QMAKE_GZIP = gzip -9f | 74 | QMAKE_GZIP = gzip -9f |
| 72 | 75 | ||
| 73 | QMAKE_COPY = cp -f | 76 | QMAKE_COPY = cp -f |
| 74 | QMAKE_MOVE = mv -f | 77 | QMAKE_MOVE = mv -f |
| 75 | QMAKE_DEL_FILE = rm -f | 78 | QMAKE_DEL_FILE = rm -f |
| 76 | QMAKE_DEL_DIR = rmdir | 79 | QMAKE_DEL_DIR = rmdir |
| 80 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 81 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/linux-simpad-g++/qmake.conf b/mkspecs/qws/linux-simpad-g++/qmake.conf index 7dce65d..9094ea9 100644 --- a/mkspecs/qws/linux-simpad-g++/qmake.conf +++ b/mkspecs/qws/linux-simpad-g++/qmake.conf | |||
| @@ -1,76 +1,78 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler | 4 | # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 9 | CONFIG += qt warn_on release |
| 10 | 10 | ||
| 11 | QMAKE_CC = $(CCACHE) arm-linux-gcc | 11 | QMAKE_CC = $(CCACHE) arm-linux-gcc |
| 12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 18 | QMAKE_CFLAGS_WARN_OFF= | 18 | QMAKE_CFLAGS_WARN_OFF= |
| 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
| 21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 24 | 24 | ||
| 25 | QMAKE_CXX = $(CCACHE) arm-linux-g++ | 25 | QMAKE_CXX = $(CCACHE) arm-linux-g++ |
| 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_QWS_IPAQ -DQT_QWS_SIMPAD -DQT_QWS_DEVFS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_QWS_IPAQ -DQT_QWS_SIMPAD -DQT_QWS_DEVFS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
| 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 34 | 34 | ||
| 35 | QMAKE_INCDIR = | 35 | QMAKE_INCDIR = |
| 36 | QMAKE_LIBDIR = | 36 | QMAKE_LIBDIR = |
| 37 | QMAKE_INCDIR_X11= | 37 | QMAKE_INCDIR_X11= |
| 38 | QMAKE_LIBDIR_X11= | 38 | QMAKE_LIBDIR_X11= |
| 39 | QMAKE_INCDIR_QT = $(QTDIR)/include | 39 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 43 | 43 | ||
| 44 | QMAKE_LINK = arm-linux-gcc | 44 | QMAKE_LINK = arm-linux-gcc |
| 45 | QMAKE_LINK_SHLIB= arm-linux-gcc | 45 | QMAKE_LINK_SHLIB= arm-linux-gcc |
| 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 47 | QMAKE_LFLAGS_RELEASE= | 47 | QMAKE_LFLAGS_RELEASE= |
| 48 | QMAKE_LFLAGS_DEBUG= | 48 | QMAKE_LFLAGS_DEBUG= |
| 49 | QMAKE_LFLAGS_SHLIB = -shared | 49 | QMAKE_LFLAGS_SHLIB = -shared |
| 50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB | 50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |
| 51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, | 51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, |
| 52 | QMAKE_LFLAGS_THREAD = | 52 | QMAKE_LFLAGS_THREAD = |
| 53 | QMAKE_RPATH = -Wl,-rpath, | 53 | QMAKE_RPATH = -Wl,-rpath, |
| 54 | 54 | ||
| 55 | QMAKE_LIBS = $(LIBS_EXTRA) | 55 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 56 | QMAKE_LIBS_DYNLOAD = -ldl | 56 | QMAKE_LIBS_DYNLOAD = -ldl |
| 57 | QMAKE_LIBS_X11 = | 57 | QMAKE_LIBS_X11 = |
| 58 | QMAKE_LIBS_X11SM= | 58 | QMAKE_LIBS_X11SM= |
| 59 | QMAKE_LIBS_QT = -lqte | 59 | QMAKE_LIBS_QT = -lqte |
| 60 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 60 | QMAKE_LIBS_QT_THREAD = -lqte-mt |
| 61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 61 | QMAKE_LIBS_QT_OPENGL= -lqgl |
| 62 | QMAKE_LIBS_THREAD = -lpthread | 62 | QMAKE_LIBS_THREAD = -lpthread |
| 63 | 63 | ||
| 64 | QMAKE_MOC = $(QTDIR)/bin/moc | 64 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 65 | QMAKE_UIC = $(QTDIR)/bin/uic | 65 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 66 | 66 | ||
| 67 | QMAKE_AR = ar cqs | 67 | QMAKE_AR = ar cqs |
| 68 | QMAKE_RANLIB = | 68 | QMAKE_RANLIB = |
| 69 | 69 | ||
| 70 | QMAKE_TAR = tar -cf | 70 | QMAKE_TAR = tar -cf |
| 71 | QMAKE_GZIP = gzip -9f | 71 | QMAKE_GZIP = gzip -9f |
| 72 | 72 | ||
| 73 | QMAKE_COPY = cp -f | 73 | QMAKE_COPY = cp -f |
| 74 | QMAKE_MOVE = mv -f | 74 | QMAKE_MOVE = mv -f |
| 75 | QMAKE_DEL_FILE = rm -f | 75 | QMAKE_DEL_FILE = rm -f |
| 76 | QMAKE_DEL_DIR = rmdir | 76 | QMAKE_DEL_DIR = rmdir |
| 77 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 78 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/linux-x86-g++/qmake.conf b/mkspecs/qws/linux-x86-g++/qmake.conf index fc5723a..7c31e2c 100644 --- a/mkspecs/qws/linux-x86-g++/qmake.conf +++ b/mkspecs/qws/linux-x86-g++/qmake.conf | |||
| @@ -1,76 +1,81 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for linux-g++ | 4 | # qmake configuration for linux-g++ |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
| 10 | 10 | ||
| 11 | QMAKE_CC = gcc | 11 | QMAKE_CC = gcc |
| 12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 18 | QMAKE_CFLAGS_WARN_OFF= | 18 | QMAKE_CFLAGS_WARN_OFF= |
| 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
| 21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 24 | 24 | ||
| 25 | QMAKE_CXX = g++ | 25 | QMAKE_CXX = g++ |
| 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
| 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 34 | 34 | ||
| 35 | QMAKE_INCDIR = | 35 | QMAKE_INCDIR = |
| 36 | QMAKE_LIBDIR = | 36 | QMAKE_LIBDIR = |
| 37 | QMAKE_INCDIR_X11= | 37 | QMAKE_INCDIR_X11= |
| 38 | QMAKE_LIBDIR_X11= | 38 | QMAKE_LIBDIR_X11= |
| 39 | QMAKE_INCDIR_QT = $(QTDIR)/include | 39 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 43 | QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include | ||
| 44 | QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib | ||
| 43 | 45 | ||
| 44 | QMAKE_LINK = g++ | 46 | QMAKE_LINK = g++ |
| 45 | QMAKE_LINK_SHLIB= g++ | 47 | QMAKE_LINK_SHLIB= g++ |
| 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 47 | QMAKE_LFLAGS_RELEASE= | 49 | QMAKE_LFLAGS_RELEASE= |
| 48 | QMAKE_LFLAGS_DEBUG= | 50 | QMAKE_LFLAGS_DEBUG= |
| 49 | QMAKE_LFLAGS_SHLIB = -shared | 51 | QMAKE_LFLAGS_SHLIB = -shared |
| 50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |
| 51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, | 53 | QMAKE_LFLAGS_SONAME = -Wl,-soname, |
| 52 | QMAKE_LFLAGS_THREAD = | 54 | QMAKE_LFLAGS_THREAD = |
| 53 | QMAKE_RPATH = -Wl,-rpath, | 55 | QMAKE_RPATH = -Wl,-rpath, |
| 54 | 56 | ||
| 55 | QMAKE_LIBS = $(LIBS_EXTRA) | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 56 | QMAKE_LIBS_DYNLOAD = -ldl | 58 | QMAKE_LIBS_DYNLOAD = -ldl |
| 57 | QMAKE_LIBS_X11 = | 59 | QMAKE_LIBS_X11 = |
| 58 | QMAKE_LIBS_X11SM= | 60 | QMAKE_LIBS_X11SM= |
| 59 | QMAKE_LIBS_QT = -lqte | 61 | QMAKE_LIBS_QT = -lqte |
| 60 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 62 | QMAKE_LIBS_QT_THREAD = -lqte-mt |
| 61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 63 | QMAKE_LIBS_QT_OPENGL= -lqgl |
| 64 | QMAKE_LIBS_QTOPIA= -lqtopia -lqpe | ||
| 62 | QMAKE_LIBS_THREAD = -lpthread | 65 | QMAKE_LIBS_THREAD = -lpthread |
| 63 | 66 | ||
| 64 | QMAKE_MOC = $(QTDIR)/bin/moc | 67 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 65 | QMAKE_UIC = $(QTDIR)/bin/uic | 68 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 66 | 69 | ||
| 67 | QMAKE_AR = ar cqs | 70 | QMAKE_AR = ar cqs |
| 68 | QMAKE_RANLIB = | 71 | QMAKE_RANLIB = |
| 69 | 72 | ||
| 70 | QMAKE_TAR = tar -cf | 73 | QMAKE_TAR = tar -cf |
| 71 | QMAKE_GZIP = gzip -9f | 74 | QMAKE_GZIP = gzip -9f |
| 72 | 75 | ||
| 73 | QMAKE_COPY = cp -f | 76 | QMAKE_COPY = cp -f |
| 74 | QMAKE_MOVE = mv -f | 77 | QMAKE_MOVE = mv -f |
| 75 | QMAKE_DEL_FILE = rm -f | 78 | QMAKE_DEL_FILE = rm -f |
| 76 | QMAKE_DEL_DIR = rmdir | 79 | QMAKE_DEL_DIR = rmdir |
| 80 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 81 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/linux-yopy-g++/qmake.conf b/mkspecs/qws/linux-yopy-g++/qmake.conf index 6d97110..3c8c148 100755 --- a/mkspecs/qws/linux-yopy-g++/qmake.conf +++ b/mkspecs/qws/linux-yopy-g++/qmake.conf | |||
| @@ -1,76 +1,78 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler | 4 | # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 9 | CONFIG += qt warn_on release |
| 10 | 10 | ||
| 11 | QMAKE_CC = arm-linux-gcc | 11 | QMAKE_CC = arm-linux-gcc |
| 12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 18 | QMAKE_CFLAGS_WARN_OFF= | 18 | QMAKE_CFLAGS_WARN_OFF= |
| 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
| 21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 24 | 24 | ||
| 25 | QMAKE_CXX = arm-linux-g++ -DQT_QWS_YOPY -I/opt/arm-linux/include/g++-3 | 25 | QMAKE_CXX = arm-linux-g++ -DQT_QWS_YOPY -I/opt/arm-linux/include/g++-3 |
| 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
| 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 34 | 34 | ||
| 35 | QMAKE_INCDIR = | 35 | QMAKE_INCDIR = |
| 36 | QMAKE_LIBDIR = | 36 | QMAKE_LIBDIR = |
| 37 | QMAKE_INCDIR_X11= | 37 | QMAKE_INCDIR_X11= |
| 38 | QMAKE_LIBDIR_X11= | 38 | QMAKE_LIBDIR_X11= |
| 39 | QMAKE_INCDIR_QT = $(QTDIR)/include | 39 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 41 | QMAKE_INCDIR_OPENGL= | 41 | QMAKE_INCDIR_OPENGL= |
| 42 | QMAKE_LIBDIR_OPENGL= | 42 | QMAKE_LIBDIR_OPENGL= |
| 43 | 43 | ||
| 44 | QMAKE_LINK = arm-linux-g++ | 44 | QMAKE_LINK = arm-linux-g++ |
| 45 | QMAKE_LINK_SHLIB= arm-linux-g++ | 45 | QMAKE_LINK_SHLIB= arm-linux-g++ |
| 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 47 | QMAKE_LFLAGS_RELEASE= | 47 | QMAKE_LFLAGS_RELEASE= |
| 48 | QMAKE_LFLAGS_DEBUG= | 48 | QMAKE_LFLAGS_DEBUG= |
| 49 | QMAKE_LFLAGS_SHLIB = -shared | 49 | QMAKE_LFLAGS_SHLIB = -shared |
| 50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB | 50 | QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |
| 51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, | 51 | QMAKE_LFLAGS_SONAME = -Wl,-soname, |
| 52 | QMAKE_LFLAGS_THREAD = | 52 | QMAKE_LFLAGS_THREAD = |
| 53 | QMAKE_RPATH = -Wl,-rpath, | 53 | QMAKE_RPATH = -Wl,-rpath, |
| 54 | 54 | ||
| 55 | QMAKE_LIBS = $(LIBS_EXTRA) | 55 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 56 | QMAKE_LIBS_DYNLOAD = -ldl | 56 | QMAKE_LIBS_DYNLOAD = -ldl |
| 57 | QMAKE_LIBS_X11 = | 57 | QMAKE_LIBS_X11 = |
| 58 | QMAKE_LIBS_X11SM= | 58 | QMAKE_LIBS_X11SM= |
| 59 | QMAKE_LIBS_QT = -lqte | 59 | QMAKE_LIBS_QT = -lqte |
| 60 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 60 | QMAKE_LIBS_QT_THREAD = -lqte-mt |
| 61 | QMAKE_LIBS_QT_OPENGL= | 61 | QMAKE_LIBS_QT_OPENGL= |
| 62 | QMAKE_LIBS_THREAD = -lpthread | 62 | QMAKE_LIBS_THREAD = -lpthread |
| 63 | 63 | ||
| 64 | QMAKE_MOC = $(QTDIR)/bin/moc | 64 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 65 | QMAKE_UIC = $(QTDIR)/bin/uic | 65 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 66 | 66 | ||
| 67 | QMAKE_AR = arm-linux-ar cqs | 67 | QMAKE_AR = arm-linux-ar cqs |
| 68 | QMAKE_RANLIB = | 68 | QMAKE_RANLIB = |
| 69 | 69 | ||
| 70 | QMAKE_TAR = tar -cf | 70 | QMAKE_TAR = tar -cf |
| 71 | QMAKE_GZIP = gzip -9f | 71 | QMAKE_GZIP = gzip -9f |
| 72 | 72 | ||
| 73 | QMAKE_COPY = cp -f | 73 | QMAKE_COPY = cp -f |
| 74 | QMAKE_MOVE = mv -f | 74 | QMAKE_MOVE = mv -f |
| 75 | QMAKE_DEL_FILE = rm -f | 75 | QMAKE_DEL_FILE = rm -f |
| 76 | QMAKE_DEL_DIR = rmdir | 76 | QMAKE_DEL_DIR = rmdir |
| 77 | QMAKE_CHK_DIR_EXISTS = test -d | ||
| 78 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/macx-generic-g++/qmake.conf b/mkspecs/qws/macx-generic-g++/qmake.conf index 7bc67c7..99acca7 100644 --- a/mkspecs/qws/macx-generic-g++/qmake.conf +++ b/mkspecs/qws/macx-generic-g++/qmake.conf | |||
| @@ -1,81 +1,83 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for macx-g++ with Qt/Embedded | 4 | # qmake configuration for macx-g++ with Qt/Embedded |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
| 10 | QMAKE_EXTENSION_SHLIB= dylib | 10 | QMAKE_EXTENSION_SHLIB= dylib |
| 11 | 11 | ||
| 12 | QMAKE_CC = $(TB)cc | 12 | QMAKE_CC = $(TB)cc |
| 13 | QMAKE_LEX = flex | 13 | QMAKE_LEX = flex |
| 14 | QMAKE_LEXFLAGS = | 14 | QMAKE_LEXFLAGS = |
| 15 | QMAKE_YACC = yacc | 15 | QMAKE_YACC = yacc |
| 16 | QMAKE_YACCFLAGS = -d | 16 | QMAKE_YACCFLAGS = -d |
| 17 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 17 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 19 | QMAKE_CFLAGS_WARN_OFF= | 19 | QMAKE_CFLAGS_WARN_OFF= |
| 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -fno-default-inline) | 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -fno-default-inline) |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= -fPIC | 22 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 24 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 24 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 25 | 25 | ||
| 26 | QMAKE_CXX = $(TB)c++ | 26 | QMAKE_CXX = $(TB)c++ |
| 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_NO_QWS_TRANSFORMED -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) -DQ_OS_MACX -DQT_NO_SOUND -DOPIE_NO_OVERRIDE_QT -DOPIE_NO_BACKTRACE | 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_NO_QWS_TRANSFORMED -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
| 28 | DEFINES += QWS | ||
| 28 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 29 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 30 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 31 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 32 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 33 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 34 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 35 | 36 | ||
| 36 | QMAKE_INCDIR = /sw/include | 37 | QMAKE_INCDIR = /sw/include |
| 37 | QMAKE_LIBDIR = /sw/lib | 38 | QMAKE_LIBDIR = /sw/lib |
| 38 | QMAKE_INCDIR_X11= | 39 | QMAKE_INCDIR_X11= |
| 39 | QMAKE_LIBDIR_X11= | 40 | QMAKE_LIBDIR_X11= |
| 40 | QMAKE_INCDIR_QT = $(QTDIR)/include | 41 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 41 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 42 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 43 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 43 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 44 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 45 | QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include | ||
| 46 | QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib | ||
| 44 | 47 | ||
| 45 | QMAKE_LINK = $$QMAKE_CXX | 48 | QMAKE_LINK = $$QMAKE_CXX |
| 46 | QMAKE_LINK_SHLIB= $$QMAKE_CXX | 49 | QMAKE_LINK_SHLIB= $$QMAKE_CXX |
| 47 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 50 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 48 | QMAKE_LFLAGS_RELEASE= | 51 | QMAKE_LFLAGS_RELEASE= |
| 49 | QMAKE_LFLAGS_DEBUG= | 52 | QMAKE_LFLAGS_DEBUG= |
| 50 | QMAKE_LFLAGS_SHLIB= -dynamiclib | 53 | QMAKE_LFLAGS_SHLIB= -dynamiclib |
| 51 | QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace | 54 | QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace |
| 52 | QMAKE_LFLAGS_PLUGIN= -bundle | 55 | QMAKE_LFLAGS_PLUGIN= -bundle |
| 53 | QMAKE_LFLAGS_SONAME= | 56 | QMAKE_LFLAGS_SONAME= |
| 54 | QMAKE_LFLAGS_THREAD= | 57 | QMAKE_LFLAGS_THREAD= |
| 55 | QMAKE_RPATH = | 58 | QMAKE_RPATH = |
| 56 | 59 | ||
| 57 | QMAKE_LIBS = $(LIBS_EXTRA) | 60 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 58 | QMAKE_LIBS_X11 = | 61 | QMAKE_LIBS_X11 = |
| 59 | QMAKE_LIBS_X11SM= | 62 | QMAKE_LIBS_X11SM= |
| 60 | QMAKE_LIBS_QT = -lqte | 63 | QMAKE_LIBS_QT = -lqte |
| 61 | #QMAKE_LIBS_QT = libqte.dylib | ||
| 62 | QMAKE_LIBS_QT_THREAD= -lqte-mt | 64 | QMAKE_LIBS_QT_THREAD= -lqte-mt |
| 63 | QMAKE_LIBS_QT_OPENGL= -lqgl | 65 | QMAKE_LIBS_QT_OPENGL= -lqgl |
| 66 | QMAKE_LIBS_QTOPIA= -lqtopia -lqpe | ||
| 64 | QMAKE_LIBS_THREAD= | 67 | QMAKE_LIBS_THREAD= |
| 65 | 68 | ||
| 66 | QMAKE_MOC = $(QTDIR)/bin/moc | 69 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 67 | QMAKE_UIC = $(QTDIR)/bin/uic | 70 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 68 | 71 | ||
| 69 | QMAKE_AR = ar cqs | 72 | QMAKE_AR = ar cqs |
| 70 | QMAKE_RANLIB = | 73 | QMAKE_RANLIB = |
| 71 | 74 | ||
| 72 | QMAKE_TAR = tar -cf | 75 | QMAKE_TAR = tar -cf |
| 73 | QMAKE_GZIP = gzip -9f | 76 | QMAKE_GZIP = gzip -9f |
| 74 | 77 | ||
| 75 | QMAKE_COPY = cp -f | 78 | QMAKE_COPY = cp -f |
| 76 | QMAKE_MOVE = mv -f | 79 | QMAKE_MOVE = mv -f |
| 77 | QMAKE_DEL_FILE = rm -f | 80 | QMAKE_DEL_FILE = rm -f |
| 78 | QMAKE_DEL_DIR = rmdir | 81 | QMAKE_DEL_DIR = rmdir |
| 79 | 82 | QMAKE_CHK_DIR_EXISTS= test -d | |
| 80 | 83 | QMAKE_MKDIR = mkdir -p | |
| 81 | |||
diff --git a/mkspecs/qws/qnx4-cc/qmake.conf b/mkspecs/qws/qnx4-cc/qmake.conf index 1ca2029..fac6a5b 100644 --- a/mkspecs/qws/qnx4-cc/qmake.conf +++ b/mkspecs/qws/qnx4-cc/qmake.conf | |||
| @@ -1,70 +1,75 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for qnx4-gcc | 4 | # qmake configuration for qnx4-gcc |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release no_mocdepend | 9 | CONFIG += qt no_mocdepend link_prl |
| 10 | 10 | ||
| 11 | QMAKE_CC = cc | 11 | QMAKE_CC = cc |
| 12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = -WC,-sg $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -WC,-sg $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_WARN_ON = -w1 | 17 | QMAKE_CFLAGS_WARN_ON = -w1 |
| 18 | QMAKE_CFLAGS_WARN_OFF = -w0 | 18 | QMAKE_CFLAGS_WARN_OFF = -w0 |
| 19 | QMAKE_CFLAGS_RELEASE = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) | 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) |
| 20 | QMAKE_CFLAGS_DEBUG= -g2d | 20 | QMAKE_CFLAGS_DEBUG= -g2d |
| 21 | QMAKE_CFLAGS_SHLIB= | 21 | QMAKE_CFLAGS_SHLIB= |
| 22 | QMAKE_CFLAGS_YACC= | 22 | QMAKE_CFLAGS_YACC= |
| 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT -WC,-bm | 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT -WC,-bm |
| 24 | 24 | ||
| 25 | QMAKE_CXX = cc | 25 | QMAKE_CXX = cc |
| 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS $(CXXFLAGS_EXTRA) | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS $(CXXFLAGS_EXTRA) |
| 27 | DEFINES += QT_NO_SOUND QT_CLEAN_NAMESPACE QT_NO_QWS_TRANSFORMED QT_NO_QWS_MOUSE_AUTO QT_NO_QWS_MOUSE_MANUAL QT_NO_QWS_LINUXFB | 27 | DEFINES += QT_NO_SOUND QT_CLEAN_NAMESPACE QT_NO_QWS_TRANSFORMED QT_NO_QWS_MOUSE_AUTO QT_NO_QWS_MOUSE_MANUAL QT_NO_QWS_LINUXFB |
| 28 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 28 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 29 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 29 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 30 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 30 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 31 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 31 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 32 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 32 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 33 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 33 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 34 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 34 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 35 | 35 | ||
| 36 | QMAKE_INCDIR = /usr/local/include /usr/include/graphics | 36 | QMAKE_INCDIR = /usr/local/include /usr/include/graphics |
| 37 | QMAKE_LIBDIR = /usr/local/lib $(QTDIR)/lib | 37 | QMAKE_LIBDIR = /usr/local/lib $(QTDIR)/lib |
| 38 | QMAKE_INCDIR_QT = $(QTDIR)/include | 38 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 39 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 39 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 40 | QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include | ||
| 41 | QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib | ||
| 40 | 42 | ||
| 41 | QMAKE_LINK = cc | 43 | QMAKE_LINK = cc |
| 42 | QMAKE_LINK_SHLIB= cc | 44 | QMAKE_LINK_SHLIB= cc |
| 43 | QMAKE_LFLAGS = -lsocket $(LFLAGS_EXTRA) | 45 | QMAKE_LFLAGS = -lsocket $(LFLAGS_EXTRA) |
| 44 | QMAKE_LFLAGS_RELEASE= | 46 | QMAKE_LFLAGS_RELEASE= |
| 45 | QMAKE_LFLAGS_DEBUG= -g2d | 47 | QMAKE_LFLAGS_DEBUG= -g2d |
| 46 | QMAKE_LFLAGS_SHLIB= -d | 48 | QMAKE_LFLAGS_SHLIB= -d |
| 47 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 49 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 48 | QMAKE_LFLAGS_SONAME= | 50 | QMAKE_LFLAGS_SONAME= |
| 49 | QMAKE_LFLAGS_THREAD= | 51 | QMAKE_LFLAGS_THREAD= |
| 50 | QMAKE_RPATH = | 52 | QMAKE_RPATH = |
| 51 | 53 | ||
| 52 | QMAKE_LIBS = $(LIBS_EXTRA) | 54 | QMAKE_LIBS = -lsocket $(LIBS_EXTRA) |
| 53 | QMAKE_LIBS_DYNLOAD= | 55 | QMAKE_LIBS_DYNLOAD= |
| 54 | QMAKE_LIBS_QT = -T 1 -lqte | 56 | QMAKE_LIBS_QT = -T 1 -lqte |
| 55 | QMAKE_LIBS_QT_THREAD= -lqte-mt | 57 | QMAKE_LIBS_QT_THREAD= -lqte-mt |
| 58 | QMAKE_LIBS_QTOPIA= -lqtopia -lqpe | ||
| 56 | QMAKE_LIBS_THREAD= | 59 | QMAKE_LIBS_THREAD= |
| 57 | 60 | ||
| 58 | QMAKE_MOC = $(QTDIR)/util/scripts/qnx4moc.sh $(CXXFLAGS) $(INCPATH) | 61 | QMAKE_MOC = $(QTDIR)/util/scripts/qnx4moc.sh $(CXXFLAGS) $(INCPATH) |
| 59 | QMAKE_UIC = $(QTDIR)/bin/uic | 62 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 60 | 63 | ||
| 61 | QMAKE_AR = wlib -n -c | 64 | QMAKE_AR = wlib -n -c |
| 62 | QMAKE_RANLIB = | 65 | QMAKE_RANLIB = |
| 63 | 66 | ||
| 64 | QMAKE_TAR = tar -cf | 67 | QMAKE_TAR = tar -cf |
| 65 | QMAKE_GZIP = gzip -9f | 68 | QMAKE_GZIP = gzip -9f |
| 66 | 69 | ||
| 67 | QMAKE_COPY = cp -f | 70 | QMAKE_COPY = cp -f |
| 68 | QMAKE_MOVE = mv -f | 71 | QMAKE_MOVE = mv -f |
| 69 | QMAKE_DEL_FILE = rm -f | 72 | QMAKE_DEL_FILE = rm -f |
| 70 | QMAKE_DEL_DIR = rmdir | 73 | QMAKE_DEL_DIR = rmdir |
| 74 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 75 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/qnx6-generic-cc/qmake.conf b/mkspecs/qws/qnx6-generic-cc/qmake.conf index 51eb3fe..55535fd 100644 --- a/mkspecs/qws/qnx6-generic-cc/qmake.conf +++ b/mkspecs/qws/qnx6-generic-cc/qmake.conf | |||
| @@ -1,77 +1,81 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for qnx-rtp-gcc | 4 | # qmake configuration for qnx-rtp-gcc |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
| 10 | 10 | ||
| 11 | QMAKE_CC = cc | 11 | QMAKE_CC = cc |
| 12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = -Bstatic -fPIC -pipe -fno-inline -fno-pack-struct -fhonor-std -fno-builtins -fexceptions -D_STRINGS_H_INCLUDED $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -Bstatic -fPIC -pipe -fno-inline -fno-pack-struct -fhonor-std -fno-builtins -fexceptions -D_STRINGS_H_INCLUDED $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_WARN_ON= -Wall | 17 | QMAKE_CFLAGS_WARN_ON= -Wall |
| 18 | QMAKE_CFLAGS_WARN_OFF= -w | 18 | QMAKE_CFLAGS_WARN_OFF= -w |
| 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) | 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) |
| 20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
| 21 | QMAKE_CFLAGS_SHLIB= | 21 | QMAKE_CFLAGS_SHLIB= |
| 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses -fno-inline -fno-pack-struct | 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses -fno-inline -fno-pack-struct |
| 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 24 | 24 | ||
| 25 | QMAKE_CXX = cc | 25 | QMAKE_CXX = cc |
| 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -DQT_POSIX_QSHM -DQT_NO_SOUND -DQT_CLEAN_NAMESPACE -DQT_NO_QWS_TRANSFORMED -DQT_NO_QWS_MOUSE_AUTO -DQT_NO_QWS_MOUSE_MANUAL -DQT_NO_QWS_VFB -DQT_NO_QWS_LINUXFB -DQT_NO_QWS_MULTIPROCESS $(CXXFLAGS_EXTRA) | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -DQT_POSIX_QSHM -DQT_NO_SOUND -DQT_CLEAN_NAMESPACE -DQT_NO_QWS_TRANSFORMED -DQT_NO_QWS_MOUSE_AUTO -DQT_NO_QWS_MOUSE_MANUAL -DQT_NO_QWS_VFB -DQT_NO_QWS_LINUXFB -DQT_NO_QWS_MULTIPROCESS $(CXXFLAGS_EXTRA) |
| 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 34 | 34 | ||
| 35 | QMAKE_INCDIR = /usr/local/include /usr/include/graphics | 35 | QMAKE_INCDIR = /usr/local/include /usr/include/graphics |
| 36 | QMAKE_LIBDIR = /usr/local/lib $(QTDIR)/lib | 36 | QMAKE_LIBDIR = /usr/local/lib $(QTDIR)/lib |
| 37 | QMAKE_INCDIR_X11= $(CVSDIR)/hardware/devg/public/graphics/ | 37 | QMAKE_INCDIR_X11= $(CVSDIR)/hardware/devg/public/graphics/ |
| 38 | QMAKE_LIBDIR_X11= | 38 | QMAKE_LIBDIR_X11= |
| 39 | QMAKE_INCDIR_QT = $(QTDIR)/include | 39 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 43 | QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include | ||
| 44 | QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib | ||
| 43 | 45 | ||
| 44 | QMAKE_LINK = cc | 46 | QMAKE_LINK = cc |
| 45 | QMAKE_LINK_SHLIB= cc | 47 | QMAKE_LINK_SHLIB= cc |
| 46 | QMAKE_LFLAGS = -lsocket -ldisputil $(LFLAGS_EXTRA) | 48 | QMAKE_LFLAGS = -lsocket -ldisputil $(LFLAGS_EXTRA) |
| 47 | QMAKE_LFLAGS_RELEASE= | 49 | QMAKE_LFLAGS_RELEASE= |
| 48 | QMAKE_LFLAGS_DEBUG= | 50 | QMAKE_LFLAGS_DEBUG= |
| 49 | QMAKE_LFLAGS_SHLIB= -shared | 51 | QMAKE_LFLAGS_SHLIB= -shared |
| 50 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 51 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 53 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 52 | QMAKE_LFLAGS_THREAD= | 54 | QMAKE_LFLAGS_THREAD= |
| 53 | QMAKE_RPATH = -Wl,-rpath, | 55 | QMAKE_RPATH = -Wl,-rpath, |
| 54 | 56 | ||
| 55 | QMAKE_LIBS = $(LIBS_EXTRA) | 57 | QMAKE_LIBS = -lsocket -lcpp $(LIBS_EXTRA) |
| 56 | QMAKE_LIBS_DYNLOAD= | 58 | QMAKE_LIBS_DYNLOAD= |
| 57 | QMAKE_LIBS_X11 = -ldisputil -lm | 59 | QMAKE_LIBS_X11 = -ldisputil -lm |
| 58 | QMAKE_LIBS_X11SM= | 60 | QMAKE_LIBS_X11SM= |
| 59 | QMAKE_LIBS_QT = -lqte | 61 | QMAKE_LIBS_QT = -lqte |
| 60 | QMAKE_LIBS_QT_THREAD= -lqte-mt | 62 | QMAKE_LIBS_QT_THREAD= -lqte-mt |
| 61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 63 | QMAKE_LIBS_QT_OPENGL= -lqgl |
| 64 | QMAKE_LIBS_QTOPIA= -lqtopia -lqpe | ||
| 62 | QMAKE_LIBS_THREAD= -lpthread | 65 | QMAKE_LIBS_THREAD= -lpthread |
| 63 | 66 | ||
| 64 | QMAKE_MOC = $(QTDIR)/bin/moc | 67 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 65 | QMAKE_UIC = $(QTDIR)/bin/uic | 68 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 66 | 69 | ||
| 67 | QMAKE_AR = ar cqs | 70 | QMAKE_AR = ar cqs |
| 68 | QMAKE_RANLIB = | 71 | QMAKE_RANLIB = |
| 69 | 72 | ||
| 70 | QMAKE_TAR = tar -cf | 73 | QMAKE_TAR = tar -cf |
| 71 | QMAKE_GZIP = gzip -9f | 74 | QMAKE_GZIP = gzip -9f |
| 72 | 75 | ||
| 73 | QMAKE_COPY = cp -f | 76 | QMAKE_COPY = cp -f |
| 74 | QMAKE_MOVE = mv -f | 77 | QMAKE_MOVE = mv -f |
| 75 | QMAKE_DEL_FILE = rm -f | 78 | QMAKE_DEL_FILE = rm -f |
| 76 | QMAKE_DEL_DIR = rmdir | 79 | QMAKE_DEL_DIR = rmdir |
| 77 | 80 | QMAKE_CHK_DIR_EXISTS= test -d | |
| 81 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/qnx6-generic-g++/qmake.conf b/mkspecs/qws/qnx6-generic-g++/qmake.conf index 3519a59..93f0dfc 100644 --- a/mkspecs/qws/qnx6-generic-g++/qmake.conf +++ b/mkspecs/qws/qnx6-generic-g++/qmake.conf | |||
| @@ -1,77 +1,81 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for qnx-rtp-gcc | 4 | # qmake configuration for qnx-rtp-gcc |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
| 10 | 10 | ||
| 11 | QMAKE_CC = cc | 11 | QMAKE_CC = cc |
| 12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = -pipe -fno-inline -fno-pack-struct -fhonor-std -fexceptions -D_STRINGS_H_INCLUDED $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -pipe -fno-inline -fno-pack-struct -fhonor-std -fexceptions -D_STRINGS_H_INCLUDED $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_WARN_ON= -Wall | 17 | QMAKE_CFLAGS_WARN_ON= -Wall |
| 18 | QMAKE_CFLAGS_WARN_OFF= -w | 18 | QMAKE_CFLAGS_WARN_OFF= -w |
| 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) | 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) |
| 20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
| 21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses -fno-inline -fno-pack-struct | 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses -fno-inline -fno-pack-struct |
| 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 24 | 24 | ||
| 25 | QMAKE_CXX = cc | 25 | QMAKE_CXX = cc |
| 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -DQT_POSIX_QSHM -DQT_NO_QWS_MULTIPROCESS -DQT_NO_SOUND -DQT_CLEAN_NAMESPACE -DQT_NO_QWS_TRANSFORMED -DQT_NO_QWS_MOUSE_AUTO -DQT_NO_QWS_MOUSE_MANUAL -DQT_NO_PROCESS -DQT_NO_QWS_VFB -DQT_NO_QWS_LINUXFB $(CXXFLAGS_EXTRA) | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -DQT_POSIX_QSHM -DQT_NO_QWS_MULTIPROCESS -DQT_NO_SOUND -DQT_CLEAN_NAMESPACE -DQT_NO_QWS_TRANSFORMED -DQT_NO_QWS_MOUSE_AUTO -DQT_NO_QWS_MOUSE_MANUAL -DQT_NO_PROCESS -DQT_NO_QWS_VFB -DQT_NO_QWS_LINUXFB $(CXXFLAGS_EXTRA) |
| 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 34 | 34 | ||
| 35 | QMAKE_INCDIR = /usr/local/include /usr/include/graphics | 35 | QMAKE_INCDIR = /usr/local/include /usr/include/graphics |
| 36 | QMAKE_LIBDIR = /usr/local/lib $(QTDIR)/lib | 36 | QMAKE_LIBDIR = /usr/local/lib $(QTDIR)/lib |
| 37 | QMAKE_INCDIR_X11= $(CVSDIR)/hardware/devg/public/graphics/ | 37 | QMAKE_INCDIR_X11= $(CVSDIR)/hardware/devg/public/graphics/ |
| 38 | QMAKE_LIBDIR_X11= | 38 | QMAKE_LIBDIR_X11= |
| 39 | QMAKE_INCDIR_QT = $(QTDIR)/include | 39 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 43 | QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include | ||
| 44 | QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib | ||
| 43 | 45 | ||
| 44 | QMAKE_LINK = cc -fhonor-std | 46 | QMAKE_LINK = cc -fhonor-std |
| 45 | QMAKE_LINK_SHLIB= cc -fhonor-std | 47 | QMAKE_LINK_SHLIB= cc -fhonor-std |
| 46 | QMAKE_LFLAGS = -lsocket -ldisputil $(LFLAGS_EXTRA) | 48 | QMAKE_LFLAGS = -lsocket -ldisputil $(LFLAGS_EXTRA) |
| 47 | QMAKE_LFLAGS_RELEASE= | 49 | QMAKE_LFLAGS_RELEASE= |
| 48 | QMAKE_LFLAGS_DEBUG= | 50 | QMAKE_LFLAGS_DEBUG= |
| 49 | QMAKE_LFLAGS_SHLIB= -shared | 51 | QMAKE_LFLAGS_SHLIB= -shared |
| 50 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 51 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 53 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 52 | QMAKE_LFLAGS_THREAD= | 54 | QMAKE_LFLAGS_THREAD= |
| 53 | QMAKE_RPATH = -Wl,-rpath, | 55 | QMAKE_RPATH = -Wl,-rpath, |
| 54 | 56 | ||
| 55 | QMAKE_LIBS = $(LIBS_EXTRA) | 57 | QMAKE_LIBS = -lsocket $(LIBS_EXTRA) |
| 56 | QMAKE_LIBS_DYNLOAD= | 58 | QMAKE_LIBS_DYNLOAD= |
| 57 | QMAKE_LIBS_X11 = -ldisputil -lm | 59 | QMAKE_LIBS_X11 = -ldisputil -lm |
| 58 | QMAKE_LIBS_X11SM= | 60 | QMAKE_LIBS_X11SM= |
| 59 | QMAKE_LIBS_QT = -lqte | 61 | QMAKE_LIBS_QT = -lqte |
| 60 | QMAKE_LIBS_QT_THREAD= -lqte-mt | 62 | QMAKE_LIBS_QT_THREAD= -lqte-mt |
| 61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 63 | QMAKE_LIBS_QT_OPENGL= -lqgl |
| 64 | QMAKE_LIBS_QTOPIA= -lqtopia -lqpe | ||
| 62 | QMAKE_LIBS_THREAD= -lpthread | 65 | QMAKE_LIBS_THREAD= -lpthread |
| 63 | 66 | ||
| 64 | QMAKE_MOC = $(QTDIR)/bin/moc | 67 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 65 | QMAKE_UIC = $(QTDIR)/bin/uic | 68 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 66 | 69 | ||
| 67 | QMAKE_AR = ar cqs | 70 | QMAKE_AR = ar cqs |
| 68 | QMAKE_RANLIB = | 71 | QMAKE_RANLIB = |
| 69 | 72 | ||
| 70 | QMAKE_TAR = tar -cf | 73 | QMAKE_TAR = tar -cf |
| 71 | QMAKE_GZIP = gzip -9f | 74 | QMAKE_GZIP = gzip -9f |
| 72 | 75 | ||
| 73 | QMAKE_COPY = cp -f | 76 | QMAKE_COPY = cp -f |
| 74 | QMAKE_MOVE = mv -f | 77 | QMAKE_MOVE = mv -f |
| 75 | QMAKE_DEL_FILE = rm -f | 78 | QMAKE_DEL_FILE = rm -f |
| 76 | QMAKE_DEL_DIR = rmdir | 79 | QMAKE_DEL_DIR = rmdir |
| 77 | 80 | QMAKE_CHK_DIR_EXISTS= test -d | |
| 81 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/solaris-generic-g++/qmake.conf b/mkspecs/qws/solaris-generic-g++/qmake.conf index 057e343..a521389 100644 --- a/mkspecs/qws/solaris-generic-g++/qmake.conf +++ b/mkspecs/qws/solaris-generic-g++/qmake.conf | |||
| @@ -1,76 +1,81 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for solaris-g++ with Qt/Embedded | 4 | # qmake configuration for solaris-g++ with Qt/Embedded |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 9 | CONFIG += qt link_prl |
| 10 | 10 | ||
| 11 | QMAKE_CC = gcc | 11 | QMAKE_CC = gcc |
| 12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 17 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 18 | QMAKE_CFLAGS_WARN_OFF= | 18 | QMAKE_CFLAGS_WARN_OFF= |
| 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -fno-default-inline) | 19 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -fno-default-inline) |
| 20 | QMAKE_CFLAGS_DEBUG= -g | 20 | QMAKE_CFLAGS_DEBUG= -g |
| 21 | QMAKE_CFLAGS_SHLIB= -fPIC | 21 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 24 | 24 | ||
| 25 | QMAKE_CXX = g++ | 25 | QMAKE_CXX = g++ |
| 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_NO_SOUND -DQT_NO_QWS_LINUXFB -DQT_NO_QWS_TRANSFORMED -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_NO_SOUND -DQT_NO_QWS_LINUXFB -DQT_NO_QWS_TRANSFORMED -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
| 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 31 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 32 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 33 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 34 | 34 | ||
| 35 | QMAKE_INCDIR = | 35 | QMAKE_INCDIR = |
| 36 | QMAKE_LIBDIR = | 36 | QMAKE_LIBDIR = |
| 37 | QMAKE_INCDIR_X11= | 37 | QMAKE_INCDIR_X11= |
| 38 | QMAKE_LIBDIR_X11= | 38 | QMAKE_LIBDIR_X11= |
| 39 | QMAKE_INCDIR_QT = $(QTDIR)/include | 39 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 43 | QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include | ||
| 44 | QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib | ||
| 43 | 45 | ||
| 44 | QMAKE_LINK = g++ | 46 | QMAKE_LINK = g++ |
| 45 | QMAKE_LINK_SHLIB= g++ | 47 | QMAKE_LINK_SHLIB= g++ |
| 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 47 | QMAKE_LFLAGS_RELEASE= | 49 | QMAKE_LFLAGS_RELEASE= |
| 48 | QMAKE_LFLAGS_DEBUG= | 50 | QMAKE_LFLAGS_DEBUG= |
| 49 | QMAKE_LFLAGS_SHLIB= -shared | 51 | QMAKE_LFLAGS_SHLIB= -shared |
| 50 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 51 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 53 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 52 | QMAKE_LFLAGS_THREAD= | 54 | QMAKE_LFLAGS_THREAD= |
| 53 | QMAKE_RPATH = -Wl,-rpath, | 55 | QMAKE_RPATH = -Wl,-rpath, |
| 54 | 56 | ||
| 55 | QMAKE_LIBS = $(LIBS_EXTRA) | 57 | QMAKE_LIBS = -lsocket -lnsl -lresolv $(LIBS_EXTRA) |
| 56 | QMAKE_LIBS_DYNLOAD= -ldl | 58 | QMAKE_LIBS_DYNLOAD= -ldl |
| 57 | QMAKE_LIBS_X11 = | 59 | QMAKE_LIBS_X11 = |
| 58 | QMAKE_LIBS_X11SM= | 60 | QMAKE_LIBS_X11SM= |
| 59 | QMAKE_LIBS_QT = -lqte | 61 | QMAKE_LIBS_QT = -lqte |
| 60 | QMAKE_LIBS_QT_THREAD= -lqte-mt | 62 | QMAKE_LIBS_QT_THREAD= -lqte-mt |
| 61 | QMAKE_LIBS_QT_OPENGL= -lqgl | 63 | QMAKE_LIBS_QT_OPENGL= -lqgl |
| 64 | QMAKE_LIBS_QTOPIA= -lqtopia -lqpe | ||
| 62 | QMAKE_LIBS_THREAD= -lthread -lrt | 65 | QMAKE_LIBS_THREAD= -lthread -lrt |
| 63 | 66 | ||
| 64 | QMAKE_MOC = $(QTDIR)/bin/moc | 67 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 65 | QMAKE_UIC = $(QTDIR)/bin/uic | 68 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 66 | 69 | ||
| 67 | QMAKE_AR = ar cq | 70 | QMAKE_AR = ar cq |
| 68 | QMAKE_RANLIB = | 71 | QMAKE_RANLIB = |
| 69 | 72 | ||
| 70 | QMAKE_TAR = tar -cf | 73 | QMAKE_TAR = tar -cf |
| 71 | QMAKE_GZIP = gzip -9f | 74 | QMAKE_GZIP = gzip -9f |
| 72 | 75 | ||
| 73 | QMAKE_COPY = cp -f | 76 | QMAKE_COPY = cp -f |
| 74 | QMAKE_MOVE = mv -f | 77 | QMAKE_MOVE = mv -f |
| 75 | QMAKE_DEL_FILE = rm -f | 78 | QMAKE_DEL_FILE = rm -f |
| 76 | QMAKE_DEL_DIR = rmdir | 79 | QMAKE_DEL_DIR = rmdir |
| 80 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 81 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/qws/solaris-generic-g++/qplatformdefs.h b/mkspecs/qws/solaris-generic-g++/qplatformdefs.h index a4ca615..02ab5b4 100644 --- a/mkspecs/qws/solaris-generic-g++/qplatformdefs.h +++ b/mkspecs/qws/solaris-generic-g++/qplatformdefs.h | |||
| @@ -1,110 +1,116 @@ | |||
| 1 | #ifndef QPLATFORMDEFS_H | 1 | #ifndef QPLATFORMDEFS_H |
| 2 | #define QPLATFORMDEFS_H | 2 | #define QPLATFORMDEFS_H |
| 3 | 3 | ||
| 4 | // Get Qt defines/settings | 4 | // Get Qt defines/settings |
| 5 | 5 | ||
| 6 | #include "qglobal.h" | 6 | #include "qglobal.h" |
| 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 | #ifndef _POSIX_PTHREAD_SEMANTICS | ||
| 10 | #define _POSIX_PTHREAD_SEMANTICS | ||
| 11 | #endif | ||
| 9 | 12 | ||
| 10 | #include <unistd.h> | 13 | #include <unistd.h> |
| 11 | 14 | ||
| 12 | 15 | ||
| 13 | // We are hot - unistd.h should have turned on the specific APIs we requested | 16 | // We are hot - unistd.h should have turned on the specific APIs we requested |
| 14 | 17 | ||
| 15 | 18 | ||
| 16 | #ifdef QT_THREAD_SUPPORT | 19 | #ifdef QT_THREAD_SUPPORT |
| 17 | #include <pthread.h> | 20 | #include <pthread.h> |
| 18 | #endif | 21 | #endif |
| 19 | 22 | ||
| 20 | #include <dirent.h> | 23 | #include <dirent.h> |
| 21 | #include <fcntl.h> | 24 | #include <fcntl.h> |
| 22 | #include <grp.h> | 25 | #include <grp.h> |
| 23 | #include <pwd.h> | 26 | #include <pwd.h> |
| 24 | #include <signal.h> | 27 | #include <signal.h> |
| 25 | #include <dlfcn.h> | 28 | #include <dlfcn.h> |
| 26 | 29 | ||
| 27 | #include <sys/types.h> | 30 | #include <sys/types.h> |
| 28 | #include <sys/ioctl.h> | 31 | #include <sys/ioctl.h> |
| 29 | #include <sys/filio.h> | 32 | #include <sys/filio.h> |
| 30 | #include <sys/ipc.h> | 33 | #include <sys/ipc.h> |
| 31 | #include <sys/time.h> | 34 | #include <sys/time.h> |
| 32 | #include <sys/shm.h> | 35 | #include <sys/shm.h> |
| 33 | #include <sys/socket.h> | 36 | #include <sys/socket.h> |
| 34 | #include <sys/stat.h> | 37 | #include <sys/stat.h> |
| 35 | #include <sys/wait.h> | 38 | #include <sys/wait.h> |
| 36 | 39 | ||
| 37 | // DNS header files are not fully covered by X/Open specifications. | 40 | // DNS header files are not fully covered by X/Open specifications. |
| 38 | // In particular nothing is said about res_* :/ | 41 | // In particular nothing is said about res_* :/ |
| 39 | // On Solaris header files <netinet/in.h> and <arpa/nameser.h> are not | 42 | // On Solaris header files <netinet/in.h> and <arpa/nameser.h> are not |
| 40 | // included by <resolv.h>. Note that <arpa/nameser.h> must be included | 43 | // included by <resolv.h>. Note that <arpa/nameser.h> must be included |
| 41 | // before <resolv.h>. | 44 | // before <resolv.h>. |
| 42 | #include <netinet/in.h> | 45 | #include <netinet/in.h> |
| 43 | #include <arpa/nameser.h> | 46 | #include <arpa/nameser.h> |
| 44 | #include <resolv.h> | 47 | #include <resolv.h> |
| 45 | 48 | ||
| 46 | 49 | ||
| 47 | #if !defined(QT_NO_COMPAT) | 50 | #if !defined(QT_NO_COMPAT) |
| 48 | #define QT_STATBUF struct stat | 51 | #define QT_STATBUF struct stat |
| 49 | #define QT_STATBUF4TSTATstruct stat | 52 | #define QT_STATBUF4TSTATstruct stat |
| 50 | #define QT_STAT ::stat | 53 | #define QT_STAT ::stat |
| 51 | #define QT_FSTAT ::fstat | 54 | #define QT_FSTAT ::fstat |
| 52 | #define QT_STAT_REG S_IFREG | 55 | #define QT_STAT_REG S_IFREG |
| 53 | #define QT_STAT_DIR S_IFDIR | 56 | #define QT_STAT_DIR S_IFDIR |
| 54 | #define QT_STAT_MASK S_IFMT | 57 | #define QT_STAT_MASK S_IFMT |
| 55 | #define QT_STAT_LNK S_IFLNK | 58 | #define QT_STAT_LNK S_IFLNK |
| 56 | #define QT_FILENO fileno | 59 | #define QT_FILENO fileno |
| 57 | #define QT_OPEN ::open | 60 | #define QT_OPEN ::open |
| 58 | #define QT_CLOSE ::close | 61 | #define QT_CLOSE ::close |
| 59 | #define QT_LSEEK ::lseek | 62 | #define QT_LSEEK ::lseek |
| 60 | #define QT_READ ::read | 63 | #define QT_READ ::read |
| 61 | #define QT_WRITE ::write | 64 | #define QT_WRITE ::write |
| 62 | #define QT_ACCESS ::access | 65 | #define QT_ACCESS ::access |
| 63 | #define QT_GETCWD ::getcwd | 66 | #define QT_GETCWD ::getcwd |
| 64 | #define QT_CHDIR ::chdir | 67 | #define QT_CHDIR ::chdir |
| 65 | #define QT_MKDIR ::mkdir | 68 | #define QT_MKDIR ::mkdir |
| 66 | #define QT_RMDIR ::rmdir | 69 | #define QT_RMDIR ::rmdir |
| 67 | #define QT_OPEN_RDONLY O_RDONLY | 70 | #define QT_OPEN_RDONLY O_RDONLY |
| 68 | #define QT_OPEN_WRONLY O_WRONLY | 71 | #define QT_OPEN_WRONLY O_WRONLY |
| 69 | #define QT_OPEN_RDWR O_RDWR | 72 | #define QT_OPEN_RDWR O_RDWR |
| 70 | #define QT_OPEN_CREAT O_CREAT | 73 | #define QT_OPEN_CREAT O_CREAT |
| 71 | #define QT_OPEN_TRUNC O_TRUNC | 74 | #define QT_OPEN_TRUNC O_TRUNC |
| 72 | #define QT_OPEN_APPEND O_APPEND | 75 | #define QT_OPEN_APPEND O_APPEND |
| 73 | #endif | 76 | #endif |
| 74 | 77 | ||
| 75 | #define QT_SIGNAL_RETTYPEvoid | 78 | #define QT_SIGNAL_RETTYPEvoid |
| 76 | #define QT_SIGNAL_ARGS int | 79 | #define QT_SIGNAL_ARGS int |
| 77 | #define QT_SIGNAL_IGNORESIG_IGN | 80 | #define QT_SIGNAL_IGNORESIG_IGN |
| 78 | 81 | ||
| 79 | #if !defined(_XOPEN_UNIX) | 82 | #if !defined(_XOPEN_UNIX) |
| 80 | // Function usleep() is in C library but not in header files on Solaris 2.5.1. | 83 | // Function usleep() is defined in C library but not declared in header files |
| 81 | // Not really a surprise, usleep() is specified by XPG4v2 and XPG4v2 is only | 84 | // on Solaris 2.5.1. Not really a surprise, usleep() is specified by XPG4v2 |
| 82 | // supported by Solaris 2.6 and better. | 85 | // and XPG4v2 is only supported by Solaris 2.6 and better. |
| 86 | // Function gethostname() is defined in C library but not declared in <unistd.h> | ||
| 87 | // on Solaris 2.5.1. | ||
| 83 | // So we are trying to detect Solaris 2.5.1 using macro _XOPEN_UNIX which is | 88 | // So we are trying to detect Solaris 2.5.1 using macro _XOPEN_UNIX which is |
| 84 | // not defined by <unistd.h> when XPG4v2 is not supported. | 89 | // not defined by <unistd.h> when XPG4v2 is not supported. |
| 85 | typedef unsigned int useconds_t; | 90 | typedef unsigned int useconds_t; |
| 86 | extern "C" int usleep(useconds_t); | 91 | extern "C" int usleep(useconds_t); |
| 92 | extern "C" int gethostname(char *, int); | ||
| 87 | #endif | 93 | #endif |
| 88 | 94 | ||
| 89 | #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500) && (_XOPEN_VERSION-0 >= 500) | 95 | #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500) && (_XOPEN_VERSION-0 >= 500) |
| 90 | // on Solaris 7 and better with specific feature test macros | 96 | // on Solaris 7 and better with specific feature test macros |
| 91 | #define QT_SOCKLEN_T socklen_t | 97 | #define QT_SOCKLEN_T socklen_t |
| 92 | #elif defined(_XOPEN_SOURCE_EXTENDED) && defined(_XOPEN_UNIX) | 98 | #elif defined(_XOPEN_SOURCE_EXTENDED) && defined(_XOPEN_UNIX) |
| 93 | // on Solaris 2.6 and better with specific feature test macros | 99 | // on Solaris 2.6 and better with specific feature test macros |
| 94 | #define QT_SOCKLEN_T size_t | 100 | #define QT_SOCKLEN_T size_t |
| 95 | #else | 101 | #else |
| 96 | // always this case in practice | 102 | // always this case in practice |
| 97 | #define QT_SOCKLEN_T int | 103 | #define QT_SOCKLEN_T int |
| 98 | #endif | 104 | #endif |
| 99 | 105 | ||
| 100 | #if defined(_XOPEN_UNIX) | 106 | #if defined(_XOPEN_UNIX) |
| 101 | // Supported by Solaris 2.6 and better. XPG4v2 and XPG4v2 is also supported | 107 | // Supported by Solaris 2.6 and better. XPG4v2 and XPG4v2 is also supported |
| 102 | // by Solaris 2.6 and better. So we are trying to detect Solaris 2.6 using | 108 | // by Solaris 2.6 and better. So we are trying to detect Solaris 2.6 using |
| 103 | // macro _XOPEN_UNIX which is not defined by <unistd.h> when XPG4v2 is not | 109 | // macro _XOPEN_UNIX which is not defined by <unistd.h> when XPG4v2 is not |
| 104 | // supported. | 110 | // supported. |
| 105 | #define QT_SNPRINTF ::snprintf | 111 | #define QT_SNPRINTF ::snprintf |
| 106 | #define QT_VSNPRINTF ::vsnprintf | 112 | #define QT_VSNPRINTF ::vsnprintf |
| 107 | #endif | 113 | #endif |
| 108 | 114 | ||
| 109 | 115 | ||
| 110 | #endif // QPLATFORMDEFS_H | 116 | #endif // QPLATFORMDEFS_H |
diff --git a/mkspecs/reliant-cds-64/qmake.conf b/mkspecs/reliant-cds-64/qmake.conf index 8bd4fa1..d01099c 100644 --- a/mkspecs/reliant-cds-64/qmake.conf +++ b/mkspecs/reliant-cds-64/qmake.conf | |||
| @@ -1,81 +1,85 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # tmake configuration for Reliant UNIX 5.45 using the CDS++ C/C++ compiler V2.0C | 4 | # qmake configuration for reliant-cds-64 |
| 5 | # | ||
| 6 | # Written for Reliant UNIX 5.45 using the CDS++ C/C++ compiler V2.0C. | ||
| 5 | # | 7 | # |
| 6 | 8 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 9 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 10 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 11 | CONFIG += qt warn_on release link_prl |
| 10 | 12 | ||
| 11 | QMAKE_CC = cc | 13 | QMAKE_CC = cc |
| 12 | QMAKE_LEX = flex | 14 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 15 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 16 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 17 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = -Klp64 $(CFLAGS_EXTRA) | 18 | QMAKE_CFLAGS = -Klp64 $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 19 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= -v | 20 | QMAKE_CFLAGS_WARN_ON= -v |
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | 21 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) | 22 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 23 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= -KPIC | 24 | QMAKE_CFLAGS_SHLIB= -KPIC |
| 23 | QMAKE_CFLAGS_YACC= | 25 | QMAKE_CFLAGS_YACC= |
| 24 | QMAKE_CFLAGS_THREAD= -K pthread | 26 | QMAKE_CFLAGS_THREAD= -K pthread |
| 25 | 27 | ||
| 26 | QMAKE_CXX = CC | 28 | QMAKE_CXX = CC |
| 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 29 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 28 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 30 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 31 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 32 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 33 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 34 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 35 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 36 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 37 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 36 | 38 | ||
| 37 | QMAKE_INCDIR = | 39 | QMAKE_INCDIR = |
| 38 | QMAKE_LIBDIR = | 40 | QMAKE_LIBDIR = |
| 39 | QMAKE_INCDIR_X11= /opt/X/include/X11 | 41 | QMAKE_INCDIR_X11= /opt/X/include/X11 |
| 40 | QMAKE_LIBDIR_X11= /opt/X/lib | 42 | QMAKE_LIBDIR_X11= /opt/X/lib |
| 41 | QMAKE_INCDIR_QT = $(QTDIR)/include | 43 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 44 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 43 | QMAKE_INCDIR_OPENGL= | 45 | QMAKE_INCDIR_OPENGL= |
| 44 | QMAKE_LIBDIR_OPENGL= | 46 | QMAKE_LIBDIR_OPENGL= |
| 45 | 47 | ||
| 46 | QMAKE_LINK = CC | 48 | QMAKE_LINK = CC |
| 47 | QMAKE_LINK_SHLIB= CC | 49 | QMAKE_LINK_SHLIB= CC |
| 48 | QMAKE_LFLAGS = -Klp64 $(LFLAGS_EXTRA) | 50 | QMAKE_LFLAGS = -Klp64 $(LFLAGS_EXTRA) |
| 49 | QMAKE_LFLAGS_RELEASE= | 51 | QMAKE_LFLAGS_RELEASE= |
| 50 | QMAKE_LFLAGS_DEBUG= | 52 | QMAKE_LFLAGS_DEBUG= |
| 51 | QMAKE_LFLAGS_SHLIB= -G | 53 | QMAKE_LFLAGS_SHLIB= -G |
| 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 54 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 53 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE | 55 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE |
| 54 | QMAKE_LFLAGS_THREAD= -K pthread | 56 | QMAKE_LFLAGS_THREAD= -K pthread |
| 55 | QMAKE_RPATH = -Wl,-Brpath=, | 57 | QMAKE_RPATH = -Wl,-Brpath= |
| 56 | 58 | ||
| 57 | QMAKE_LIBS = $(LIBS_EXTRA) | 59 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 58 | QMAKE_LIBS_DYNLOAD= -ldl | 60 | QMAKE_LIBS_DYNLOAD= -ldl |
| 59 | QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm | 61 | QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm |
| 60 | QMAKE_LIBS_X11SM= -lSM -lICE | 62 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 61 | QMAKE_LIBS_QT = -lqt | 63 | QMAKE_LIBS_QT = -lqt |
| 62 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 64 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 63 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 65 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 64 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 66 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 65 | QMAKE_LIBS_THREAD= | 67 | QMAKE_LIBS_THREAD= |
| 66 | 68 | ||
| 67 | QMAKE_MOC = $(QTDIR)/bin/moc | 69 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 68 | QMAKE_UIC = $(QTDIR)/bin/uic | 70 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 69 | 71 | ||
| 70 | QMAKE_AR = CC -xar -o | 72 | QMAKE_AR = CC -xar -o |
| 71 | QMAKE_RANLIB = | 73 | QMAKE_RANLIB = |
| 72 | 74 | ||
| 73 | QMAKE_CLEAN = -r $(OBJECTS_DIR)/Templates.DB | 75 | QMAKE_CLEAN = -r $(OBJECTS_DIR)/Templates.DB |
| 74 | 76 | ||
| 75 | QMAKE_TAR = tar -cf | 77 | QMAKE_TAR = tar -cf |
| 76 | QMAKE_GZIP = gzip -9f | 78 | QMAKE_GZIP = gzip -9f |
| 77 | 79 | ||
| 78 | QMAKE_COPY = cp -f | 80 | QMAKE_COPY = cp -f |
| 79 | QMAKE_MOVE = mv -f | 81 | QMAKE_MOVE = mv -f |
| 80 | QMAKE_DEL_FILE = rm -f | 82 | QMAKE_DEL_FILE = rm -f |
| 81 | QMAKE_DEL_DIR = rmdir | 83 | QMAKE_DEL_DIR = rmdir |
| 84 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 85 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/reliant-cds/qmake.conf b/mkspecs/reliant-cds/qmake.conf index 539cee7..7e7dd96 100644 --- a/mkspecs/reliant-cds/qmake.conf +++ b/mkspecs/reliant-cds/qmake.conf | |||
| @@ -1,81 +1,85 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # tmake configuration for Reliant UNIX 5.45 using the CDS++ C/C++ compiler V2.0C | 4 | # qmake configuration for reliant-cds |
| 5 | # | ||
| 6 | # Written for Reliant UNIX 5.45 using the CDS++ C/C++ compiler V2.0C. | ||
| 5 | # | 7 | # |
| 6 | 8 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 9 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 10 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 11 | CONFIG += qt warn_on release link_prl |
| 10 | 12 | ||
| 11 | QMAKE_CC = cc | 13 | QMAKE_CC = cc |
| 12 | QMAKE_LEX = flex | 14 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 15 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 16 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 17 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) | 18 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 19 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= -v | 20 | QMAKE_CFLAGS_WARN_ON= -v |
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | 21 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) | 22 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 23 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= -KPIC | 24 | QMAKE_CFLAGS_SHLIB= -KPIC |
| 23 | QMAKE_CFLAGS_YACC= | 25 | QMAKE_CFLAGS_YACC= |
| 24 | QMAKE_CFLAGS_THREAD= -K pthread | 26 | QMAKE_CFLAGS_THREAD= -K pthread |
| 25 | 27 | ||
| 26 | QMAKE_CXX = CC | 28 | QMAKE_CXX = CC |
| 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 29 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 28 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 30 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 31 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 32 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 33 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 34 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 35 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 36 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 37 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 36 | 38 | ||
| 37 | QMAKE_INCDIR = | 39 | QMAKE_INCDIR = |
| 38 | QMAKE_LIBDIR = | 40 | QMAKE_LIBDIR = |
| 39 | QMAKE_INCDIR_X11= /opt/X/include/X11 | 41 | QMAKE_INCDIR_X11= /opt/X/include/X11 |
| 40 | QMAKE_LIBDIR_X11= /opt/X/lib | 42 | QMAKE_LIBDIR_X11= /opt/X/lib |
| 41 | QMAKE_INCDIR_QT = $(QTDIR)/include | 43 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 44 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 43 | QMAKE_INCDIR_OPENGL= | 45 | QMAKE_INCDIR_OPENGL= |
| 44 | QMAKE_LIBDIR_OPENGL= | 46 | QMAKE_LIBDIR_OPENGL= |
| 45 | 47 | ||
| 46 | QMAKE_LINK = CC | 48 | QMAKE_LINK = CC |
| 47 | QMAKE_LINK_SHLIB= CC | 49 | QMAKE_LINK_SHLIB= CC |
| 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 50 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 49 | QMAKE_LFLAGS_RELEASE= | 51 | QMAKE_LFLAGS_RELEASE= |
| 50 | QMAKE_LFLAGS_DEBUG= | 52 | QMAKE_LFLAGS_DEBUG= |
| 51 | QMAKE_LFLAGS_SHLIB= -G | 53 | QMAKE_LFLAGS_SHLIB= -G |
| 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 54 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 53 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE | 55 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE |
| 54 | QMAKE_LFLAGS_THREAD= -K pthread | 56 | QMAKE_LFLAGS_THREAD= -K pthread |
| 55 | QMAKE_RPATH = -Wl,-Brpath=, | 57 | QMAKE_RPATH = -Wl,-Brpath= |
| 56 | 58 | ||
| 57 | QMAKE_LIBS = $(LIBS_EXTRA) | 59 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 58 | QMAKE_LIBS_DYNLOAD= -ldl | 60 | QMAKE_LIBS_DYNLOAD= -ldl |
| 59 | QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm | 61 | QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm |
| 60 | QMAKE_LIBS_X11SM= -lSM -lICE | 62 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 61 | QMAKE_LIBS_QT = -lqt | 63 | QMAKE_LIBS_QT = -lqt |
| 62 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 64 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 63 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 65 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 64 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 66 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 65 | QMAKE_LIBS_THREAD= | 67 | QMAKE_LIBS_THREAD= |
| 66 | 68 | ||
| 67 | QMAKE_MOC = $(QTDIR)/bin/moc | 69 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 68 | QMAKE_UIC = $(QTDIR)/bin/uic | 70 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 69 | 71 | ||
| 70 | QMAKE_AR = CC -xar -o | 72 | QMAKE_AR = CC -xar -o |
| 71 | QMAKE_RANLIB = | 73 | QMAKE_RANLIB = |
| 72 | 74 | ||
| 73 | QMAKE_CLEAN = -r $(OBJECTS_DIR)/Templates.DB | 75 | QMAKE_CLEAN = -r $(OBJECTS_DIR)/Templates.DB |
| 74 | 76 | ||
| 75 | QMAKE_TAR = tar -cf | 77 | QMAKE_TAR = tar -cf |
| 76 | QMAKE_GZIP = gzip -9f | 78 | QMAKE_GZIP = gzip -9f |
| 77 | 79 | ||
| 78 | QMAKE_COPY = cp -f | 80 | QMAKE_COPY = cp -f |
| 79 | QMAKE_MOVE = mv -f | 81 | QMAKE_MOVE = mv -f |
| 80 | QMAKE_DEL_FILE = rm -f | 82 | QMAKE_DEL_FILE = rm -f |
| 81 | QMAKE_DEL_DIR = rmdir | 83 | QMAKE_DEL_DIR = rmdir |
| 84 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 85 | QMAKE_MKDIR = mkdir -p | ||
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 | |||
| @@ -1,81 +1,79 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 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 |
| 16 | QMAKE_LEXFLAGS = | 18 | QMAKE_LEXFLAGS = |
| 17 | QMAKE_YACC = yacc | 19 | QMAKE_YACC = yacc |
| 18 | QMAKE_YACCFLAGS = -d | 20 | QMAKE_YACCFLAGS = -d |
| 19 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) | 21 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 20 | QMAKE_CFLAGS_WARN_ON= | 22 | QMAKE_CFLAGS_WARN_ON= |
| 21 | QMAKE_CFLAGS_WARN_OFF= -w | 23 | QMAKE_CFLAGS_WARN_OFF= -w |
| 22 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) | 24 | 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) |
| 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 31 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 32 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 32 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE -Tused | 33 | 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 = |
| 40 | QMAKE_INCDIR_X11= | 40 | QMAKE_INCDIR_X11= |
| 41 | QMAKE_LIBDIR_X11= /usr/X/lib | 41 | QMAKE_LIBDIR_X11= /usr/X/lib |
| 42 | QMAKE_INCDIR_QT = $(QTDIR)/include | 42 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 44 | QMAKE_INCDIR_OPENGL= | 44 | QMAKE_INCDIR_OPENGL= |
| 45 | QMAKE_LIBDIR_OPENGL= | 45 | QMAKE_LIBDIR_OPENGL= |
| 46 | 46 | ||
| 47 | QMAKE_LINK = CC | 47 | QMAKE_LINK = CC |
| 48 | QMAKE_LINK_SHLIB= CC | 48 | QMAKE_LINK_SHLIB= CC |
| 49 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 49 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 50 | QMAKE_LFLAGS_RELEASE= | 50 | QMAKE_LFLAGS_RELEASE= |
| 51 | QMAKE_LFLAGS_DEBUG= | 51 | 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 |
| 76 | QMAKE_GZIP = gzip -9f | 72 | QMAKE_GZIP = gzip -9f |
| 77 | 73 | ||
| 78 | QMAKE_COPY = cp -f | 74 | 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 | |||
| @@ -1,89 +1,85 @@ | |||
| 1 | #ifndef QPLATFORMDEFS_H | 1 | #ifndef QPLATFORMDEFS_H |
| 2 | #define QPLATFORMDEFS_H | 2 | #define QPLATFORMDEFS_H |
| 3 | 3 | ||
| 4 | // Get Qt defines/settings | 4 | // Get Qt defines/settings |
| 5 | 5 | ||
| 6 | #include "qglobal.h" | 6 | #include "qglobal.h" |
| 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 | ||
| 18 | // We are hot - unistd.h should have turned on the specific APIs we requested | 13 | // We are hot - unistd.h should have turned on the specific APIs we requested |
| 19 | 14 | ||
| 20 | 15 | ||
| 21 | #ifdef QT_THREAD_SUPPORT | 16 | #ifdef QT_THREAD_SUPPORT |
| 22 | #include <pthread.h> | 17 | #include <pthread.h> |
| 23 | #endif | 18 | #endif |
| 24 | 19 | ||
| 25 | #include <dirent.h> | 20 | #include <dirent.h> |
| 26 | #include <fcntl.h> | 21 | #include <fcntl.h> |
| 27 | #include <grp.h> | 22 | #include <grp.h> |
| 28 | #include <pwd.h> | 23 | #include <pwd.h> |
| 29 | #include <signal.h> | 24 | #include <signal.h> |
| 30 | #include <dlfcn.h> | 25 | #include <dlfcn.h> |
| 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> |
| 37 | #include <sys/socket.h> | 33 | #include <sys/socket.h> |
| 38 | #include <sys/stat.h> | 34 | #include <sys/stat.h> |
| 39 | #include <sys/wait.h> | 35 | #include <sys/wait.h> |
| 40 | 36 | ||
| 41 | // DNS header files are not fully covered by X/Open specifications. | 37 | // DNS header files are not fully covered by X/Open specifications. |
| 42 | // In particular nothing is said about res_* :/ | 38 | // In particular nothing is said about res_* :/ |
| 43 | // On Unixware header files <netinet/in.h> and <arpa/nameser.h> are not | 39 | // On Unixware header files <netinet/in.h> and <arpa/nameser.h> are not |
| 44 | // included by <resolv.h>. Note that <arpa/nameser.h> must be included | 40 | // included by <resolv.h>. Note that <arpa/nameser.h> must be included |
| 45 | // before <resolv.h>. | 41 | // before <resolv.h>. |
| 46 | #include <netinet/in.h> | 42 | #include <netinet/in.h> |
| 47 | #include <arpa/nameser.h> | 43 | #include <arpa/nameser.h> |
| 48 | #include <resolv.h> | 44 | #include <resolv.h> |
| 49 | 45 | ||
| 50 | 46 | ||
| 51 | #if !defined(QT_NO_COMPAT) | 47 | #if !defined(QT_NO_COMPAT) |
| 52 | #define QT_STATBUF struct stat | 48 | #define QT_STATBUF struct stat |
| 53 | #define QT_STATBUF4TSTATstruct stat | 49 | #define QT_STATBUF4TSTATstruct stat |
| 54 | #define QT_STAT ::stat | 50 | #define QT_STAT ::stat |
| 55 | #define QT_FSTAT ::fstat | 51 | #define QT_FSTAT ::fstat |
| 56 | #define QT_STAT_REG S_IFREG | 52 | #define QT_STAT_REG S_IFREG |
| 57 | #define QT_STAT_DIR S_IFDIR | 53 | #define QT_STAT_DIR S_IFDIR |
| 58 | #define QT_STAT_MASK S_IFMT | 54 | #define QT_STAT_MASK S_IFMT |
| 59 | #define QT_STAT_LNK S_IFLNK | 55 | #define QT_STAT_LNK S_IFLNK |
| 60 | #define QT_FILENO fileno | 56 | #define QT_FILENO fileno |
| 61 | #define QT_OPEN ::open | 57 | #define QT_OPEN ::open |
| 62 | #define QT_CLOSE ::close | 58 | #define QT_CLOSE ::close |
| 63 | #define QT_LSEEK ::lseek | 59 | #define QT_LSEEK ::lseek |
| 64 | #define QT_READ ::read | 60 | #define QT_READ ::read |
| 65 | #define QT_WRITE ::write | 61 | #define QT_WRITE ::write |
| 66 | #define QT_ACCESS ::access | 62 | #define QT_ACCESS ::access |
| 67 | #define QT_GETCWD ::getcwd | 63 | #define QT_GETCWD ::getcwd |
| 68 | #define QT_CHDIR ::chdir | 64 | #define QT_CHDIR ::chdir |
| 69 | #define QT_MKDIR ::mkdir | 65 | #define QT_MKDIR ::mkdir |
| 70 | #define QT_RMDIR ::rmdir | 66 | #define QT_RMDIR ::rmdir |
| 71 | #define QT_OPEN_RDONLY O_RDONLY | 67 | #define QT_OPEN_RDONLY O_RDONLY |
| 72 | #define QT_OPEN_WRONLY O_WRONLY | 68 | #define QT_OPEN_WRONLY O_WRONLY |
| 73 | #define QT_OPEN_RDWR O_RDWR | 69 | #define QT_OPEN_RDWR O_RDWR |
| 74 | #define QT_OPEN_CREAT O_CREAT | 70 | #define QT_OPEN_CREAT O_CREAT |
| 75 | #define QT_OPEN_TRUNC O_TRUNC | 71 | #define QT_OPEN_TRUNC O_TRUNC |
| 76 | #define QT_OPEN_APPEND O_APPEND | 72 | #define QT_OPEN_APPEND O_APPEND |
| 77 | #endif | 73 | #endif |
| 78 | 74 | ||
| 79 | #define QT_SIGNAL_RETTYPEvoid | 75 | #define QT_SIGNAL_RETTYPEvoid |
| 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 |
| 87 | 83 | ||
| 88 | 84 | ||
| 89 | #endif // QPLATFORMDEFS_H | 85 | #endif // QPLATFORMDEFS_H |
diff --git a/mkspecs/sco-g++/qmake.conf b/mkspecs/sco-g++/qmake.conf index 5a9c11a..ae559d8 100644 --- a/mkspecs/sco-g++/qmake.conf +++ b/mkspecs/sco-g++/qmake.conf | |||
| @@ -1,76 +1,76 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for sco-g++ | 4 | # qmake configuration for sco-g++ |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 9 | CONFIG += qt warn_on release link_prl |
| 10 | 10 | ||
| 11 | QMAKE_CC = gcc | 11 | QMAKE_CC = gcc |
| 12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 17 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | 19 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= -fPIC | 22 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 24 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | ||
| 25 | 24 | ||
| 26 | QMAKE_CXX = g++ | 25 | QMAKE_CXX = g++ |
| 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 28 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 27 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 28 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 29 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 30 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 31 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 32 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 33 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | ||
| 36 | 34 | ||
| 37 | QMAKE_INCDIR = | 35 | QMAKE_INCDIR = |
| 38 | QMAKE_LIBDIR = | 36 | QMAKE_LIBDIR = |
| 39 | QMAKE_INCDIR_X11= | 37 | QMAKE_INCDIR_X11= |
| 40 | QMAKE_LIBDIR_X11= | 38 | QMAKE_LIBDIR_X11= |
| 41 | QMAKE_INCDIR_QT = $(QTDIR)/include | 39 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 43 | QMAKE_INCDIR_OPENGL= | 41 | QMAKE_INCDIR_OPENGL= |
| 44 | QMAKE_LIBDIR_OPENGL= | 42 | QMAKE_LIBDIR_OPENGL= |
| 45 | 43 | ||
| 46 | QMAKE_LINK = g++ | 44 | QMAKE_LINK = g++ |
| 47 | QMAKE_LINK_SHLIB= g++ | 45 | QMAKE_LINK_SHLIB= g++ |
| 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 49 | QMAKE_LFLAGS_RELEASE= | 47 | QMAKE_LFLAGS_RELEASE= |
| 50 | QMAKE_LFLAGS_DEBUG= | 48 | QMAKE_LFLAGS_DEBUG= |
| 51 | QMAKE_LFLAGS_SHLIB= -G | 49 | QMAKE_LFLAGS_SHLIB= -G |
| 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 50 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 53 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE | 51 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE |
| 54 | QMAKE_RPATH = | 52 | QMAKE_RPATH = |
| 55 | 53 | ||
| 56 | QMAKE_LIBS = $(LIBS_EXTRA) | 54 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 57 | QMAKE_LIBS_DYNLOAD= -ldl | 55 | QMAKE_LIBS_DYNLOAD= -ldl |
| 58 | QMAKE_LIBS_X11 = -lXext -lX11 -lsocket -lm | 56 | QMAKE_LIBS_X11 = -lXext -lX11 -lsocket -lm |
| 59 | QMAKE_LIBS_QT = -lqt | 57 | QMAKE_LIBS_QT = -lqt |
| 60 | 58 | ||
| 61 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 59 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 62 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 60 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 63 | 61 | ||
| 64 | QMAKE_MOC = $(QTDIR)/bin/moc | 62 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 65 | QMAKE_UIC = $(QTDIR)/bin/uic | 63 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 66 | 64 | ||
| 67 | QMAKE_AR = ar cqs | 65 | QMAKE_AR = ar cqs |
| 68 | QMAKE_RANLIB = | 66 | QMAKE_RANLIB = |
| 69 | 67 | ||
| 70 | QMAKE_TAR = tar -cf | 68 | QMAKE_TAR = tar -cf |
| 71 | QMAKE_GZIP = gzip -9f | 69 | QMAKE_GZIP = gzip -9f |
| 72 | 70 | ||
| 73 | QMAKE_COPY = cp -f | 71 | QMAKE_COPY = cp -f |
| 74 | QMAKE_MOVE = mv -f | 72 | QMAKE_MOVE = mv -f |
| 75 | QMAKE_DEL_FILE = rm -f | 73 | QMAKE_DEL_FILE = rm -f |
| 76 | QMAKE_DEL_DIR = rmdir | 74 | QMAKE_DEL_DIR = rmdir |
| 75 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 76 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/sco-g++/qplatformdefs.h b/mkspecs/sco-g++/qplatformdefs.h index 0fc27cb..34c87e4 100644 --- a/mkspecs/sco-g++/qplatformdefs.h +++ b/mkspecs/sco-g++/qplatformdefs.h | |||
| @@ -26,66 +26,70 @@ | |||
| 26 | #include <fcntl.h> | 26 | #include <fcntl.h> |
| 27 | #include <grp.h> | 27 | #include <grp.h> |
| 28 | #include <pwd.h> | 28 | #include <pwd.h> |
| 29 | #include <signal.h> | 29 | #include <signal.h> |
| 30 | #include <dlfcn.h> | 30 | #include <dlfcn.h> |
| 31 | 31 | ||
| 32 | #include <sys/types.h> | 32 | #include <sys/types.h> |
| 33 | #include <sys/ioctl.h> | 33 | #include <sys/ioctl.h> |
| 34 | #include <sys/ipc.h> | 34 | #include <sys/ipc.h> |
| 35 | #include <sys/time.h> | 35 | #include <sys/time.h> |
| 36 | #include <sys/shm.h> | 36 | #include <sys/shm.h> |
| 37 | #include <sys/socket.h> | 37 | #include <sys/socket.h> |
| 38 | #include <sys/stat.h> | 38 | #include <sys/stat.h> |
| 39 | #include <sys/wait.h> | 39 | #include <sys/wait.h> |
| 40 | 40 | ||
| 41 | // DNS header files are not fully covered by X/Open specifications. | 41 | // DNS header files are not fully covered by X/Open specifications. |
| 42 | // In particular nothing is said about res_* :/ | 42 | // In particular nothing is said about res_* :/ |
| 43 | // On Unixware header files <netinet/in.h> and <arpa/nameser.h> are not | 43 | // On Unixware header files <netinet/in.h> and <arpa/nameser.h> are not |
| 44 | // included by <resolv.h>. Note that <arpa/nameser.h> must be included | 44 | // included by <resolv.h>. Note that <arpa/nameser.h> must be included |
| 45 | // before <resolv.h>. | 45 | // before <resolv.h>. |
| 46 | #include <netinet/in.h> | 46 | #include <netinet/in.h> |
| 47 | #define class r_class // SCO OpenServer 5.0.6 | 47 | #define class r_class // SCO OpenServer 5.0.6 |
| 48 | #include <arpa/nameser.h> | 48 | #include <arpa/nameser.h> |
| 49 | #undef class | 49 | #undef class |
| 50 | #include <resolv.h> | 50 | #include <resolv.h> |
| 51 | 51 | ||
| 52 | 52 | ||
| 53 | #if !defined(QT_NO_COMPAT) | 53 | #if !defined(QT_NO_COMPAT) |
| 54 | #define QT_STATBUF struct stat | 54 | #define QT_STATBUF struct stat |
| 55 | #define QT_STATBUF4TSTATstruct stat | 55 | #define QT_STATBUF4TSTATstruct stat |
| 56 | #define QT_STAT ::stat | 56 | #define QT_STAT ::stat |
| 57 | #define QT_FSTAT ::fstat | 57 | #define QT_FSTAT ::fstat |
| 58 | #define QT_STAT_REG S_IFREG | 58 | #define QT_STAT_REG S_IFREG |
| 59 | #define QT_STAT_DIR S_IFDIR | 59 | #define QT_STAT_DIR S_IFDIR |
| 60 | #define QT_STAT_MASK S_IFMT | 60 | #define QT_STAT_MASK S_IFMT |
| 61 | #define QT_STAT_LNK S_IFLNK | 61 | #define QT_STAT_LNK S_IFLNK |
| 62 | #define QT_FILENO fileno | 62 | #define QT_FILENO fileno |
| 63 | #define QT_OPEN ::open | 63 | #define QT_OPEN ::open |
| 64 | #define QT_CLOSE ::close | 64 | #define QT_CLOSE ::close |
| 65 | #define QT_LSEEK ::lseek | 65 | #define QT_LSEEK ::lseek |
| 66 | #define QT_READ ::read | 66 | #define QT_READ ::read |
| 67 | #define QT_WRITE ::write | 67 | #define QT_WRITE ::write |
| 68 | #define QT_ACCESS ::access | 68 | #define QT_ACCESS ::access |
| 69 | #define QT_GETCWD ::getcwd | 69 | #define QT_GETCWD ::getcwd |
| 70 | #define QT_CHDIR ::chdir | 70 | #define QT_CHDIR ::chdir |
| 71 | #define QT_MKDIR ::mkdir | 71 | #define QT_MKDIR ::mkdir |
| 72 | #define QT_RMDIR ::rmdir | 72 | #define QT_RMDIR ::rmdir |
| 73 | #define QT_OPEN_RDONLY O_RDONLY | 73 | #define QT_OPEN_RDONLY O_RDONLY |
| 74 | #define QT_OPEN_WRONLY O_WRONLY | 74 | #define QT_OPEN_WRONLY O_WRONLY |
| 75 | #define QT_OPEN_RDWR O_RDWR | 75 | #define QT_OPEN_RDWR O_RDWR |
| 76 | #define QT_OPEN_CREAT O_CREAT | 76 | #define QT_OPEN_CREAT O_CREAT |
| 77 | #define QT_OPEN_TRUNC O_TRUNC | 77 | #define QT_OPEN_TRUNC O_TRUNC |
| 78 | #define QT_OPEN_APPEND O_APPEND | 78 | #define QT_OPEN_APPEND O_APPEND |
| 79 | #endif | 79 | #endif |
| 80 | 80 | ||
| 81 | #define QT_SIGNAL_RETTYPEvoid | 81 | #define QT_SIGNAL_RETTYPEvoid |
| 82 | #define QT_SIGNAL_ARGS int | 82 | #define QT_SIGNAL_ARGS int |
| 83 | #define QT_SIGNAL_IGNORESIG_IGN | 83 | #define QT_SIGNAL_IGNORESIG_IGN |
| 84 | 84 | ||
| 85 | #define QT_SOCKLEN_T int | 85 | #define QT_SOCKLEN_T int |
| 86 | 86 | ||
| 87 | #define QT_SNPRINTF ::snprintf | 87 | #define QT_SNPRINTF ::snprintf |
| 88 | #define QT_VSNPRINTF ::vsnprintf | 88 | #define QT_VSNPRINTF ::vsnprintf |
| 89 | 89 | ||
| 90 | // SCO OpenServer redefines raise -> kill | ||
| 91 | #if defined(raise) | ||
| 92 | # undef raise | ||
| 93 | #endif | ||
| 90 | 94 | ||
| 91 | #endif // QPLATFORMDEFS_H | 95 | #endif // QPLATFORMDEFS_H |
diff --git a/mkspecs/solaris-cc-64/qmake.conf b/mkspecs/solaris-cc-64/qmake.conf index 0da6a2d..45b5e4a 100644 --- a/mkspecs/solaris-cc-64/qmake.conf +++ b/mkspecs/solaris-cc-64/qmake.conf | |||
| @@ -1,100 +1,103 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for Sun WorkShop 5.0, Forte Developer 6, | 4 | # qmake configuration for solaris-cc-64 |
| 5 | # and Sun ONE Studio 7 on Solaris | 5 | # |
| 6 | # Written for Sun WorkShop 5.0, Forte Developer 6, and Sun ONE Studio 7. | ||
| 6 | # | 7 | # |
| 7 | # From the standards(5) manual page: | 8 | # From the standards(5) manual page: |
| 8 | # The XNS4 specification is safe for use only in ILP32 (32-bit) | 9 | # The XNS4 specification is safe for use only in ILP32 (32-bit) |
| 9 | # environments and should not be used for LP64 (64-bit) | 10 | # environments and should not be used for LP64 (64-bit) |
| 10 | # application environments. Use XNS5, which has LP64-clean | 11 | # application environments. Use XNS5, which has LP64-clean |
| 11 | # interfaces that are portable across ILP32 and LP64 environments. | 12 | # interfaces that are portable across ILP32 and LP64 environments. |
| 12 | # [...] | 13 | # [...] |
| 13 | # For platforms supporting the LP64 (64-bit) programming environment | 14 | # For platforms supporting the LP64 (64-bit) programming environment |
| 14 | # where the SC5.0 Compilers have been installed, SUSv2-conforming LP64 | 15 | # where the SC5.0 Compilers have been installed, SUSv2-conforming LP64 |
| 15 | # applications using XNS5 library calls should be built with command | 16 | # applications using XNS5 library calls should be built with command |
| 16 | # lines of the form: | 17 | # lines of the form: |
| 17 | # c89 $(getconf XBS5_LP64_OFF64_CFLAGS) -D_XOPEN_SOURCE=500 \ | 18 | # c89 $(getconf XBS5_LP64_OFF64_CFLAGS) -D_XOPEN_SOURCE=500 \ |
| 18 | # $(getconf XBS5_LP64_OFF64_LDFLAGS) foo.c -o foo \ | 19 | # $(getconf XBS5_LP64_OFF64_LDFLAGS) foo.c -o foo \ |
| 19 | # $(getconf XBS5_LP64_OFF64_LIBS) -lxnet | 20 | # $(getconf XBS5_LP64_OFF64_LIBS) -lxnet |
| 20 | # So it appears that _XOPEN_SOURCE=500 should be defined when building | 21 | # So it appears that _XOPEN_SOURCE=500 should be defined when building |
| 21 | # 64-bit applications (on Solaris 7 and better). But then __EXTENSIONS__ | 22 | # 64-bit applications (on Solaris 7 and better). But then __EXTENSIONS__ |
| 22 | # should be defined as well to recover all the default system interface. | 23 | # should be defined as well to recover all the default system interface. |
| 23 | # | 24 | # |
| 24 | 25 | ||
| 25 | MAKEFILE_GENERATOR= UNIX | 26 | MAKEFILE_GENERATOR= UNIX |
| 26 | TEMPLATE = app | 27 | TEMPLATE = app |
| 27 | CONFIG += qt warn_on release | 28 | CONFIG += qt warn_on release link_prl |
| 28 | 29 | ||
| 29 | QMAKE_CC = cc | 30 | QMAKE_CC = cc |
| 30 | QMAKE_LEX = flex | 31 | QMAKE_LEX = flex |
| 31 | QMAKE_LEXFLAGS = | 32 | QMAKE_LEXFLAGS = |
| 32 | QMAKE_YACC = yacc | 33 | QMAKE_YACC = yacc |
| 33 | QMAKE_YACCFLAGS = -d | 34 | QMAKE_YACCFLAGS = -d |
| 34 | QMAKE_CFLAGS = -xarch=v9 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ $(CFLAGS_EXTRA) | 35 | QMAKE_CFLAGS = -xarch=v9 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ $(CFLAGS_EXTRA) |
| 35 | QMAKE_CFLAGS_DEPS= -xM | 36 | QMAKE_CFLAGS_DEPS= -xM |
| 36 | QMAKE_CFLAGS_WARN_ON= | 37 | QMAKE_CFLAGS_WARN_ON= |
| 37 | QMAKE_CFLAGS_WARN_OFF= -w | 38 | QMAKE_CFLAGS_WARN_OFF= -w |
| 38 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) | 39 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) |
| 39 | QMAKE_CFLAGS_DEBUG= -g | 40 | QMAKE_CFLAGS_DEBUG= -g |
| 40 | QMAKE_CFLAGS_SHLIB= -KPIC | 41 | QMAKE_CFLAGS_SHLIB= -KPIC |
| 41 | QMAKE_CFLAGS_YACC= | 42 | QMAKE_CFLAGS_YACC= |
| 42 | QMAKE_CFLAGS_THREAD= -mt | 43 | QMAKE_CFLAGS_THREAD= -mt |
| 43 | 44 | ||
| 44 | QMAKE_CXX = CC | 45 | QMAKE_CXX = CC |
| 45 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 46 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 46 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 47 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 47 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 48 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 48 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 49 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 49 | QMAKE_CXXFLAGS_RELEASE= -O2 | 50 | QMAKE_CXXFLAGS_RELEASE= -O2 |
| 50 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 51 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 51 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 52 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 52 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 53 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 53 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 54 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 54 | 55 | ||
| 55 | QMAKE_INCDIR = | 56 | QMAKE_INCDIR = |
| 56 | QMAKE_LIBDIR = | 57 | QMAKE_LIBDIR = |
| 57 | QMAKE_INCDIR_X11= /usr/openwin/include | 58 | QMAKE_INCDIR_X11= /usr/openwin/include |
| 58 | QMAKE_LIBDIR_X11= /usr/openwin/lib | 59 | QMAKE_LIBDIR_X11= /usr/openwin/lib |
| 59 | QMAKE_INCDIR_QT = $(QTDIR)/include | 60 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 60 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 61 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 61 | QMAKE_INCDIR_OPENGL= /usr/openwin/include | 62 | QMAKE_INCDIR_OPENGL= /usr/openwin/include |
| 62 | QMAKE_LIBDIR_OPENGL= /usr/openwin/lib | 63 | QMAKE_LIBDIR_OPENGL= /usr/openwin/lib |
| 63 | 64 | ||
| 64 | QMAKE_LINK = CC | 65 | QMAKE_LINK = CC |
| 65 | QMAKE_LINK_SHLIB= CC | 66 | QMAKE_LINK_SHLIB= CC |
| 66 | QMAKE_LFLAGS = -xarch=v9 $(LFLAGS_EXTRA) | 67 | QMAKE_LFLAGS = -xarch=v9 $(LFLAGS_EXTRA) |
| 67 | QMAKE_LFLAGS_RELEASE= | 68 | QMAKE_LFLAGS_RELEASE= |
| 68 | QMAKE_LFLAGS_DEBUG= | 69 | QMAKE_LFLAGS_DEBUG= |
| 69 | QMAKE_LFLAGS_SHLIB= -G | 70 | QMAKE_LFLAGS_SHLIB= -G |
| 70 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 71 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 71 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE | 72 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE |
| 72 | QMAKE_LFLAGS_THREAD= -mt | 73 | QMAKE_LFLAGS_THREAD= -mt |
| 73 | QMAKE_RPATH = -R | 74 | QMAKE_RPATH = -R |
| 74 | 75 | ||
| 75 | QMAKE_LIBS = $(LIBS_EXTRA) | 76 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 76 | QMAKE_LIBS_DYNLOAD= -ldl | 77 | QMAKE_LIBS_DYNLOAD= -ldl |
| 77 | QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl | 78 | QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl |
| 78 | QMAKE_LIBS_X11SM= -lSM -lICE | 79 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 79 | QMAKE_LIBS_NIS = | 80 | QMAKE_LIBS_NIS = |
| 80 | QMAKE_LIBS_QT = -lqt | 81 | QMAKE_LIBS_QT = -lqt |
| 81 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 82 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 82 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 83 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 83 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 84 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 84 | QMAKE_LIBS_THREAD= -lpthread | 85 | QMAKE_LIBS_THREAD= -lpthread -lrt |
| 85 | 86 | ||
| 86 | QMAKE_MOC = $(QTDIR)/bin/moc | 87 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 87 | QMAKE_UIC = $(QTDIR)/bin/uic | 88 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 88 | 89 | ||
| 89 | QMAKE_AR = CC -xar -o | 90 | QMAKE_AR = CC -xar -o |
| 90 | QMAKE_RANLIB = | 91 | QMAKE_RANLIB = |
| 91 | 92 | ||
| 92 | QMAKE_CLEAN = -r $(OBJECTS_DIR)Templates.DB $(OBJECTS_DIR)SunWS_cache | 93 | QMAKE_CLEAN = -r $(OBJECTS_DIR)Templates.DB $(OBJECTS_DIR)SunWS_cache |
| 93 | 94 | ||
| 94 | QMAKE_TAR = tar -cf | 95 | QMAKE_TAR = tar -cf |
| 95 | QMAKE_GZIP = gzip -9f | 96 | QMAKE_GZIP = gzip -9f |
| 96 | 97 | ||
| 97 | QMAKE_COPY = cp -f | 98 | QMAKE_COPY = cp -f |
| 98 | QMAKE_MOVE = mv -f | 99 | QMAKE_MOVE = mv -f |
| 99 | QMAKE_DEL_FILE = rm -f | 100 | QMAKE_DEL_FILE = rm -f |
| 100 | QMAKE_DEL_DIR = rmdir | 101 | QMAKE_DEL_DIR = rmdir |
| 102 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 103 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/solaris-cc/qmake.conf b/mkspecs/solaris-cc/qmake.conf index bee60c9..d1f080e 100644 --- a/mkspecs/solaris-cc/qmake.conf +++ b/mkspecs/solaris-cc/qmake.conf | |||
| @@ -1,83 +1,86 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for Sun WorkShop 5.0, Forte Developer 6, | 4 | # qmake configuration for solaris-cc |
| 5 | # and Sun ONE Studio 7 on Solaris | 5 | # |
| 6 | # Written for Sun WorkShop 5.0, Forte Developer 6, and Sun ONE Studio 7. | ||
| 6 | # | 7 | # |
| 7 | 8 | ||
| 8 | MAKEFILE_GENERATOR= UNIX | 9 | MAKEFILE_GENERATOR= UNIX |
| 9 | TEMPLATE = app | 10 | TEMPLATE = app |
| 10 | CONFIG += qt warn_on release | 11 | CONFIG += qt warn_on release link_prl |
| 11 | 12 | ||
| 12 | QMAKE_CC = cc | 13 | QMAKE_CC = cc |
| 13 | QMAKE_LEX = flex | 14 | QMAKE_LEX = flex |
| 14 | QMAKE_LEXFLAGS = | 15 | QMAKE_LEXFLAGS = |
| 15 | QMAKE_YACC = yacc | 16 | QMAKE_YACC = yacc |
| 16 | QMAKE_YACCFLAGS = -d | 17 | QMAKE_YACCFLAGS = -d |
| 17 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) | 18 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 18 | QMAKE_CFLAGS_DEPS= -xM | 19 | QMAKE_CFLAGS_DEPS= -xM |
| 19 | QMAKE_CFLAGS_WARN_ON= | 20 | QMAKE_CFLAGS_WARN_ON= |
| 20 | QMAKE_CFLAGS_WARN_OFF= -w | 21 | QMAKE_CFLAGS_WARN_OFF= -w |
| 21 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) | 22 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) |
| 22 | QMAKE_CFLAGS_DEBUG= -g | 23 | QMAKE_CFLAGS_DEBUG= -g |
| 23 | QMAKE_CFLAGS_SHLIB= -KPIC | 24 | QMAKE_CFLAGS_SHLIB= -KPIC |
| 24 | QMAKE_CFLAGS_YACC= | 25 | QMAKE_CFLAGS_YACC= |
| 25 | QMAKE_CFLAGS_THREAD= -mt | 26 | QMAKE_CFLAGS_THREAD= -mt |
| 26 | 27 | ||
| 27 | QMAKE_CXX = CC | 28 | QMAKE_CXX = CC |
| 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 29 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 29 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 30 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 31 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 32 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 32 | QMAKE_CXXFLAGS_RELEASE= -O2 | 33 | QMAKE_CXXFLAGS_RELEASE= -O2 |
| 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 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 37 | 38 | ||
| 38 | QMAKE_INCDIR = | 39 | QMAKE_INCDIR = |
| 39 | QMAKE_LIBDIR = | 40 | QMAKE_LIBDIR = |
| 40 | QMAKE_INCDIR_X11= /usr/openwin/include | 41 | QMAKE_INCDIR_X11= /usr/openwin/include |
| 41 | QMAKE_LIBDIR_X11= /usr/openwin/lib | 42 | QMAKE_LIBDIR_X11= /usr/openwin/lib |
| 42 | QMAKE_INCDIR_QT = $(QTDIR)/include | 43 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 44 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 44 | QMAKE_INCDIR_OPENGL= /usr/openwin/include | 45 | QMAKE_INCDIR_OPENGL= /usr/openwin/include |
| 45 | QMAKE_LIBDIR_OPENGL= /usr/openwin/lib | 46 | QMAKE_LIBDIR_OPENGL= /usr/openwin/lib |
| 46 | 47 | ||
| 47 | QMAKE_LINK = CC | 48 | QMAKE_LINK = CC |
| 48 | QMAKE_LINK_SHLIB= CC | 49 | QMAKE_LINK_SHLIB= CC |
| 49 | QMAKE_LFLAGS = -R$(QTDIR)/lib $(LFLAGS_EXTRA) | 50 | QMAKE_LFLAGS = -R$(QTDIR)/lib $(LFLAGS_EXTRA) |
| 50 | QMAKE_LFLAGS_RELEASE= | 51 | QMAKE_LFLAGS_RELEASE= |
| 51 | QMAKE_LFLAGS_DEBUG= | 52 | QMAKE_LFLAGS_DEBUG= |
| 52 | QMAKE_LFLAGS_SHLIB= -G | 53 | QMAKE_LFLAGS_SHLIB= -G |
| 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 54 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 54 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE | 55 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE |
| 55 | QMAKE_LFLAGS_THREAD= -mt | 56 | QMAKE_LFLAGS_THREAD= -mt |
| 56 | QMAKE_RPATH = -R | 57 | QMAKE_RPATH = -R |
| 57 | 58 | ||
| 58 | QMAKE_LIBS = $(LIBS_EXTRA) | 59 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 59 | QMAKE_LIBS_DYNLOAD= -ldl | 60 | QMAKE_LIBS_DYNLOAD= -ldl |
| 60 | QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl | 61 | QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl |
| 61 | QMAKE_LIBS_X11SM= -lSM -lICE | 62 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 62 | QMAKE_LIBS_NIS = | 63 | QMAKE_LIBS_NIS = |
| 63 | QMAKE_LIBS_QT = -lqt | 64 | QMAKE_LIBS_QT = -lqt |
| 64 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 65 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 65 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 66 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 66 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 67 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 67 | QMAKE_LIBS_THREAD= -lpthread | 68 | QMAKE_LIBS_THREAD= -lpthread -lrt |
| 68 | 69 | ||
| 69 | QMAKE_MOC = $(QTDIR)/bin/moc | 70 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 70 | QMAKE_UIC = $(QTDIR)/bin/uic | 71 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 71 | 72 | ||
| 72 | QMAKE_AR = CC -xar -o | 73 | QMAKE_AR = CC -xar -o |
| 73 | QMAKE_RANLIB = | 74 | QMAKE_RANLIB = |
| 74 | 75 | ||
| 75 | QMAKE_CLEAN = -r $(OBJECTS_DIR)Templates.DB $(OBJECTS_DIR)SunWS_cache | 76 | QMAKE_CLEAN = -r $(OBJECTS_DIR)Templates.DB $(OBJECTS_DIR)SunWS_cache |
| 76 | 77 | ||
| 77 | QMAKE_TAR = tar -cf | 78 | QMAKE_TAR = tar -cf |
| 78 | QMAKE_GZIP = gzip -9f | 79 | QMAKE_GZIP = gzip -9f |
| 79 | 80 | ||
| 80 | QMAKE_COPY = cp -f | 81 | QMAKE_COPY = cp -f |
| 81 | QMAKE_MOVE = mv -f | 82 | QMAKE_MOVE = mv -f |
| 82 | QMAKE_DEL_FILE = rm -f | 83 | QMAKE_DEL_FILE = rm -f |
| 83 | QMAKE_DEL_DIR = rmdir | 84 | QMAKE_DEL_DIR = rmdir |
| 85 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 86 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/solaris-cc/qplatformdefs.h b/mkspecs/solaris-cc/qplatformdefs.h index f9480a9..9506b3c 100644 --- a/mkspecs/solaris-cc/qplatformdefs.h +++ b/mkspecs/solaris-cc/qplatformdefs.h | |||
| @@ -1,110 +1,114 @@ | |||
| 1 | #ifndef QPLATFORMDEFS_H | 1 | #ifndef QPLATFORMDEFS_H |
| 2 | #define QPLATFORMDEFS_H | 2 | #define QPLATFORMDEFS_H |
| 3 | 3 | ||
| 4 | // Get Qt defines/settings | 4 | // Get Qt defines/settings |
| 5 | 5 | ||
| 6 | #include "qglobal.h" | 6 | #include "qglobal.h" |
| 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 | #define _POSIX_PTHREAD_SEMANTICS | ||
| 9 | 10 | ||
| 10 | #include <unistd.h> | 11 | #include <unistd.h> |
| 11 | 12 | ||
| 12 | 13 | ||
| 13 | // We are hot - unistd.h should have turned on the specific APIs we requested | 14 | // We are hot - unistd.h should have turned on the specific APIs we requested |
| 14 | 15 | ||
| 15 | 16 | ||
| 16 | #ifdef QT_THREAD_SUPPORT | 17 | #ifdef QT_THREAD_SUPPORT |
| 17 | #include <pthread.h> | 18 | #include <pthread.h> |
| 18 | #endif | 19 | #endif |
| 19 | 20 | ||
| 20 | #include <dirent.h> | 21 | #include <dirent.h> |
| 21 | #include <fcntl.h> | 22 | #include <fcntl.h> |
| 22 | #include <grp.h> | 23 | #include <grp.h> |
| 23 | #include <pwd.h> | 24 | #include <pwd.h> |
| 24 | #include <signal.h> | 25 | #include <signal.h> |
| 25 | #include <dlfcn.h> | 26 | #include <dlfcn.h> |
| 26 | 27 | ||
| 27 | #include <sys/types.h> | 28 | #include <sys/types.h> |
| 28 | #include <sys/ioctl.h> | 29 | #include <sys/ioctl.h> |
| 29 | #include <sys/filio.h> | 30 | #include <sys/filio.h> |
| 30 | #include <sys/ipc.h> | 31 | #include <sys/ipc.h> |
| 31 | #include <sys/time.h> | 32 | #include <sys/time.h> |
| 32 | #include <sys/shm.h> | 33 | #include <sys/shm.h> |
| 33 | #include <sys/socket.h> | 34 | #include <sys/socket.h> |
| 34 | #include <sys/stat.h> | 35 | #include <sys/stat.h> |
| 35 | #include <sys/wait.h> | 36 | #include <sys/wait.h> |
| 36 | 37 | ||
| 37 | // DNS header files are not fully covered by X/Open specifications. | 38 | // DNS header files are not fully covered by X/Open specifications. |
| 38 | // In particular nothing is said about res_* :/ | 39 | // In particular nothing is said about res_* :/ |
| 39 | // On Solaris header files <netinet/in.h> and <arpa/nameser.h> are not | 40 | // On Solaris header files <netinet/in.h> and <arpa/nameser.h> are not |
| 40 | // included by <resolv.h>. Note that <arpa/nameser.h> must be included | 41 | // included by <resolv.h>. Note that <arpa/nameser.h> must be included |
| 41 | // before <resolv.h>. | 42 | // before <resolv.h>. |
| 42 | #include <netinet/in.h> | 43 | #include <netinet/in.h> |
| 43 | #include <arpa/nameser.h> | 44 | #include <arpa/nameser.h> |
| 44 | #include <resolv.h> | 45 | #include <resolv.h> |
| 45 | 46 | ||
| 46 | 47 | ||
| 47 | #if !defined(QT_NO_COMPAT) | 48 | #if !defined(QT_NO_COMPAT) |
| 48 | #define QT_STATBUF struct stat | 49 | #define QT_STATBUF struct stat |
| 49 | #define QT_STATBUF4TSTATstruct stat | 50 | #define QT_STATBUF4TSTATstruct stat |
| 50 | #define QT_STAT ::stat | 51 | #define QT_STAT ::stat |
| 51 | #define QT_FSTAT ::fstat | 52 | #define QT_FSTAT ::fstat |
| 52 | #define QT_STAT_REG S_IFREG | 53 | #define QT_STAT_REG S_IFREG |
| 53 | #define QT_STAT_DIR S_IFDIR | 54 | #define QT_STAT_DIR S_IFDIR |
| 54 | #define QT_STAT_MASK S_IFMT | 55 | #define QT_STAT_MASK S_IFMT |
| 55 | #define QT_STAT_LNK S_IFLNK | 56 | #define QT_STAT_LNK S_IFLNK |
| 56 | #define QT_FILENO fileno | 57 | #define QT_FILENO fileno |
| 57 | #define QT_OPEN ::open | 58 | #define QT_OPEN ::open |
| 58 | #define QT_CLOSE ::close | 59 | #define QT_CLOSE ::close |
| 59 | #define QT_LSEEK ::lseek | 60 | #define QT_LSEEK ::lseek |
| 60 | #define QT_READ ::read | 61 | #define QT_READ ::read |
| 61 | #define QT_WRITE ::write | 62 | #define QT_WRITE ::write |
| 62 | #define QT_ACCESS ::access | 63 | #define QT_ACCESS ::access |
| 63 | #define QT_GETCWD ::getcwd | 64 | #define QT_GETCWD ::getcwd |
| 64 | #define QT_CHDIR ::chdir | 65 | #define QT_CHDIR ::chdir |
| 65 | #define QT_MKDIR ::mkdir | 66 | #define QT_MKDIR ::mkdir |
| 66 | #define QT_RMDIR ::rmdir | 67 | #define QT_RMDIR ::rmdir |
| 67 | #define QT_OPEN_RDONLY O_RDONLY | 68 | #define QT_OPEN_RDONLY O_RDONLY |
| 68 | #define QT_OPEN_WRONLY O_WRONLY | 69 | #define QT_OPEN_WRONLY O_WRONLY |
| 69 | #define QT_OPEN_RDWR O_RDWR | 70 | #define QT_OPEN_RDWR O_RDWR |
| 70 | #define QT_OPEN_CREAT O_CREAT | 71 | #define QT_OPEN_CREAT O_CREAT |
| 71 | #define QT_OPEN_TRUNC O_TRUNC | 72 | #define QT_OPEN_TRUNC O_TRUNC |
| 72 | #define QT_OPEN_APPEND O_APPEND | 73 | #define QT_OPEN_APPEND O_APPEND |
| 73 | #endif | 74 | #endif |
| 74 | 75 | ||
| 75 | #define QT_SIGNAL_RETTYPEvoid | 76 | #define QT_SIGNAL_RETTYPEvoid |
| 76 | #define QT_SIGNAL_ARGS int | 77 | #define QT_SIGNAL_ARGS int |
| 77 | #define QT_SIGNAL_IGNORESIG_IGN | 78 | #define QT_SIGNAL_IGNORESIG_IGN |
| 78 | 79 | ||
| 79 | #if !defined(_XOPEN_UNIX) | 80 | #if !defined(_XOPEN_UNIX) |
| 80 | // Function usleep() is in C library but not in header files on Solaris 2.5.1. | 81 | // Function usleep() is defined in C library but not declared in header files |
| 81 | // Not really a surprise, usleep() is specified by XPG4v2 and XPG4v2 is only | 82 | // on Solaris 2.5.1. Not really a surprise, usleep() is specified by XPG4v2 |
| 82 | // supported by Solaris 2.6 and better. | 83 | // and XPG4v2 is only supported by Solaris 2.6 and better. |
| 84 | // Function gethostname() is defined in C library but not declared in <unistd.h> | ||
| 85 | // on Solaris 2.5.1. | ||
| 83 | // So we are trying to detect Solaris 2.5.1 using macro _XOPEN_UNIX which is | 86 | // So we are trying to detect Solaris 2.5.1 using macro _XOPEN_UNIX which is |
| 84 | // not defined by <unistd.h> when XPG4v2 is not supported. | 87 | // not defined by <unistd.h> when XPG4v2 is not supported. |
| 85 | typedef unsigned int useconds_t; | 88 | typedef unsigned int useconds_t; |
| 86 | extern "C" int usleep(useconds_t); | 89 | extern "C" int usleep(useconds_t); |
| 90 | extern "C" int gethostname(char *, int); | ||
| 87 | #endif | 91 | #endif |
| 88 | 92 | ||
| 89 | #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500) && (_XOPEN_VERSION-0 >= 500) | 93 | #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500) && (_XOPEN_VERSION-0 >= 500) |
| 90 | // on Solaris 7 and better with specific feature test macros | 94 | // on Solaris 7 and better with specific feature test macros |
| 91 | #define QT_SOCKLEN_T socklen_t | 95 | #define QT_SOCKLEN_T socklen_t |
| 92 | #elif defined(_XOPEN_SOURCE_EXTENDED) && (_XOPEN_VERSION-0 >= 4) | 96 | #elif defined(_XOPEN_SOURCE_EXTENDED) && (_XOPEN_VERSION-0 >= 4) |
| 93 | // on Solaris 2.6 and better with specific feature test macros | 97 | // on Solaris 2.6 and better with specific feature test macros |
| 94 | #define QT_SOCKLEN_T size_t | 98 | #define QT_SOCKLEN_T size_t |
| 95 | #else | 99 | #else |
| 96 | // always this case in practice | 100 | // always this case in practice |
| 97 | #define QT_SOCKLEN_T int | 101 | #define QT_SOCKLEN_T int |
| 98 | #endif | 102 | #endif |
| 99 | 103 | ||
| 100 | #if defined(_XOPEN_UNIX) | 104 | #if defined(_XOPEN_UNIX) |
| 101 | // Supported by Solaris 2.6 and better. XPG4v2 and XPG4v2 is also supported | 105 | // Supported by Solaris 2.6 and better. XPG4v2 and XPG4v2 is also supported |
| 102 | // by Solaris 2.6 and better. So we are trying to detect Solaris 2.6 using | 106 | // by Solaris 2.6 and better. So we are trying to detect Solaris 2.6 using |
| 103 | // macro _XOPEN_UNIX which is not defined by <unistd.h> when XPG4v2 is not | 107 | // macro _XOPEN_UNIX which is not defined by <unistd.h> when XPG4v2 is not |
| 104 | // supported. | 108 | // supported. |
| 105 | #define QT_SNPRINTF ::snprintf | 109 | #define QT_SNPRINTF ::snprintf |
| 106 | #define QT_VSNPRINTF ::vsnprintf | 110 | #define QT_VSNPRINTF ::vsnprintf |
| 107 | #endif | 111 | #endif |
| 108 | 112 | ||
| 109 | 113 | ||
| 110 | #endif // QPLATFORMDEFS_H | 114 | #endif // QPLATFORMDEFS_H |
diff --git a/mkspecs/solaris-g++-64/qmake.conf b/mkspecs/solaris-g++-64/qmake.conf index 929de3e..e6760f8 100644 --- a/mkspecs/solaris-g++-64/qmake.conf +++ b/mkspecs/solaris-g++-64/qmake.conf | |||
| @@ -1,103 +1,105 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for solaris-g++64 | 4 | # qmake configuration for solaris-g++64 |
| 5 | # | 5 | # |
| 6 | # The X11 header files used to be broken on Solaris until patches were | 6 | # The X11 header files used to be broken on Solaris until patches were |
| 7 | # released in early 2001 for Solaris 2.6, 7, and 8. On Solaris 2.5.1 | 7 | # released in early 2001 for Solaris 2.6, 7, and 8. On Solaris 2.5.1 |
| 8 | # or non-patched systems -fpermissive works around the incompatibility | 8 | # or non-patched systems -fpermissive works around the incompatibility |
| 9 | # between GCC 2.95 or better and Solaris - but we still get warnings | 9 | # between GCC 2.95 or better and Solaris - but we still get warnings |
| 10 | # because we don't use -isystem. | 10 | # because we don't use -isystem. |
| 11 | # | 11 | # |
| 12 | # From the standards(5) manual page: | 12 | # From the standards(5) manual page: |
| 13 | # The XNS4 specification is safe for use only in ILP32 (32-bit) | 13 | # The XNS4 specification is safe for use only in ILP32 (32-bit) |
| 14 | # environments and should not be used for LP64 (64-bit) | 14 | # environments and should not be used for LP64 (64-bit) |
| 15 | # application environments. Use XNS5, which has LP64-clean | 15 | # application environments. Use XNS5, which has LP64-clean |
| 16 | # interfaces that are portable across ILP32 and LP64 environments. | 16 | # interfaces that are portable across ILP32 and LP64 environments. |
| 17 | # [...] | 17 | # [...] |
| 18 | # For platforms supporting the LP64 (64-bit) programming environment | 18 | # For platforms supporting the LP64 (64-bit) programming environment |
| 19 | # where the SC5.0 Compilers have been installed, SUSv2-conforming LP64 | 19 | # where the SC5.0 Compilers have been installed, SUSv2-conforming LP64 |
| 20 | # applications using XNS5 library calls should be built with command | 20 | # applications using XNS5 library calls should be built with command |
| 21 | # lines of the form: | 21 | # lines of the form: |
| 22 | # c89 $(getconf XBS5_LP64_OFF64_CFLAGS) -D_XOPEN_SOURCE=500 \ | 22 | # c89 $(getconf XBS5_LP64_OFF64_CFLAGS) -D_XOPEN_SOURCE=500 \ |
| 23 | # $(getconf XBS5_LP64_OFF64_LDFLAGS) foo.c -o foo \ | 23 | # $(getconf XBS5_LP64_OFF64_LDFLAGS) foo.c -o foo \ |
| 24 | # $(getconf XBS5_LP64_OFF64_LIBS) -lxnet | 24 | # $(getconf XBS5_LP64_OFF64_LIBS) -lxnet |
| 25 | # So it appears that _XOPEN_SOURCE=500 should be defined when building | 25 | # So it appears that _XOPEN_SOURCE=500 should be defined when building |
| 26 | # 64-bit applications (on Solaris 7 and better). But then __EXTENSIONS__ | 26 | # 64-bit applications (on Solaris 7 and better). But then __EXTENSIONS__ |
| 27 | # should be defined as well to recover all the default system interface. | 27 | # should be defined as well to recover all the default system interface. |
| 28 | # | 28 | # |
| 29 | 29 | ||
| 30 | MAKEFILE_GENERATOR= UNIX | 30 | MAKEFILE_GENERATOR= UNIX |
| 31 | TEMPLATE = app | 31 | TEMPLATE = app |
| 32 | CONFIG += qt warn_on release | 32 | CONFIG += qt warn_on release link_prl |
| 33 | 33 | ||
| 34 | QMAKE_CC = gcc | 34 | QMAKE_CC = gcc |
| 35 | QMAKE_LEX = flex | 35 | QMAKE_LEX = flex |
| 36 | QMAKE_LEXFLAGS = | 36 | QMAKE_LEXFLAGS = |
| 37 | QMAKE_YACC = yacc | 37 | QMAKE_YACC = yacc |
| 38 | QMAKE_YACCFLAGS = -d | 38 | QMAKE_YACCFLAGS = -d |
| 39 | QMAKE_CFLAGS = -m64 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ $(CFLAGS_EXTRA) | 39 | QMAKE_CFLAGS = -m64 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ $(CFLAGS_EXTRA) |
| 40 | QMAKE_CFLAGS_DEPS= -M | 40 | QMAKE_CFLAGS_DEPS= -M |
| 41 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 41 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 42 | QMAKE_CFLAGS_WARN_OFF= -w | 42 | QMAKE_CFLAGS_WARN_OFF= -w |
| 43 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 43 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 44 | QMAKE_CFLAGS_DEBUG= -g | 44 | QMAKE_CFLAGS_DEBUG= -g |
| 45 | QMAKE_CFLAGS_SHLIB= -fPIC | 45 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 46 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 46 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 47 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 47 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 48 | 48 | ||
| 49 | QMAKE_CXX = g++ | 49 | QMAKE_CXX = g++ |
| 50 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 50 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 51 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 51 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 52 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 52 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 53 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 53 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 54 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 54 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 55 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 55 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 56 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 56 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 57 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 57 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 58 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 58 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 59 | 59 | ||
| 60 | QMAKE_INCDIR = | 60 | QMAKE_INCDIR = |
| 61 | QMAKE_LIBDIR = | 61 | QMAKE_LIBDIR = |
| 62 | QMAKE_INCDIR_X11= /usr/openwin/include | 62 | QMAKE_INCDIR_X11= /usr/openwin/include |
| 63 | QMAKE_LIBDIR_X11= /usr/openwin/lib | 63 | QMAKE_LIBDIR_X11= /usr/openwin/lib/sparcv9 |
| 64 | QMAKE_INCDIR_QT = $(QTDIR)/include | 64 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 65 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 65 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 66 | QMAKE_INCDIR_OPENGL= /usr/openwin/include | 66 | QMAKE_INCDIR_OPENGL= /usr/openwin/include |
| 67 | QMAKE_LIBDIR_OPENGL= /usr/openwin/lib | 67 | QMAKE_LIBDIR_OPENGL= /usr/openwin/lib/sparcv9 |
| 68 | 68 | ||
| 69 | QMAKE_LINK = g++ | 69 | QMAKE_LINK = g++ |
| 70 | QMAKE_LINK_SHLIB= g++ | 70 | QMAKE_LINK_SHLIB= g++ |
| 71 | QMAKE_LFLAGS = -m64 $(LFLAGS_EXTRA) | 71 | QMAKE_LFLAGS = -m64 $(LFLAGS_EXTRA) |
| 72 | QMAKE_LFLAGS_RELEASE= | 72 | QMAKE_LFLAGS_RELEASE= |
| 73 | QMAKE_LFLAGS_DEBUG= -g | 73 | QMAKE_LFLAGS_DEBUG= -g |
| 74 | QMAKE_LFLAGS_SHLIB= -shared | 74 | QMAKE_LFLAGS_SHLIB= -shared |
| 75 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 75 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 76 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE | 76 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE |
| 77 | QMAKE_LFLAGS_THREAD= | 77 | QMAKE_LFLAGS_THREAD= |
| 78 | QMAKE_RPATH = -Wl,-R, | 78 | QMAKE_RPATH = -Wl,-R, |
| 79 | 79 | ||
| 80 | QMAKE_LIBS = $(LIBS_EXTRA) | 80 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 81 | QMAKE_LIBS_DYNLOAD= -ldl | 81 | QMAKE_LIBS_DYNLOAD= -ldl |
| 82 | QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl | 82 | QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl |
| 83 | QMAKE_LIBS_X11SM= -lSM -lICE | 83 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 84 | QMAKE_LIBS_NIS = | 84 | QMAKE_LIBS_NIS = |
| 85 | QMAKE_LIBS_QT = -lqt | 85 | QMAKE_LIBS_QT = -lqt |
| 86 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 86 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 87 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 87 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 88 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 88 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 89 | QMAKE_LIBS_THREAD= -lthread | 89 | QMAKE_LIBS_THREAD= -lpthread -lrt |
| 90 | 90 | ||
| 91 | QMAKE_MOC = $(QTDIR)/bin/moc | 91 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 92 | QMAKE_UIC = $(QTDIR)/bin/uic | 92 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 93 | 93 | ||
| 94 | QMAKE_AR = ar cq | 94 | QMAKE_AR = ar cq |
| 95 | QMAKE_RANLIB = | 95 | QMAKE_RANLIB = |
| 96 | 96 | ||
| 97 | QMAKE_TAR = tar -cf | 97 | QMAKE_TAR = tar -cf |
| 98 | QMAKE_GZIP = gzip -9f | 98 | QMAKE_GZIP = gzip -9f |
| 99 | 99 | ||
| 100 | QMAKE_COPY = cp -f | 100 | QMAKE_COPY = cp -f |
| 101 | QMAKE_MOVE = mv -f | 101 | QMAKE_MOVE = mv -f |
| 102 | QMAKE_DEL_FILE = rm -f | 102 | QMAKE_DEL_FILE = rm -f |
| 103 | QMAKE_DEL_DIR = rmdir | 103 | QMAKE_DEL_DIR = rmdir |
| 104 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 105 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/solaris-g++-64/qplatformdefs.h b/mkspecs/solaris-g++-64/qplatformdefs.h index e8e43d9..8b2dd83 100644 --- a/mkspecs/solaris-g++-64/qplatformdefs.h +++ b/mkspecs/solaris-g++-64/qplatformdefs.h | |||
| @@ -1,84 +1,90 @@ | |||
| 1 | #ifndef QPLATFORMDEFS_H | 1 | #ifndef QPLATFORMDEFS_H |
| 2 | #define QPLATFORMDEFS_H | 2 | #define QPLATFORMDEFS_H |
| 3 | 3 | ||
| 4 | // Get Qt defines/settings | 4 | // Get Qt defines/settings |
| 5 | 5 | ||
| 6 | #include "qglobal.h" | 6 | #include "qglobal.h" |
| 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 | #ifndef _POSIX_PTHREAD_SEMANTICS | ||
| 10 | #define _POSIX_PTHREAD_SEMANTICS | ||
| 11 | #endif | ||
| 9 | 12 | ||
| 10 | #include <unistd.h> | 13 | #include <unistd.h> |
| 11 | 14 | ||
| 12 | 15 | ||
| 13 | // We are hot - unistd.h should have turned on the specific APIs we requested | 16 | // We are hot - unistd.h should have turned on the specific APIs we requested |
| 14 | 17 | ||
| 15 | 18 | ||
| 16 | #ifdef QT_THREAD_SUPPORT | 19 | #ifdef QT_THREAD_SUPPORT |
| 17 | #include <thread.h> | 20 | #include <pthread.h> |
| 18 | #endif | 21 | #endif |
| 19 | 22 | ||
| 20 | #include <dirent.h> | 23 | #include <dirent.h> |
| 21 | #include <fcntl.h> | 24 | #include <fcntl.h> |
| 22 | #include <grp.h> | 25 | #include <grp.h> |
| 23 | #include <pwd.h> | 26 | #include <pwd.h> |
| 24 | #include <signal.h> | 27 | #include <signal.h> |
| 28 | #include <dlfcn.h> | ||
| 25 | 29 | ||
| 26 | #include <sys/types.h> | 30 | #include <sys/types.h> |
| 27 | #include <sys/ioctl.h> | 31 | #include <sys/ioctl.h> |
| 28 | #include <sys/filio.h> | 32 | #include <sys/filio.h> |
| 29 | #include <sys/ipc.h> | 33 | #include <sys/ipc.h> |
| 30 | #include <sys/time.h> | 34 | #include <sys/time.h> |
| 31 | #include <sys/shm.h> | 35 | #include <sys/shm.h> |
| 32 | #include <sys/socket.h> | 36 | #include <sys/socket.h> |
| 33 | #include <sys/stat.h> | 37 | #include <sys/stat.h> |
| 34 | #include <sys/wait.h> | 38 | #include <sys/wait.h> |
| 35 | 39 | ||
| 36 | // DNS header files are not fully covered by X/Open specifications. | 40 | // DNS header files are not fully covered by X/Open specifications. |
| 37 | // In particular nothing is said about res_* :/ | 41 | // In particular nothing is said about res_* :/ |
| 38 | // On Solaris header files <netinet/in.h> and <arpa/nameser.h> are not | 42 | // On Solaris header files <netinet/in.h> and <arpa/nameser.h> are not |
| 39 | // included by <resolv.h>. Note that <arpa/nameser.h> must be included | 43 | // included by <resolv.h>. Note that <arpa/nameser.h> must be included |
| 40 | // before <resolv.h>. | 44 | // before <resolv.h>. |
| 41 | #include <netinet/in.h> | 45 | #include <netinet/in.h> |
| 42 | #include <arpa/nameser.h> | 46 | #include <arpa/nameser.h> |
| 43 | #include <resolv.h> | 47 | #include <resolv.h> |
| 44 | 48 | ||
| 45 | 49 | ||
| 50 | #if !defined(QT_NO_COMPAT) | ||
| 46 | #define QT_STATBUF struct stat | 51 | #define QT_STATBUF struct stat |
| 47 | #define QT_STATBUF4TSTATstruct stat | 52 | #define QT_STATBUF4TSTATstruct stat |
| 48 | #define QT_STAT ::stat | 53 | #define QT_STAT ::stat |
| 49 | #define QT_FSTAT ::fstat | 54 | #define QT_FSTAT ::fstat |
| 50 | #define QT_STAT_REG S_IFREG | 55 | #define QT_STAT_REG S_IFREG |
| 51 | #define QT_STAT_DIR S_IFDIR | 56 | #define QT_STAT_DIR S_IFDIR |
| 52 | #define QT_STAT_MASK S_IFMT | 57 | #define QT_STAT_MASK S_IFMT |
| 53 | #define QT_STAT_LNK S_IFLNK | 58 | #define QT_STAT_LNK S_IFLNK |
| 54 | #define QT_FILENO fileno | 59 | #define QT_FILENO fileno |
| 55 | #define QT_OPEN ::open | 60 | #define QT_OPEN ::open |
| 56 | #define QT_CLOSE ::close | 61 | #define QT_CLOSE ::close |
| 57 | #define QT_LSEEK ::lseek | 62 | #define QT_LSEEK ::lseek |
| 58 | #define QT_READ ::read | 63 | #define QT_READ ::read |
| 59 | #define QT_WRITE ::write | 64 | #define QT_WRITE ::write |
| 60 | #define QT_ACCESS ::access | 65 | #define QT_ACCESS ::access |
| 61 | #define QT_GETCWD ::getcwd | 66 | #define QT_GETCWD ::getcwd |
| 62 | #define QT_CHDIR ::chdir | 67 | #define QT_CHDIR ::chdir |
| 63 | #define QT_MKDIR ::mkdir | 68 | #define QT_MKDIR ::mkdir |
| 64 | #define QT_RMDIR ::rmdir | 69 | #define QT_RMDIR ::rmdir |
| 65 | #define QT_OPEN_RDONLY O_RDONLY | 70 | #define QT_OPEN_RDONLY O_RDONLY |
| 66 | #define QT_OPEN_WRONLY O_WRONLY | 71 | #define QT_OPEN_WRONLY O_WRONLY |
| 67 | #define QT_OPEN_RDWR O_RDWR | 72 | #define QT_OPEN_RDWR O_RDWR |
| 68 | #define QT_OPEN_CREAT O_CREAT | 73 | #define QT_OPEN_CREAT O_CREAT |
| 69 | #define QT_OPEN_TRUNC O_TRUNC | 74 | #define QT_OPEN_TRUNC O_TRUNC |
| 70 | #define QT_OPEN_APPEND O_APPEND | 75 | #define QT_OPEN_APPEND O_APPEND |
| 76 | #endif | ||
| 71 | 77 | ||
| 72 | #define QT_SIGNAL_RETTYPEvoid | 78 | #define QT_SIGNAL_RETTYPEvoid |
| 73 | #define QT_SIGNAL_ARGS int | 79 | #define QT_SIGNAL_ARGS int |
| 74 | #define QT_SIGNAL_IGNORESIG_IGN | 80 | #define QT_SIGNAL_IGNORESIG_IGN |
| 75 | 81 | ||
| 76 | // On 64-bit platforms (Solaris 7 and better) sockets use socklen_t. | 82 | // On 64-bit platforms (Solaris 7 and better) sockets use socklen_t. |
| 77 | #define QT_SOCKLEN_T socklen_t | 83 | #define QT_SOCKLEN_T socklen_t |
| 78 | 84 | ||
| 79 | // Supported on 64-bit platforms (Solaris 7 and better). | 85 | // Supported on 64-bit platforms (Solaris 7 and better). |
| 80 | #define QT_SNPRINTF ::snprintf | 86 | #define QT_SNPRINTF ::snprintf |
| 81 | #define QT_VSNPRINTF ::vsnprintf | 87 | #define QT_VSNPRINTF ::vsnprintf |
| 82 | 88 | ||
| 83 | 89 | ||
| 84 | #endif // QPLATFORMDEFS_H | 90 | #endif // QPLATFORMDEFS_H |
diff --git a/mkspecs/solaris-g++/qmake.conf b/mkspecs/solaris-g++/qmake.conf index 21d658f..4035047 100644 --- a/mkspecs/solaris-g++/qmake.conf +++ b/mkspecs/solaris-g++/qmake.conf | |||
| @@ -1,86 +1,88 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for solaris-g++ | 4 | # qmake configuration for solaris-g++ |
| 5 | # | 5 | # |
| 6 | # The X11 header files used to be broken on Solaris until patches were | 6 | # The X11 header files used to be broken on Solaris until patches were |
| 7 | # released in early 2001 for Solaris 2.6, 7, and 8. On Solaris 2.5.1 | 7 | # released in early 2001 for Solaris 2.6, 7, and 8. On Solaris 2.5.1 |
| 8 | # or non-patched systems -fpermissive works around the incompatibility | 8 | # or non-patched systems -fpermissive works around the incompatibility |
| 9 | # between GCC 2.95 or better and Solaris - but we still get warnings | 9 | # between GCC 2.95 or better and Solaris - but we still get warnings |
| 10 | # because we don't use -isystem. | 10 | # because we don't use -isystem. |
| 11 | # | 11 | # |
| 12 | 12 | ||
| 13 | MAKEFILE_GENERATOR= UNIX | 13 | MAKEFILE_GENERATOR= UNIX |
| 14 | TEMPLATE = app | 14 | TEMPLATE = app |
| 15 | CONFIG += qt warn_on release | 15 | CONFIG += qt warn_on release link_prl |
| 16 | 16 | ||
| 17 | QMAKE_CC = gcc | 17 | QMAKE_CC = gcc |
| 18 | QMAKE_LEX = flex | 18 | QMAKE_LEX = flex |
| 19 | QMAKE_LEXFLAGS = | 19 | QMAKE_LEXFLAGS = |
| 20 | QMAKE_YACC = yacc | 20 | QMAKE_YACC = yacc |
| 21 | QMAKE_YACCFLAGS = -d | 21 | QMAKE_YACCFLAGS = -d |
| 22 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) | 22 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 23 | QMAKE_CFLAGS_DEPS= -M | 23 | QMAKE_CFLAGS_DEPS= -M |
| 24 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 24 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 25 | QMAKE_CFLAGS_WARN_OFF= -w | 25 | QMAKE_CFLAGS_WARN_OFF= -w |
| 26 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 26 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 27 | QMAKE_CFLAGS_DEBUG= -g | 27 | QMAKE_CFLAGS_DEBUG= -g |
| 28 | QMAKE_CFLAGS_SHLIB= -fPIC | 28 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 29 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 29 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 30 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 30 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 31 | 31 | ||
| 32 | QMAKE_CXX = g++ | 32 | QMAKE_CXX = g++ |
| 33 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 33 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 34 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 34 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 35 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 35 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 36 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 36 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 37 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 37 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 38 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 38 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 39 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 39 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 40 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 40 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 41 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 41 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 42 | 42 | ||
| 43 | QMAKE_INCDIR = | 43 | QMAKE_INCDIR = |
| 44 | QMAKE_LIBDIR = | 44 | QMAKE_LIBDIR = |
| 45 | QMAKE_INCDIR_X11= /usr/openwin/include | 45 | QMAKE_INCDIR_X11= /usr/openwin/include |
| 46 | QMAKE_LIBDIR_X11= /usr/openwin/lib | 46 | QMAKE_LIBDIR_X11= /usr/openwin/lib |
| 47 | QMAKE_INCDIR_QT = $(QTDIR)/include | 47 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 48 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 48 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 49 | QMAKE_INCDIR_OPENGL= /usr/openwin/include | 49 | QMAKE_INCDIR_OPENGL= /usr/openwin/include |
| 50 | QMAKE_LIBDIR_OPENGL= /usr/openwin/lib | 50 | QMAKE_LIBDIR_OPENGL= /usr/openwin/lib |
| 51 | 51 | ||
| 52 | QMAKE_LINK = g++ | 52 | QMAKE_LINK = g++ |
| 53 | QMAKE_LINK_SHLIB= g++ | 53 | QMAKE_LINK_SHLIB= g++ |
| 54 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 54 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 55 | QMAKE_LFLAGS_RELEASE= | 55 | QMAKE_LFLAGS_RELEASE= |
| 56 | QMAKE_LFLAGS_DEBUG= -g | 56 | QMAKE_LFLAGS_DEBUG= -g |
| 57 | QMAKE_LFLAGS_SHLIB= -shared | 57 | QMAKE_LFLAGS_SHLIB= -shared |
| 58 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 58 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 59 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE | 59 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE |
| 60 | QMAKE_LFLAGS_THREAD= | 60 | QMAKE_LFLAGS_THREAD= |
| 61 | QMAKE_RPATH = -Wl,-R, | 61 | QMAKE_RPATH = -Wl,-R, |
| 62 | 62 | ||
| 63 | QMAKE_LIBS = $(LIBS_EXTRA) | 63 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 64 | QMAKE_LIBS_DYNLOAD= -ldl | 64 | QMAKE_LIBS_DYNLOAD= -ldl |
| 65 | QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl | 65 | QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl |
| 66 | QMAKE_LIBS_X11SM= -lSM -lICE | 66 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 67 | QMAKE_LIBS_NIS = | 67 | QMAKE_LIBS_NIS = |
| 68 | QMAKE_LIBS_QT = -lqt | 68 | QMAKE_LIBS_QT = -lqt |
| 69 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 69 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 70 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 70 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 71 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 71 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 72 | QMAKE_LIBS_THREAD= -lpthread | 72 | QMAKE_LIBS_THREAD= -lpthread -lrt |
| 73 | 73 | ||
| 74 | QMAKE_MOC = $(QTDIR)/bin/moc | 74 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 75 | QMAKE_UIC = $(QTDIR)/bin/uic | 75 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 76 | 76 | ||
| 77 | QMAKE_AR = ar cq | 77 | QMAKE_AR = ar cq |
| 78 | QMAKE_RANLIB = | 78 | QMAKE_RANLIB = |
| 79 | 79 | ||
| 80 | QMAKE_TAR = tar -cf | 80 | QMAKE_TAR = tar -cf |
| 81 | QMAKE_GZIP = gzip -9f | 81 | QMAKE_GZIP = gzip -9f |
| 82 | 82 | ||
| 83 | QMAKE_COPY = cp -f | 83 | QMAKE_COPY = cp -f |
| 84 | QMAKE_MOVE = mv -f | 84 | QMAKE_MOVE = mv -f |
| 85 | QMAKE_DEL_FILE = rm -f | 85 | QMAKE_DEL_FILE = rm -f |
| 86 | QMAKE_DEL_DIR = rmdir | 86 | QMAKE_DEL_DIR = rmdir |
| 87 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 88 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/solaris-g++/qplatformdefs.h b/mkspecs/solaris-g++/qplatformdefs.h index a4ca615..02ab5b4 100644 --- a/mkspecs/solaris-g++/qplatformdefs.h +++ b/mkspecs/solaris-g++/qplatformdefs.h | |||
| @@ -1,110 +1,116 @@ | |||
| 1 | #ifndef QPLATFORMDEFS_H | 1 | #ifndef QPLATFORMDEFS_H |
| 2 | #define QPLATFORMDEFS_H | 2 | #define QPLATFORMDEFS_H |
| 3 | 3 | ||
| 4 | // Get Qt defines/settings | 4 | // Get Qt defines/settings |
| 5 | 5 | ||
| 6 | #include "qglobal.h" | 6 | #include "qglobal.h" |
| 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 | #ifndef _POSIX_PTHREAD_SEMANTICS | ||
| 10 | #define _POSIX_PTHREAD_SEMANTICS | ||
| 11 | #endif | ||
| 9 | 12 | ||
| 10 | #include <unistd.h> | 13 | #include <unistd.h> |
| 11 | 14 | ||
| 12 | 15 | ||
| 13 | // We are hot - unistd.h should have turned on the specific APIs we requested | 16 | // We are hot - unistd.h should have turned on the specific APIs we requested |
| 14 | 17 | ||
| 15 | 18 | ||
| 16 | #ifdef QT_THREAD_SUPPORT | 19 | #ifdef QT_THREAD_SUPPORT |
| 17 | #include <pthread.h> | 20 | #include <pthread.h> |
| 18 | #endif | 21 | #endif |
| 19 | 22 | ||
| 20 | #include <dirent.h> | 23 | #include <dirent.h> |
| 21 | #include <fcntl.h> | 24 | #include <fcntl.h> |
| 22 | #include <grp.h> | 25 | #include <grp.h> |
| 23 | #include <pwd.h> | 26 | #include <pwd.h> |
| 24 | #include <signal.h> | 27 | #include <signal.h> |
| 25 | #include <dlfcn.h> | 28 | #include <dlfcn.h> |
| 26 | 29 | ||
| 27 | #include <sys/types.h> | 30 | #include <sys/types.h> |
| 28 | #include <sys/ioctl.h> | 31 | #include <sys/ioctl.h> |
| 29 | #include <sys/filio.h> | 32 | #include <sys/filio.h> |
| 30 | #include <sys/ipc.h> | 33 | #include <sys/ipc.h> |
| 31 | #include <sys/time.h> | 34 | #include <sys/time.h> |
| 32 | #include <sys/shm.h> | 35 | #include <sys/shm.h> |
| 33 | #include <sys/socket.h> | 36 | #include <sys/socket.h> |
| 34 | #include <sys/stat.h> | 37 | #include <sys/stat.h> |
| 35 | #include <sys/wait.h> | 38 | #include <sys/wait.h> |
| 36 | 39 | ||
| 37 | // DNS header files are not fully covered by X/Open specifications. | 40 | // DNS header files are not fully covered by X/Open specifications. |
| 38 | // In particular nothing is said about res_* :/ | 41 | // In particular nothing is said about res_* :/ |
| 39 | // On Solaris header files <netinet/in.h> and <arpa/nameser.h> are not | 42 | // On Solaris header files <netinet/in.h> and <arpa/nameser.h> are not |
| 40 | // included by <resolv.h>. Note that <arpa/nameser.h> must be included | 43 | // included by <resolv.h>. Note that <arpa/nameser.h> must be included |
| 41 | // before <resolv.h>. | 44 | // before <resolv.h>. |
| 42 | #include <netinet/in.h> | 45 | #include <netinet/in.h> |
| 43 | #include <arpa/nameser.h> | 46 | #include <arpa/nameser.h> |
| 44 | #include <resolv.h> | 47 | #include <resolv.h> |
| 45 | 48 | ||
| 46 | 49 | ||
| 47 | #if !defined(QT_NO_COMPAT) | 50 | #if !defined(QT_NO_COMPAT) |
| 48 | #define QT_STATBUF struct stat | 51 | #define QT_STATBUF struct stat |
| 49 | #define QT_STATBUF4TSTATstruct stat | 52 | #define QT_STATBUF4TSTATstruct stat |
| 50 | #define QT_STAT ::stat | 53 | #define QT_STAT ::stat |
| 51 | #define QT_FSTAT ::fstat | 54 | #define QT_FSTAT ::fstat |
| 52 | #define QT_STAT_REG S_IFREG | 55 | #define QT_STAT_REG S_IFREG |
| 53 | #define QT_STAT_DIR S_IFDIR | 56 | #define QT_STAT_DIR S_IFDIR |
| 54 | #define QT_STAT_MASK S_IFMT | 57 | #define QT_STAT_MASK S_IFMT |
| 55 | #define QT_STAT_LNK S_IFLNK | 58 | #define QT_STAT_LNK S_IFLNK |
| 56 | #define QT_FILENO fileno | 59 | #define QT_FILENO fileno |
| 57 | #define QT_OPEN ::open | 60 | #define QT_OPEN ::open |
| 58 | #define QT_CLOSE ::close | 61 | #define QT_CLOSE ::close |
| 59 | #define QT_LSEEK ::lseek | 62 | #define QT_LSEEK ::lseek |
| 60 | #define QT_READ ::read | 63 | #define QT_READ ::read |
| 61 | #define QT_WRITE ::write | 64 | #define QT_WRITE ::write |
| 62 | #define QT_ACCESS ::access | 65 | #define QT_ACCESS ::access |
| 63 | #define QT_GETCWD ::getcwd | 66 | #define QT_GETCWD ::getcwd |
| 64 | #define QT_CHDIR ::chdir | 67 | #define QT_CHDIR ::chdir |
| 65 | #define QT_MKDIR ::mkdir | 68 | #define QT_MKDIR ::mkdir |
| 66 | #define QT_RMDIR ::rmdir | 69 | #define QT_RMDIR ::rmdir |
| 67 | #define QT_OPEN_RDONLY O_RDONLY | 70 | #define QT_OPEN_RDONLY O_RDONLY |
| 68 | #define QT_OPEN_WRONLY O_WRONLY | 71 | #define QT_OPEN_WRONLY O_WRONLY |
| 69 | #define QT_OPEN_RDWR O_RDWR | 72 | #define QT_OPEN_RDWR O_RDWR |
| 70 | #define QT_OPEN_CREAT O_CREAT | 73 | #define QT_OPEN_CREAT O_CREAT |
| 71 | #define QT_OPEN_TRUNC O_TRUNC | 74 | #define QT_OPEN_TRUNC O_TRUNC |
| 72 | #define QT_OPEN_APPEND O_APPEND | 75 | #define QT_OPEN_APPEND O_APPEND |
| 73 | #endif | 76 | #endif |
| 74 | 77 | ||
| 75 | #define QT_SIGNAL_RETTYPEvoid | 78 | #define QT_SIGNAL_RETTYPEvoid |
| 76 | #define QT_SIGNAL_ARGS int | 79 | #define QT_SIGNAL_ARGS int |
| 77 | #define QT_SIGNAL_IGNORESIG_IGN | 80 | #define QT_SIGNAL_IGNORESIG_IGN |
| 78 | 81 | ||
| 79 | #if !defined(_XOPEN_UNIX) | 82 | #if !defined(_XOPEN_UNIX) |
| 80 | // Function usleep() is in C library but not in header files on Solaris 2.5.1. | 83 | // Function usleep() is defined in C library but not declared in header files |
| 81 | // Not really a surprise, usleep() is specified by XPG4v2 and XPG4v2 is only | 84 | // on Solaris 2.5.1. Not really a surprise, usleep() is specified by XPG4v2 |
| 82 | // supported by Solaris 2.6 and better. | 85 | // and XPG4v2 is only supported by Solaris 2.6 and better. |
| 86 | // Function gethostname() is defined in C library but not declared in <unistd.h> | ||
| 87 | // on Solaris 2.5.1. | ||
| 83 | // So we are trying to detect Solaris 2.5.1 using macro _XOPEN_UNIX which is | 88 | // So we are trying to detect Solaris 2.5.1 using macro _XOPEN_UNIX which is |
| 84 | // not defined by <unistd.h> when XPG4v2 is not supported. | 89 | // not defined by <unistd.h> when XPG4v2 is not supported. |
| 85 | typedef unsigned int useconds_t; | 90 | typedef unsigned int useconds_t; |
| 86 | extern "C" int usleep(useconds_t); | 91 | extern "C" int usleep(useconds_t); |
| 92 | extern "C" int gethostname(char *, int); | ||
| 87 | #endif | 93 | #endif |
| 88 | 94 | ||
| 89 | #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500) && (_XOPEN_VERSION-0 >= 500) | 95 | #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500) && (_XOPEN_VERSION-0 >= 500) |
| 90 | // on Solaris 7 and better with specific feature test macros | 96 | // on Solaris 7 and better with specific feature test macros |
| 91 | #define QT_SOCKLEN_T socklen_t | 97 | #define QT_SOCKLEN_T socklen_t |
| 92 | #elif defined(_XOPEN_SOURCE_EXTENDED) && defined(_XOPEN_UNIX) | 98 | #elif defined(_XOPEN_SOURCE_EXTENDED) && defined(_XOPEN_UNIX) |
| 93 | // on Solaris 2.6 and better with specific feature test macros | 99 | // on Solaris 2.6 and better with specific feature test macros |
| 94 | #define QT_SOCKLEN_T size_t | 100 | #define QT_SOCKLEN_T size_t |
| 95 | #else | 101 | #else |
| 96 | // always this case in practice | 102 | // always this case in practice |
| 97 | #define QT_SOCKLEN_T int | 103 | #define QT_SOCKLEN_T int |
| 98 | #endif | 104 | #endif |
| 99 | 105 | ||
| 100 | #if defined(_XOPEN_UNIX) | 106 | #if defined(_XOPEN_UNIX) |
| 101 | // Supported by Solaris 2.6 and better. XPG4v2 and XPG4v2 is also supported | 107 | // Supported by Solaris 2.6 and better. XPG4v2 and XPG4v2 is also supported |
| 102 | // by Solaris 2.6 and better. So we are trying to detect Solaris 2.6 using | 108 | // by Solaris 2.6 and better. So we are trying to detect Solaris 2.6 using |
| 103 | // macro _XOPEN_UNIX which is not defined by <unistd.h> when XPG4v2 is not | 109 | // macro _XOPEN_UNIX which is not defined by <unistd.h> when XPG4v2 is not |
| 104 | // supported. | 110 | // supported. |
| 105 | #define QT_SNPRINTF ::snprintf | 111 | #define QT_SNPRINTF ::snprintf |
| 106 | #define QT_VSNPRINTF ::vsnprintf | 112 | #define QT_VSNPRINTF ::vsnprintf |
| 107 | #endif | 113 | #endif |
| 108 | 114 | ||
| 109 | 115 | ||
| 110 | #endif // QPLATFORMDEFS_H | 116 | #endif // QPLATFORMDEFS_H |
diff --git a/mkspecs/solaris-kcc/qmake.conf b/mkspecs/solaris-kcc/qmake.conf index e2a523d..231b270 100644 --- a/mkspecs/solaris-kcc/qmake.conf +++ b/mkspecs/solaris-kcc/qmake.conf | |||
| @@ -1,94 +1,94 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for KAI C++ 4.0f for Solaris | 4 | # qmake configuration for KAI C++ 4.0f for Solaris |
| 5 | # | 5 | # |
| 6 | # From the KAI C++ man page for Solaris: | 6 | # From the KAI C++ man page for Solaris: |
| 7 | # --[no_]thread_safe | 7 | # --[no_]thread_safe |
| 8 | # [Waive or] Request thread-safe handling of system-allocated objects. | 8 | # [Waive or] Request thread-safe handling of system-allocated objects. |
| 9 | # To guarantee thread safety, this option must be used when both | 9 | # To guarantee thread safety, this option must be used when both |
| 10 | # compiling and linking. Thread-safe C++ is not link-compatible with | 10 | # compiling and linking. Thread-safe C++ is not link-compatible with |
| 11 | # (the default) non-thread-safe C++. | 11 | # (the default) non-thread-safe C++. |
| 12 | # -mt | 12 | # -mt |
| 13 | # Solaris-only synonym for the portable option --thread_safe. | 13 | # Solaris-only synonym for the portable option --thread_safe. |
| 14 | # -h libname | 14 | # -h libname |
| 15 | # Solaris-only synonym for the portable --soname option. | 15 | # Solaris-only synonym for the portable --soname option. |
| 16 | # | 16 | # |
| 17 | 17 | ||
| 18 | MAKEFILE_GENERATOR= UNIX | 18 | MAKEFILE_GENERATOR= UNIX |
| 19 | TEMPLATE = app | 19 | TEMPLATE = app |
| 20 | CONFIG += qt warn_on release | 20 | CONFIG += qt warn_on release |
| 21 | 21 | ||
| 22 | QMAKE_CC = KCC | 22 | QMAKE_CC = KCC |
| 23 | QMAKE_LEX = flex | 23 | QMAKE_LEX = flex |
| 24 | QMAKE_LEXFLAGS = | 24 | QMAKE_LEXFLAGS = |
| 25 | QMAKE_YACC = yacc | 25 | QMAKE_YACC = yacc |
| 26 | QMAKE_YACCFLAGS = -d | 26 | QMAKE_YACCFLAGS = -d |
| 27 | QMAKE_CFLAGS = --c --display_error_number $(CFLAGS_EXTRA) | 27 | QMAKE_CFLAGS = --c --display_error_number $(CFLAGS_EXTRA) $(CFLAGS_EXTRA) |
| 28 | QMAKE_CFLAGS_DEPS= -M | 28 | QMAKE_CFLAGS_DEPS= -M |
| 29 | QMAKE_CFLAGS_WARN_ON= | 29 | QMAKE_CFLAGS_WARN_ON= |
| 30 | QMAKE_CFLAGS_WARN_OFF= -w | 30 | QMAKE_CFLAGS_WARN_OFF= -w |
| 31 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), +K2) | 31 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), +K2)) |
| 32 | QMAKE_CFLAGS_DEBUG= +K0 | 32 | QMAKE_CFLAGS_DEBUG= +K0 |
| 33 | QMAKE_CFLAGS_SHLIB= -KPIC | 33 | QMAKE_CFLAGS_SHLIB= -KPIC |
| 34 | QMAKE_CFLAGS_YACC= --diag_suppress 111,177 | 34 | QMAKE_CFLAGS_YACC= --diag_suppress 111,177 |
| 35 | QMAKE_CFLAGS_THREAD= -mt | 35 | QMAKE_CFLAGS_THREAD= -mt |
| 36 | 36 | ||
| 37 | QMAKE_CXX = KCC | 37 | QMAKE_CXX = KCC |
| 38 | QMAKE_CXXFLAGS = --display_error_number --diag_suppress 611,1142 $(CXXFLAGS_EXTRA) | 38 | QMAKE_CXXFLAGS = --display_error_number --diag_suppress 611,1142 $(CXXFLAGS_EXTRA) $(CXXFLAGS_EXTRA) |
| 39 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 39 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 40 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 40 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 41 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 41 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 42 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 42 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 43 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 43 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 44 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 44 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 45 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 45 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 46 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 46 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 47 | 47 | ||
| 48 | QMAKE_INCDIR = | 48 | QMAKE_INCDIR = |
| 49 | QMAKE_LIBDIR = | 49 | QMAKE_LIBDIR = |
| 50 | QMAKE_INCDIR_X11= /usr/openwin/include | 50 | QMAKE_INCDIR_X11= /usr/openwin/include |
| 51 | QMAKE_LIBDIR_X11= /usr/openwin/lib | 51 | QMAKE_LIBDIR_X11= /usr/openwin/lib |
| 52 | QMAKE_INCDIR_QT = $(QTDIR)/include | 52 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 53 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 53 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 54 | QMAKE_INCDIR_OPENGL= /usr/openwin/include | 54 | QMAKE_INCDIR_OPENGL= /usr/openwin/include |
| 55 | QMAKE_LIBDIR_OPENGL= /usr/openwin/lib | 55 | QMAKE_LIBDIR_OPENGL= /usr/openwin/lib |
| 56 | 56 | ||
| 57 | QMAKE_LINK = KCC | 57 | QMAKE_LINK = KCC |
| 58 | QMAKE_LINK_SHLIB= KCC | 58 | QMAKE_LINK_SHLIB= KCC |
| 59 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 59 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) $(LFLAGS_EXTRA) |
| 60 | QMAKE_LFLAGS_RELEASE= | 60 | QMAKE_LFLAGS_RELEASE= |
| 61 | QMAKE_LFLAGS_DEBUG= | 61 | QMAKE_LFLAGS_DEBUG= |
| 62 | QMAKE_LFLAGS_SHLIB= | 62 | QMAKE_LFLAGS_SHLIB= |
| 63 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 63 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 64 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE | 64 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE |
| 65 | QMAKE_LFLAGS_THREAD= -mt | 65 | QMAKE_LFLAGS_THREAD= -mt |
| 66 | QMAKE_RPATH = -R$$LITERAL_WHITESPACE | 66 | QMAKE_RPATH = -R$$LITERAL_WHITESPACE |
| 67 | 67 | ||
| 68 | QMAKE_LIBS = $(LIBS_EXTRA) | 68 | QMAKE_LIBS = $(LIBS_EXTRA) $(LIBS_EXTRA) |
| 69 | QMAKE_LIBS_DYNLOAD= -ldl | 69 | QMAKE_LIBS_DYNLOAD= -ldl |
| 70 | QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl | 70 | QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl |
| 71 | QMAKE_LIBS_X11SM= -lSM -lICE | 71 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 72 | QMAKE_LIBS_NIS = | 72 | QMAKE_LIBS_NIS = |
| 73 | QMAKE_LIBS_QT = -lqt | 73 | QMAKE_LIBS_QT = -lqt |
| 74 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 74 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 75 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 75 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 76 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 76 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 77 | QMAKE_LIBS_THREAD= | 77 | QMAKE_LIBS_THREAD= |
| 78 | 78 | ||
| 79 | QMAKE_MOC = $(QTDIR)/bin/moc | 79 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 80 | QMAKE_UIC = $(QTDIR)/bin/uic | 80 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 81 | 81 | ||
| 82 | QMAKE_AR = ar cq | 82 | QMAKE_AR = ar cq |
| 83 | QMAKE_RANLIB = | 83 | QMAKE_RANLIB = |
| 84 | 84 | ||
| 85 | QMAKE_CLEAN = -r $(OBJECTS_DIR)ti_files | 85 | QMAKE_CLEAN = -r $(OBJECTS_DIR)ti_files |
| 86 | 86 | ||
| 87 | QMAKE_TAR = tar -cf | 87 | QMAKE_TAR = tar -cf |
| 88 | QMAKE_GZIP = gzip -9f | 88 | QMAKE_GZIP = gzip -9f |
| 89 | 89 | ||
| 90 | QMAKE_COPY = cp -f | 90 | QMAKE_COPY = cp -f |
| 91 | QMAKE_MOVE = mv -f | 91 | QMAKE_MOVE = mv -f |
| 92 | QMAKE_DEL_FILE = rm -f | 92 | QMAKE_DEL_FILE = rm -f |
| 93 | QMAKE_DEL_DIR = rmdir | 93 | QMAKE_DEL_DIR = rmdir |
| 94 | 94 | ||
diff --git a/mkspecs/tru64-cxx/qmake.conf b/mkspecs/tru64-cxx/qmake.conf index 2a1163a..6e45e8b 100644 --- a/mkspecs/tru64-cxx/qmake.conf +++ b/mkspecs/tru64-cxx/qmake.conf | |||
| @@ -1,79 +1,81 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # tmake configuration for tru64-cxx | 4 | # tmake configuration for tru64-cxx |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 9 | CONFIG += qt warn_on release link_prl plugin_no_soname |
| 10 | 10 | ||
| 11 | QMAKE_CC = cxx | 11 | QMAKE_CC = cxx |
| 12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 17 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= | 18 | QMAKE_CFLAGS_WARN_ON= |
| 19 | QMAKE_CFLAGS_WARN_OFF= | 19 | QMAKE_CFLAGS_WARN_OFF= |
| 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= | 22 | QMAKE_CFLAGS_SHLIB= |
| 23 | QMAKE_CFLAGS_YACC= -Olimit 1000 | 23 | QMAKE_CFLAGS_YACC= -Olimit 1000 |
| 24 | QMAKE_CFLAGS_THREAD= -pthread | 24 | QMAKE_CFLAGS_THREAD= -pthread |
| 25 | 25 | ||
| 26 | QMAKE_CXX = cxx | 26 | QMAKE_CXX = cxx |
| 27 | QMAKE_CXXFLAGS = -x cxx $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 27 | QMAKE_CXXFLAGS = -x cxx $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 28 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 28 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 36 | 36 | ||
| 37 | QMAKE_INCDIR = | 37 | QMAKE_INCDIR = |
| 38 | QMAKE_LIBDIR = | 38 | QMAKE_LIBDIR = |
| 39 | QMAKE_INCDIR_X11= | 39 | QMAKE_INCDIR_X11= |
| 40 | QMAKE_LIBDIR_X11= | 40 | QMAKE_LIBDIR_X11= |
| 41 | QMAKE_INCDIR_QT = $(QTDIR)/include | 41 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 43 | QMAKE_INCDIR_OPENGL= | 43 | QMAKE_INCDIR_OPENGL= |
| 44 | QMAKE_LIBDIR_OPENGL= | 44 | QMAKE_LIBDIR_OPENGL= |
| 45 | 45 | ||
| 46 | QMAKE_LINK = cxx | 46 | QMAKE_LINK = cxx |
| 47 | QMAKE_LINK_SHLIB= cxx | 47 | QMAKE_LINK_SHLIB= cxx |
| 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 49 | QMAKE_LFLAGS_RELEASE= | 49 | QMAKE_LFLAGS_RELEASE= |
| 50 | QMAKE_LFLAGS_DEBUG= | 50 | QMAKE_LFLAGS_DEBUG= |
| 51 | QMAKE_LFLAGS_SHLIB= -shared | 51 | QMAKE_LFLAGS_SHLIB= -shared |
| 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 53 | QMAKE_LFLAGS_THREAD= -pthread | 53 | QMAKE_LFLAGS_THREAD= -pthread |
| 54 | QMAKE_LFLAGS_SONAME= -soname$$LITERAL_WHITESPACE | 54 | QMAKE_LFLAGS_SONAME= -soname$$LITERAL_WHITESPACE |
| 55 | QMAKE_RPATH = -rpath$$LITERAL_WHITESPACE | 55 | QMAKE_RPATH = -rpath$$LITERAL_WHITESPACE |
| 56 | 56 | ||
| 57 | QMAKE_LIBS = $(LIBS_EXTRA) | 57 | QMAKE_LIBS = -lm $(LIBS_EXTRA) |
| 58 | QMAKE_LIBS_DYNLOAD= | 58 | QMAKE_LIBS_DYNLOAD= |
| 59 | QMAKE_LIBS_X11 = -lXext -lX11 -lm | 59 | QMAKE_LIBS_X11 = -lXext -lX11 |
| 60 | QMAKE_LIBS_X11SM= -lSM -lICE | 60 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 61 | QMAKE_LIBS_QT = -lqt | 61 | QMAKE_LIBS_QT = -lqt |
| 62 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 62 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 63 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 63 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 64 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 64 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 65 | QMAKE_LIBS_THREAD= | 65 | QMAKE_LIBS_THREAD= -lrt |
| 66 | 66 | ||
| 67 | QMAKE_MOC = $(QTDIR)/bin/moc | 67 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 68 | QMAKE_UIC = $(QTDIR)/bin/uic | 68 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 69 | 69 | ||
| 70 | QMAKE_AR = ar cqs | 70 | QMAKE_AR = ar cqs |
| 71 | QMAKE_RANLIB = | 71 | QMAKE_RANLIB = |
| 72 | 72 | ||
| 73 | QMAKE_TAR = tar -cf | 73 | QMAKE_TAR = tar -cf |
| 74 | QMAKE_GZIP = gzip -9f | 74 | QMAKE_GZIP = gzip -9f |
| 75 | 75 | ||
| 76 | QMAKE_COPY = cp -f | 76 | QMAKE_COPY = cp -f |
| 77 | QMAKE_MOVE = mv -f | 77 | QMAKE_MOVE = mv -f |
| 78 | QMAKE_DEL_FILE = rm -f | 78 | QMAKE_DEL_FILE = rm -f |
| 79 | QMAKE_DEL_DIR = rmdir | 79 | QMAKE_DEL_DIR = rmdir |
| 80 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 81 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/tru64-g++/qmake.conf b/mkspecs/tru64-g++/qmake.conf index 72b3d58..12447e0 100644 --- a/mkspecs/tru64-g++/qmake.conf +++ b/mkspecs/tru64-g++/qmake.conf | |||
| @@ -1,79 +1,81 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for tru64-g++ | 4 | # qmake configuration for tru64-g++ |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 9 | CONFIG += qt warn_on release link_prl plugin_no_soname |
| 10 | 10 | ||
| 11 | QMAKE_CC = gcc | 11 | QMAKE_CC = gcc |
| 12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 17 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | 19 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= -fPIC | 22 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 24 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 24 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 25 | 25 | ||
| 26 | QMAKE_CXX = g++ | 26 | QMAKE_CXX = g++ |
| 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 28 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 28 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 36 | 36 | ||
| 37 | QMAKE_INCDIR = | 37 | QMAKE_INCDIR = |
| 38 | QMAKE_LIBDIR = | 38 | QMAKE_LIBDIR = |
| 39 | QMAKE_INCDIR_X11= | 39 | QMAKE_INCDIR_X11= |
| 40 | QMAKE_LIBDIR_X11= | 40 | QMAKE_LIBDIR_X11= |
| 41 | QMAKE_INCDIR_QT = $(QTDIR)/include | 41 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 43 | QMAKE_INCDIR_OPENGL= | 43 | QMAKE_INCDIR_OPENGL= |
| 44 | QMAKE_LIBDIR_OPENGL= | 44 | QMAKE_LIBDIR_OPENGL= |
| 45 | 45 | ||
| 46 | QMAKE_LINK = g++ | 46 | QMAKE_LINK = g++ |
| 47 | QMAKE_LINK_SHLIB= g++ | 47 | QMAKE_LINK_SHLIB= g++ |
| 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 49 | QMAKE_LFLAGS_RELEASE= | 49 | QMAKE_LFLAGS_RELEASE= |
| 50 | QMAKE_LFLAGS_DEBUG= | 50 | QMAKE_LFLAGS_DEBUG= |
| 51 | QMAKE_LFLAGS_SHLIB= -shared | 51 | QMAKE_LFLAGS_SHLIB= -shared |
| 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 53 | QMAKE_LFLAGS_THREAD= | 53 | QMAKE_LFLAGS_THREAD= |
| 54 | QMAKE_LFLAGS_SONAME= -Wl,-soname, | 54 | QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 55 | QMAKE_RPATH = -Wl,-rpath, | 55 | QMAKE_RPATH = -Wl,-rpath, |
| 56 | 56 | ||
| 57 | QMAKE_LIBS = $(LIBS_EXTRA) | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 58 | QMAKE_LIBS_DYNLOAD= | 58 | QMAKE_LIBS_DYNLOAD= |
| 59 | QMAKE_LIBS_X11 = -lXext -lX11 -lm | 59 | QMAKE_LIBS_X11 = -lXext -lX11 -lm |
| 60 | QMAKE_LIBS_X11SM= -lSM -lICE | 60 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 61 | QMAKE_LIBS_QT = -lqt | 61 | QMAKE_LIBS_QT = -lqt |
| 62 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 62 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 63 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 63 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 64 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 64 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 65 | QMAKE_LIBS_THREAD= -lpthread -lexc | 65 | QMAKE_LIBS_THREAD= -lpthread -lexc -lrt |
| 66 | 66 | ||
| 67 | QMAKE_MOC = $(QTDIR)/bin/moc | 67 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 68 | QMAKE_UIC = $(QTDIR)/bin/uic | 68 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 69 | 69 | ||
| 70 | QMAKE_AR = ar cqs | 70 | QMAKE_AR = ar cqs |
| 71 | QMAKE_RANLIB = | 71 | QMAKE_RANLIB = |
| 72 | 72 | ||
| 73 | QMAKE_TAR = tar -cf | 73 | QMAKE_TAR = tar -cf |
| 74 | QMAKE_GZIP = gzip -9f | 74 | QMAKE_GZIP = gzip -9f |
| 75 | 75 | ||
| 76 | QMAKE_COPY = cp -f | 76 | QMAKE_COPY = cp -f |
| 77 | QMAKE_MOVE = mv -f | 77 | QMAKE_MOVE = mv -f |
| 78 | QMAKE_DEL_FILE = rm -f | 78 | QMAKE_DEL_FILE = rm -f |
| 79 | QMAKE_DEL_DIR = rmdir | 79 | QMAKE_DEL_DIR = rmdir |
| 80 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 81 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/ultrix-g++/qmake.conf b/mkspecs/ultrix-g++/qmake.conf index d8754c0..01434b4 100644 --- a/mkspecs/ultrix-g++/qmake.conf +++ b/mkspecs/ultrix-g++/qmake.conf | |||
| @@ -1,72 +1,72 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for ultrix-g++ | 4 | # qmake configuration for ultrix-g++ |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 8 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 9 | CONFIG += qt warn_on release |
| 10 | 10 | ||
| 11 | QMAKE_CC = gcc | 11 | QMAKE_CC = gcc |
| 12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) | 16 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 17 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | 19 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)) |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= | 22 | QMAKE_CFLAGS_SHLIB= |
| 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 24 | 24 | ||
| 25 | QMAKE_CXX = g++ | 25 | QMAKE_CXX = g++ |
| 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) $(CXXFLAGS_EXTRA) |
| 27 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 27 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 28 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 28 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 29 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 29 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 30 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 30 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 31 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 31 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 32 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 32 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 33 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 33 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 34 | 34 | ||
| 35 | QMAKE_INCDIR = | 35 | QMAKE_INCDIR = |
| 36 | QMAKE_LIBDIR = | 36 | QMAKE_LIBDIR = |
| 37 | QMAKE_INCDIR_X11= /usr/X11R6/include | 37 | QMAKE_INCDIR_X11= /usr/X11R6/include |
| 38 | QMAKE_LIBDIR_X11= /usr/X11R6/lib | 38 | QMAKE_LIBDIR_X11= /usr/X11R6/lib |
| 39 | QMAKE_INCDIR_QT = $(QTDIR)/include | 39 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 41 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
| 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 42 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
| 43 | 43 | ||
| 44 | QMAKE_LINK = g++ | 44 | QMAKE_LINK = g++ |
| 45 | #QMAKE_LINK_SHLIB= g++ | 45 | #QMAKE_LINK_SHLIB= g++ |
| 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 46 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) $(LFLAGS_EXTRA) |
| 47 | QMAKE_LFLAGS_RELEASE= | 47 | QMAKE_LFLAGS_RELEASE= |
| 48 | QMAKE_LFLAGS_DEBUG= | 48 | QMAKE_LFLAGS_DEBUG= |
| 49 | #QMAKE_LFLAGS_SHLIB= -shared | 49 | #QMAKE_LFLAGS_SHLIB= -shared |
| 50 | #QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 50 | #QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 51 | #QMAKE_LFLAGS_SONAME= -Wl,-soname, | 51 | #QMAKE_LFLAGS_SONAME= -Wl,-soname, |
| 52 | 52 | ||
| 53 | QMAKE_LIBS = $(LIBS_EXTRA) | 53 | QMAKE_LIBS = $(LIBS_EXTRA) $(LIBS_EXTRA) |
| 54 | QMAKE_LIBS_DYNLOAD= -ldl | 54 | QMAKE_LIBS_DYNLOAD= -ldl |
| 55 | QMAKE_LIBS_X11 = -lXext -lX11 -lm | 55 | QMAKE_LIBS_X11 = -lXext -lX11 -lm |
| 56 | QMAKE_LIBS_QT = -lqt | 56 | QMAKE_LIBS_QT = -lqt |
| 57 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 57 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu |
| 58 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 58 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 59 | 59 | ||
| 60 | QMAKE_MOC = $(QTDIR)/bin/moc | 60 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 61 | QMAKE_UIC = $(QTDIR)/bin/uic | 61 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 62 | 62 | ||
| 63 | QMAKE_AR = ar cqs | 63 | QMAKE_AR = ar cqs |
| 64 | QMAKE_RANLIB = | 64 | QMAKE_RANLIB = |
| 65 | 65 | ||
| 66 | QMAKE_TAR = tar -cf | 66 | QMAKE_TAR = tar -cf |
| 67 | QMAKE_GZIP = gzip -9f | 67 | QMAKE_GZIP = gzip -9f |
| 68 | 68 | ||
| 69 | QMAKE_COPY = cp -f | 69 | QMAKE_COPY = cp -f |
| 70 | QMAKE_MOVE = mv -f | 70 | QMAKE_MOVE = mv -f |
| 71 | QMAKE_DEL_FILE = rm -f | 71 | QMAKE_DEL_FILE = rm -f |
| 72 | QMAKE_DEL_DIR = rmdir | 72 | QMAKE_DEL_DIR = rmdir |
diff --git a/mkspecs/unixware-cc/qmake.conf b/mkspecs/unixware-cc/qmake.conf index 5efb1a9..a6f1288 100644 --- a/mkspecs/unixware-cc/qmake.conf +++ b/mkspecs/unixware-cc/qmake.conf | |||
| @@ -1,81 +1,86 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for UnixWare 7 or Open UNIX 8 with UDK or OUDK | 4 | # qmake configuration for unixware-cc |
| 5 | # | ||
| 6 | # Written for UnixWare 7 or Open UNIX 8 with UDK or OUDK. | ||
| 5 | # | 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 |
| 16 | QMAKE_LEXFLAGS = | 18 | QMAKE_LEXFLAGS = |
| 17 | QMAKE_YACC = yacc | 19 | QMAKE_YACC = yacc |
| 18 | QMAKE_YACCFLAGS = -d | 20 | QMAKE_YACCFLAGS = -d |
| 19 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) | 21 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 20 | QMAKE_CFLAGS_WARN_ON= | 22 | QMAKE_CFLAGS_WARN_ON= |
| 21 | QMAKE_CFLAGS_WARN_OFF= -w | 23 | QMAKE_CFLAGS_WARN_OFF= -w |
| 22 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) | 24 | 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 | 28 | QMAKE_CFLAGS_THREAD= -Kthread |
| 27 | 29 | ||
| 28 | QMAKE_CXX = CC | 30 | QMAKE_CXX = CC |
| 29 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -Wf,--display_error_number -Wf,--diag_suppress,838 $(CXXFLAGS_EXTRA) | 31 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -Wf,--display_error_number -Wf,--diag_suppress,838 $(CXXFLAGS_EXTRA) |
| 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 32 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 33 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 32 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE -Tused | 34 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE -Tused |
| 33 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 35 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 34 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 36 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 35 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 37 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 36 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 38 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 37 | 39 | ||
| 38 | QMAKE_INCDIR = | 40 | QMAKE_INCDIR = |
| 39 | QMAKE_LIBDIR = | 41 | QMAKE_LIBDIR = |
| 40 | QMAKE_INCDIR_X11= | 42 | QMAKE_INCDIR_X11= |
| 41 | QMAKE_LIBDIR_X11= /usr/X/lib | 43 | QMAKE_LIBDIR_X11= /usr/X/lib |
| 42 | QMAKE_INCDIR_QT = $(QTDIR)/include | 44 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 43 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 45 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 44 | QMAKE_INCDIR_OPENGL= | 46 | QMAKE_INCDIR_OPENGL= |
| 45 | QMAKE_LIBDIR_OPENGL= | 47 | QMAKE_LIBDIR_OPENGL= |
| 46 | 48 | ||
| 47 | QMAKE_LINK = CC | 49 | QMAKE_LINK = CC |
| 48 | QMAKE_LINK_SHLIB= CC | 50 | QMAKE_LINK_SHLIB= CC |
| 49 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 51 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 50 | QMAKE_LFLAGS_RELEASE= | 52 | QMAKE_LFLAGS_RELEASE= |
| 51 | QMAKE_LFLAGS_DEBUG= | 53 | QMAKE_LFLAGS_DEBUG= |
| 52 | QMAKE_LFLAGS_SHLIB= -G | 54 | QMAKE_LFLAGS_SHLIB= -G |
| 53 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 55 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 54 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE | 56 | QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE |
| 55 | QMAKE_LFLAGS_THREAD= -Kthread | 57 | QMAKE_LFLAGS_THREAD= -Kthread |
| 58 | QMAKE_RPATH = -R | ||
| 56 | 59 | ||
| 57 | QMAKE_LIBS = $(LIBS_EXTRA) | 60 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 58 | QMAKE_LIBS_DYNLOAD= -ldl | 61 | QMAKE_LIBS_DYNLOAD= -ldl |
| 59 | QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm | 62 | QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm |
| 60 | QMAKE_LIBS_X11SM= -lSM -lICE | 63 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 61 | QMAKE_LIBS_QT = -lqt | 64 | QMAKE_LIBS_QT = -lqt |
| 62 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 65 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 63 | 66 | ||
| 64 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt -lSM -lICE | 67 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt |
| 65 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 68 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 66 | 69 | ||
| 67 | QMAKE_LIBS_THREAD= | 70 | QMAKE_LIBS_THREAD= |
| 68 | 71 | ||
| 69 | QMAKE_MOC = $(QTDIR)/bin/moc | 72 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 70 | QMAKE_UIC = $(QTDIR)/bin/uic | 73 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 71 | 74 | ||
| 72 | QMAKE_AR = ar cq | 75 | QMAKE_AR = ar cq |
| 73 | QMAKE_RANLIB = | 76 | QMAKE_RANLIB = |
| 74 | 77 | ||
| 75 | QMAKE_TAR = tar -cf | 78 | QMAKE_TAR = tar -cf |
| 76 | QMAKE_GZIP = gzip -9f | 79 | QMAKE_GZIP = gzip -9f |
| 77 | 80 | ||
| 78 | QMAKE_COPY = cp -f | 81 | QMAKE_COPY = cp -f |
| 79 | QMAKE_MOVE = mv -f | 82 | QMAKE_MOVE = mv -f |
| 80 | QMAKE_DEL_FILE = rm -f | 83 | QMAKE_DEL_FILE = rm -f |
| 81 | QMAKE_DEL_DIR = rmdir | 84 | QMAKE_DEL_DIR = rmdir |
| 85 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 86 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/unixware-g++/qmake.conf b/mkspecs/unixware-g++/qmake.conf index 0298eef..45a351c 100644 --- a/mkspecs/unixware-g++/qmake.conf +++ b/mkspecs/unixware-g++/qmake.conf | |||
| @@ -1,80 +1,83 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for UnixWare 7 or Open UNIX 8 with OSTK | 4 | # qmake configuration for unixware-g++ |
| 5 | # | ||
| 6 | # Written for UnixWare 7 or Open UNIX 8 with OSTK. | ||
| 5 | # | 7 | # |
| 6 | 8 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 9 | MAKEFILE_GENERATOR= UNIX |
| 8 | TEMPLATE = app | 10 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 11 | CONFIG += qt warn_on release link_prl |
| 10 | 12 | ||
| 11 | QMAKE_CC = gcc | 13 | QMAKE_CC = gcc |
| 12 | QMAKE_LEX = flex | 14 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 15 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = yacc | 16 | QMAKE_YACC = yacc |
| 15 | QMAKE_YACCFLAGS = -d | 17 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) | 18 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 19 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 20 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
| 19 | QMAKE_CFLAGS_WARN_OFF= -w | 21 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 22 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 23 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_SHLIB= -fPIC | 24 | QMAKE_CFLAGS_SHLIB= -fPIC |
| 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 25 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 24 | QMAKE_CFLAGS_THREAD= | 26 | QMAKE_CFLAGS_THREAD= |
| 25 | 27 | ||
| 26 | QMAKE_CXX = g++ | 28 | QMAKE_CXX = g++ |
| 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 29 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 28 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 30 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 29 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 31 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 30 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 32 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 31 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 33 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 32 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 34 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 33 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 35 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
| 34 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 36 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 35 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 37 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
| 36 | 38 | ||
| 37 | QMAKE_INCDIR = | 39 | QMAKE_INCDIR = |
| 38 | QMAKE_LIBDIR = | 40 | QMAKE_LIBDIR = |
| 39 | QMAKE_INCDIR_X11= | 41 | QMAKE_INCDIR_X11= |
| 40 | QMAKE_LIBDIR_X11= /usr/X/lib | 42 | QMAKE_LIBDIR_X11= /usr/X/lib |
| 41 | QMAKE_INCDIR_QT = $(QTDIR)/include | 43 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 42 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 44 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| 43 | QMAKE_INCDIR_OPENGL= | 45 | QMAKE_INCDIR_OPENGL= |
| 44 | QMAKE_LIBDIR_OPENGL= | 46 | QMAKE_LIBDIR_OPENGL= |
| 45 | 47 | ||
| 46 | QMAKE_LINK = g++ | 48 | QMAKE_LINK = g++ |
| 47 | QMAKE_LINK_SHLIB= g++ | 49 | QMAKE_LINK_SHLIB= g++ |
| 48 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 50 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
| 49 | QMAKE_LFLAGS_RELEASE= | 51 | QMAKE_LFLAGS_RELEASE= |
| 50 | QMAKE_LFLAGS_DEBUG= | 52 | QMAKE_LFLAGS_DEBUG= |
| 51 | QMAKE_LFLAGS_SHLIB= -shared | 53 | QMAKE_LFLAGS_SHLIB= -shared |
| 52 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 54 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
| 53 | QMAKE_LFLAGS_SONAME= | 55 | QMAKE_LFLAGS_SONAME= |
| 54 | QMAKE_LFLAGS_THREAD= | 56 | QMAKE_LFLAGS_THREAD= |
| 57 | QMAKE_RPATH = -Wl,-R, | ||
| 55 | 58 | ||
| 56 | QMAKE_LIBS = $(LIBS_EXTRA) | 59 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 57 | QMAKE_LIBS_DYNLOAD= -ldl | 60 | QMAKE_LIBS_DYNLOAD= -ldl |
| 58 | QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm | 61 | QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm |
| 59 | QMAKE_LIBS_X11SM= -lSM -lICE | 62 | QMAKE_LIBS_X11SM= -lSM -lICE |
| 60 | QMAKE_LIBS_QT = -lqt | 63 | QMAKE_LIBS_QT = -lqt |
| 61 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 64 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
| 62 | 65 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt | |
| 63 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt -lSM -lICE | ||
| 64 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu | 66 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu |
| 65 | |||
| 66 | QMAKE_LIBS_THREAD= -lthread | 67 | QMAKE_LIBS_THREAD= -lthread |
| 67 | 68 | ||
| 68 | QMAKE_MOC = $(QTDIR)/bin/moc | 69 | QMAKE_MOC = $(QTDIR)/bin/moc |
| 69 | QMAKE_UIC = $(QTDIR)/bin/uic | 70 | QMAKE_UIC = $(QTDIR)/bin/uic |
| 70 | 71 | ||
| 71 | QMAKE_AR = ar cq | 72 | QMAKE_AR = ar cq |
| 72 | QMAKE_RANLIB = | 73 | QMAKE_RANLIB = |
| 73 | 74 | ||
| 74 | QMAKE_TAR = tar -cf | 75 | QMAKE_TAR = tar -cf |
| 75 | QMAKE_GZIP = gzip -9f | 76 | QMAKE_GZIP = gzip -9f |
| 76 | 77 | ||
| 77 | QMAKE_COPY = cp -f | 78 | QMAKE_COPY = cp -f |
| 78 | QMAKE_MOVE = mv -f | 79 | QMAKE_MOVE = mv -f |
| 79 | QMAKE_DEL_FILE = rm -f | 80 | QMAKE_DEL_FILE = rm -f |
| 80 | QMAKE_DEL_DIR = rmdir | 81 | QMAKE_DEL_DIR = rmdir |
| 82 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 83 | QMAKE_MKDIR = mkdir -p | ||
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,97 +1,107 @@ | |||
| 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 | } |
| 16 | 18 | ||
| 17 | QMAKE_CC = bcc32 | 19 | QMAKE_CC = bcc32 |
| 18 | QMAKE_LEX = flex | 20 | QMAKE_LEX = flex |
| 19 | QMAKE_LEXFLAGS = | 21 | QMAKE_LEXFLAGS = |
| 20 | QMAKE_YACC = byacc | 22 | QMAKE_YACC = byacc |
| 21 | QMAKE_YACCFLAGS = -d | 23 | QMAKE_YACCFLAGS = -d |
| 22 | QMAKE_CFLAGS = -tWR $(CFLAGS_EXTRA) | 24 | QMAKE_CFLAGS = -tWR $(CFLAGS_EXTRA) |
| 23 | QMAKE_CFLAGS_WARN_ON= -w -w-hid | 25 | QMAKE_CFLAGS_WARN_ON= -w -w-hid |
| 24 | QMAKE_CFLAGS_WARN_OFF= -w- | 26 | QMAKE_CFLAGS_WARN_OFF= -w- |
| 25 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) | 27 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 26 | QMAKE_CFLAGS_DEBUG= -v | 28 | 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 |
| 46 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 47 | 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 | ||
| 59 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o$obj $src | 66 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o$obj $src |
| 60 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -o$@ $< | 67 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -o$@ $< |
| 61 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$obj $src | 68 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$obj $src |
| 62 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$@ $< | 69 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$@ $< |
| 63 | 70 | ||
| 64 | QMAKE_LINK = ilink32 | 71 | QMAKE_LINK = ilink32 |
| 65 | QMAKE_LFLAGS = -c -x -Gn $(LFLAGS_EXTRA) | 72 | QMAKE_LFLAGS = -c -x -Gn $(LFLAGS_EXTRA) |
| 66 | QMAKE_LFLAGS_RELEASE= | 73 | 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 |
| 80 | QMAKE_LIBS_QT_ENTRY= qtmain.lib | 87 | QMAKE_LIBS_QT_ENTRY= qtmain.lib |
| 81 | 88 | ||
| 82 | QMAKE_LIBS_OPENGL= | 89 | QMAKE_LIBS_OPENGL= |
| 83 | QMAKE_LFLAGS_OPENGL= /dopengl32.dll | 90 | QMAKE_LFLAGS_OPENGL= /dopengl32.dll |
| 84 | 91 | ||
| 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 | |||
| @@ -1,140 +1,154 @@ | |||
| 1 | #ifndef QPLATFORMDEFS_H | 1 | #ifndef QPLATFORMDEFS_H |
| 2 | #define QPLATFORMDEFS_H | 2 | #define QPLATFORMDEFS_H |
| 3 | 3 | ||
| 4 | #ifdef UNICODE | 4 | #ifdef UNICODE |
| 5 | #ifndef _UNICODE | 5 | #ifndef _UNICODE |
| 6 | #define _UNICODE | 6 | #define _UNICODE |
| 7 | #endif | 7 | #endif |
| 8 | #endif | 8 | #endif |
| 9 | 9 | ||
| 10 | // Get Qt defines/settings | 10 | // Get Qt defines/settings |
| 11 | 11 | ||
| 12 | #include "qglobal.h" | 12 | #include "qglobal.h" |
| 13 | #define Q_FS_FAT | 13 | #define Q_FS_FAT |
| 14 | 14 | ||
| 15 | #define _POSIX_ | 15 | #define _POSIX_ |
| 16 | #include <limits.h> | 16 | #include <limits.h> |
| 17 | #undef _POSIX_ | 17 | #undef _POSIX_ |
| 18 | 18 | ||
| 19 | #include <tchar.h> | 19 | #include <tchar.h> |
| 20 | #include <io.h> | 20 | #include <io.h> |
| 21 | #include <direct.h> | 21 | #include <direct.h> |
| 22 | #include <stdio.h> | 22 | #include <stdio.h> |
| 23 | #include <fcntl.h> | 23 | #include <fcntl.h> |
| 24 | #include <errno.h> | 24 | #include <errno.h> |
| 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 |
| 135 | # define X_OK1 | 149 | # define X_OK1 |
| 136 | # define W_OK2 | 150 | # define W_OK2 |
| 137 | # define R_OK4 | 151 | # define R_OK4 |
| 138 | 152 | ||
| 139 | 153 | ||
| 140 | #endif // QPLATFORMDEFS_H | 154 | #endif // QPLATFORMDEFS_H |
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf index 4bc603c..1347c44 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf | |||
| @@ -1,70 +1,98 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for Win32/g++ (Cygnus gnu-win32) | 4 | # qmake configuration for win32-g++ |
| 5 | # | ||
| 6 | # Written for MinGW | ||
| 5 | # | 7 | # |
| 6 | 8 | ||
| 7 | MAKEFILE_GENERATOR= UNIX | 9 | MAKEFILE_GENERATOR= MINGW |
| 8 | TEMPLATE = app | 10 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release | 11 | CONFIG += qt warn_on release link_prl |
| 12 | DEFINES += UNICODE | ||
| 13 | |||
| 14 | exists( $(QTDIR)\.qtwinconfig ) { | ||
| 15 | include( $(QTDIR)\.qtwinconfig ) | ||
| 16 | } | ||
| 10 | 17 | ||
| 11 | QMAKE_CC = gcc | 18 | QMAKE_CC = gcc |
| 12 | QMAKE_LEX = flex | 19 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 20 | QMAKE_LEXFLAGS = |
| 14 | QMAKE_YACC = byacc | 21 | QMAKE_YACC = byacc |
| 15 | QMAKE_YACCFLAGS = -d | 22 | QMAKE_YACCFLAGS = -d |
| 16 | QMAKE_CFLAGS = -fvtable-thunks $(CFLAGS_EXTRA) | 23 | QMAKE_CFLAGS = $(CFLAGS_EXTRA) |
| 17 | QMAKE_CFLAGS_DEPS= -M | 24 | QMAKE_CFLAGS_DEPS= -M |
| 18 | QMAKE_CFLAGS_WARN_ON= | 25 | QMAKE_CFLAGS_WARN_ON= -Wall |
| 19 | QMAKE_CFLAGS_WARN_OFF= | 26 | QMAKE_CFLAGS_WARN_OFF= -w |
| 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O) | 27 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) |
| 21 | QMAKE_CFLAGS_DEBUG= -g | 28 | QMAKE_CFLAGS_DEBUG= -g |
| 22 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 29 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
| 30 | QMAKE_CFLAGS_THREAD= -mthreads | ||
| 31 | QMAKE_CFLAGS_RTTI_ON= -frtti | ||
| 32 | QMAKE_CFLAGS_RTTI_OFF= -fno-rtti | ||
| 33 | QMAKE_CFLAGS_EXCEPTIONS_ON = -fexceptions | ||
| 34 | QMAKE_CFLAGS_EXCEPTIONS_OFF = -fno-exceptions | ||
| 23 | 35 | ||
| 24 | QMAKE_CXX = g++ | 36 | QMAKE_CXX = g++ |
| 25 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 37 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 26 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 38 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
| 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 39 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 28 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 40 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 29 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 41 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 30 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 42 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 31 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 43 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 44 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | ||
| 45 | QMAKE_CXXFLAGS_RTTI_ON= $$QMAKE_CFLAGS_RTTI_ON | ||
| 46 | QMAKE_CXXFLAGS_RTTI_OFF= $$QMAKE_CFLAGS_RTTI_OFF | ||
| 47 | QMAKE_CXXFLAGS_EXCEPTIONS_ON = $$QMAKE_CFLAGS_EXCEPTIONS_ON | ||
| 48 | QMAKE_CXXFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF | ||
| 32 | 49 | ||
| 33 | QMAKE_INCDIR = | 50 | QMAKE_INCDIR = |
| 34 | QMAKE_INCDIR_QT = $(QTDIR)/include | 51 | QMAKE_INCDIR_QT = $(QTDIR)\include |
| 52 | QMAKE_LIBDIR_QT = $(QTDIR)\lib | ||
| 35 | 53 | ||
| 36 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src | 54 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src |
| 37 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< | 55 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< |
| 38 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src | 56 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src |
| 39 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 57 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
| 40 | 58 | ||
| 41 | QMAKE_LINK = g++ | 59 | QMAKE_LINK = g++ |
| 42 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 60 | QMAKE_LFLAGS = -Wl,-enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc $(LFLAGS_EXTRA) |
| 43 | QMAKE_LFLAGS_RELEASE= | 61 | QMAKE_LFLAGS_RELEASE= -Wl,-s |
| 44 | QMAKE_LFLAGS_DEBUG= | 62 | QMAKE_LFLAGS_DEBUG= |
| 63 | QMAKE_LFLAGS_THREAD= -mthreads | ||
| 45 | QMAKE_LFLAGS_CONSOLE= -Wl,-subsystem,console | 64 | QMAKE_LFLAGS_CONSOLE= -Wl,-subsystem,console |
| 46 | QMAKE_LFLAGS_WINDOWS= -Wl,-subsystem,windows | 65 | QMAKE_LFLAGS_WINDOWS= -Wl,-subsystem,windows -e __Z19QtWinMainCRTStartupv |
| 47 | QMAKE_LFLAGS_CONSOLE_DLL= -Wl,-subsystem,console | 66 | QMAKE_LFLAGS_CONSOLE_DLL= -Wl,-subsystem,console -shared -Wl,--export-all-symbols |
| 48 | QMAKE_LFLAGS_WINDOWS_DLL= -Wl,-subsystem,windows | 67 | QMAKE_LFLAGS_WINDOWS_DLL= -Wl,-subsystem,windows -shared -Wl,--export-all-symbols |
| 68 | QMAKE_LINK_OBJECT_MAX= 10 | ||
| 69 | QMAKE_LINK_OBJECT_SCRIPT= object_ld_script | ||
| 70 | QMAKE_LINK_OBJMOC_SCRIPT= objmoc_ld_script | ||
| 49 | 71 | ||
| 50 | QMAKE_LIBS = $(LIBS_EXTRA) | 72 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 51 | QMAKE_LIBS_CONSOLE= | 73 | QMAKE_LIBS_CONSOLE= |
| 52 | QMAKE_LIBS_WINDOWS= -luser32 -lgdi32 -lcomdlg32 -lwinmm -limm32 -lole32 -luuid -lwsock32 | 74 | QMAKE_LIBS_WINDOWS= -lkernel32 -luser32 -lgdi32 -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -limm32 -lwinmm -lwsock32 -lwinspool |
| 53 | QMAKE_LIBS_QT = -L$(QTDIR)/lib -lqt | 75 | QMAKE_LIBS_QT = -lqt |
| 76 | QMAKE_LIBS_QT_THREAD= -lqt-mt | ||
| 54 | QMAKE_LIBS_QT_ENTRY= -lqtmain | 77 | QMAKE_LIBS_QT_ENTRY= -lqtmain |
| 55 | 78 | ||
| 56 | QMAKE_LIBS_OPENGL= -lopengl32 | 79 | QMAKE_LIBS_OPENGL= -lopengl32 -lglu32 |
| 57 | 80 | ||
| 58 | QMAKE_MOC = $(QTDIR)/bin/moc.exe | 81 | QMAKE_MOC = $(QTDIR)\bin\moc.exe |
| 59 | QMAKE_UIC = $(QTDIR)/bin/uic.exe | 82 | QMAKE_UIC = $(QTDIR)\bin\uic.exe |
| 60 | QMAKE_IDC = $(QTDIR)/bin/idc.exe | 83 | QMAKE_IDC = $(QTDIR)\bin\idc.exe |
| 61 | 84 | ||
| 62 | QMAKE_AR = ar cqs | 85 | QMAKE_IDL = midl |
| 63 | QMAKE_RANLIB = | 86 | QMAKE_LIB = ar -ru |
| 87 | QMAKE_RC = windres | ||
| 64 | 88 | ||
| 65 | QMAKE_ZIP = zip -r -9 | 89 | QMAKE_ZIP = zip -r -9 |
| 66 | 90 | ||
| 67 | QMAKE_COPY = copy | 91 | QMAKE_COPY = copy |
| 68 | QMAKE_MOVE = move | 92 | QMAKE_MOVE = move |
| 69 | QMAKE_DEL_FILE = del | 93 | QMAKE_DEL_FILE = del |
| 70 | QMAKE_DEL_DIR = deltree | 94 | QMAKE_DEL_DIR = rmdir |
| 95 | QMAKE_STRIP = strip | ||
| 96 | QMAKE_STRIPFLAGS_LIB += --strip-unneeded | ||
| 97 | QMAKE_CHK_DIR_EXISTS= if not exist | ||
| 98 | QMAKE_MKDIR = mkdir | ||
diff --git a/mkspecs/win32-g++/qplatformdefs.h b/mkspecs/win32-g++/qplatformdefs.h new file mode 100644 index 0000000..9f4d318 --- a/dev/null +++ b/mkspecs/win32-g++/qplatformdefs.h | |||
| @@ -0,0 +1,96 @@ | |||
| 1 | #ifndef QPLATFORMDEFS_H | ||
| 2 | #define QPLATFORMDEFS_H | ||
| 3 | |||
| 4 | #ifdef UNICODE | ||
| 5 | #ifndef _UNICODE | ||
| 6 | #define _UNICODE | ||
| 7 | #endif | ||
| 8 | #endif | ||
| 9 | |||
| 10 | // Get Qt defines/settings | ||
| 11 | |||
| 12 | #include "qglobal.h" | ||
| 13 | |||
| 14 | #include <tchar.h> | ||
| 15 | #include <io.h> | ||
| 16 | #include <direct.h> | ||
| 17 | #include <stdio.h> | ||
| 18 | #include <fcntl.h> | ||
| 19 | #include <errno.h> | ||
| 20 | #include <sys/stat.h> | ||
| 21 | #include <stdlib.h> | ||
| 22 | #include <windows.h> | ||
| 23 | |||
| 24 | #if !defined(_WIN32_WINNT) || (_WIN32_WINNT-0 < 0x0500) | ||
| 25 | typedef enum { | ||
| 26 | NameUnknown = 0, | ||
| 27 | NameFullyQualifiedDN = 1, | ||
| 28 | NameSamCompatible = 2, | ||
| 29 | NameDisplay = 3, | ||
| 30 | NameUniqueId = 6, | ||
| 31 | NameCanonical = 7, | ||
| 32 | NameUserPrincipal = 8, | ||
| 33 | NameCanonicalEx = 9, | ||
| 34 | NameServicePrincipal = 10, | ||
| 35 | NameDnsDomain = 12 | ||
| 36 | } EXTENDED_NAME_FORMAT, *PEXTENDED_NAME_FORMAT; | ||
| 37 | #endif | ||
| 38 | |||
| 39 | #define Q_FS_FAT | ||
| 40 | #ifdef QT_LARGEFILE_SUPPORT | ||
| 41 | #define QT_STATBUF struct _stati64 // non-ANSI defs | ||
| 42 | #define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs | ||
| 43 | #define QT_STAT ::_stati64 | ||
| 44 | #define QT_FSTAT ::_fstati64 | ||
| 45 | #else | ||
| 46 | #define QT_STATBUF struct _stat // non-ANSI defs | ||
| 47 | #define QT_STATBUF4TSTAT struct _stat // non-ANSI defs | ||
| 48 | #define QT_STAT ::_stat | ||
| 49 | #define QT_FSTAT ::_fstat | ||
| 50 | #endif | ||
| 51 | #define QT_STAT_REG _S_IFREG | ||
| 52 | #define QT_STAT_DIR _S_IFDIR | ||
| 53 | #define QT_STAT_MASK _S_IFMT | ||
| 54 | #if defined(_S_IFLNK) | ||
| 55 | # define QT_STAT_LNK _S_IFLNK | ||
| 56 | #endif | ||
| 57 | #define QT_FILENO _fileno | ||
| 58 | #define QT_OPEN ::_open | ||
| 59 | #define QT_CLOSE ::_close | ||
| 60 | #ifdef QT_LARGEFILE_SUPPORT | ||
| 61 | #define QT_LSEEK ::_lseeki64 | ||
| 62 | #define QT_TSTAT ::_tstati64 | ||
| 63 | #else | ||
| 64 | #define QT_LSEEK ::_lseek | ||
| 65 | #define QT_TSTAT ::_tstat | ||
| 66 | #endif | ||
| 67 | #define QT_READ ::_read | ||
| 68 | #define QT_WRITE ::_write | ||
| 69 | #define QT_ACCESS ::_access | ||
| 70 | #define QT_GETCWD ::_getcwd | ||
| 71 | #define QT_CHDIR ::_chdir | ||
| 72 | #define QT_MKDIR ::_mkdir | ||
| 73 | #define QT_RMDIR ::_rmdir | ||
| 74 | #define QT_OPEN_RDONLY _O_RDONLY | ||
| 75 | #define QT_OPEN_WRONLY _O_WRONLY | ||
| 76 | #define QT_OPEN_RDWR _O_RDWR | ||
| 77 | #define QT_OPEN_CREAT _O_CREAT | ||
| 78 | #define QT_OPEN_TRUNC _O_TRUNC | ||
| 79 | #define QT_OPEN_APPEND _O_APPEND | ||
| 80 | #if defined(O_TEXT) | ||
| 81 | # define QT_OPEN_TEXT _O_TEXT | ||
| 82 | # define QT_OPEN_BINARY _O_BINARY | ||
| 83 | #endif | ||
| 84 | |||
| 85 | #define QT_SIGNAL_ARGS int | ||
| 86 | |||
| 87 | #define QT_VSNPRINTF ::_vsnprintf | ||
| 88 | #define QT_SNPRINTF ::_snprintf | ||
| 89 | |||
| 90 | # define F_OK0 | ||
| 91 | # define X_OK1 | ||
| 92 | # define W_OK2 | ||
| 93 | # define R_OK4 | ||
| 94 | |||
| 95 | |||
| 96 | #endif // QPLATFORMDEFS_H | ||
diff --git a/mkspecs/win32-g++/qtcrtentrypoint.cpp b/mkspecs/win32-g++/qtcrtentrypoint.cpp new file mode 100644 index 0000000..87b7bcc --- a/dev/null +++ b/mkspecs/win32-g++/qtcrtentrypoint.cpp | |||
| @@ -0,0 +1,231 @@ | |||
| 1 | |||
| 2 | //This code is need to get the WinMain function called. Current MinGW runtimes tries to call main | ||
| 3 | //before WinMain. Untill such time as MinGw runtime has been changed this is need. | ||
| 4 | //Most of this code is taken from the MinGw runtime sources. | ||
| 5 | |||
| 6 | |||
| 7 | #include <signal.h> | ||
| 8 | #include <process.h> | ||
| 9 | #include <float.h> | ||
| 10 | #include <io.h> | ||
| 11 | |||
| 12 | |||
| 13 | /* | ||
| 14 | * Setup the default file handles to have the _CRT_fmode mode, as well as | ||
| 15 | * any new files created by the user. | ||
| 16 | */ | ||
| 17 | |||
| 18 | extern int _fmode; | ||
| 19 | extern "C" int* __p__fmode(void); /* To access the dll _fmode */ | ||
| 20 | extern int _CRT_fmode; | ||
| 21 | |||
| 22 | static void _mingw32_init_fmode () | ||
| 23 | { | ||
| 24 | /* Don't set the std file mode if the user hasn't set any value for it. */ | ||
| 25 | if (_CRT_fmode) | ||
| 26 | { | ||
| 27 | _fmode = _CRT_fmode; | ||
| 28 | |||
| 29 | /* | ||
| 30 | * This overrides the default file mode settings for stdin, | ||
| 31 | * stdout and stderr. At first I thought you would have to | ||
| 32 | * test with isatty, but it seems that the DOS console at | ||
| 33 | * least is smart enough to handle _O_BINARY stdout and | ||
| 34 | * still display correctly. | ||
| 35 | */ | ||
| 36 | if (stdin) | ||
| 37 | { | ||
| 38 | _setmode (_fileno (stdin), _CRT_fmode); | ||
| 39 | } | ||
| 40 | if (stdout) | ||
| 41 | { | ||
| 42 | _setmode (_fileno (stdout), _CRT_fmode); | ||
| 43 | } | ||
| 44 | if (stderr) | ||
| 45 | { | ||
| 46 | _setmode (_fileno (stderr), _CRT_fmode); | ||
| 47 | } | ||
| 48 | } | ||
| 49 | |||
| 50 | /* Now sync the dll _fmode to the one for this .exe. */ | ||
| 51 | *__p__fmode() = _fmode; | ||
| 52 | |||
| 53 | } | ||
| 54 | |||
| 55 | /* This function will be called when a trap occurs. Thanks to Jacob | ||
| 56 | Navia for his contribution. */ | ||
| 57 | static CALLBACK long _gnu_exception_handler (EXCEPTION_POINTERS * exception_data) | ||
| 58 | { | ||
| 59 | void (*old_handler) (int); | ||
| 60 | long action = EXCEPTION_CONTINUE_SEARCH; | ||
| 61 | int reset_fpu = 0; | ||
| 62 | |||
| 63 | switch (exception_data->ExceptionRecord->ExceptionCode) | ||
| 64 | { | ||
| 65 | case EXCEPTION_ACCESS_VIOLATION: | ||
| 66 | /* test if the user has set SIGSEGV */ | ||
| 67 | old_handler = signal (SIGSEGV, SIG_DFL); | ||
| 68 | if (old_handler == SIG_IGN) | ||
| 69 | { | ||
| 70 | /* this is undefined if the signal was raised by anything other | ||
| 71 | than raise (). */ | ||
| 72 | signal (SIGSEGV, SIG_IGN); | ||
| 73 | action = EXCEPTION_CONTINUE_EXECUTION; | ||
| 74 | } | ||
| 75 | else if (old_handler != SIG_DFL) | ||
| 76 | { | ||
| 77 | /* This means 'old' is a user defined function. Call it */ | ||
| 78 | (*old_handler) (SIGSEGV); | ||
| 79 | action = EXCEPTION_CONTINUE_EXECUTION; | ||
| 80 | } | ||
| 81 | break; | ||
| 82 | |||
| 83 | case EXCEPTION_FLT_INVALID_OPERATION: | ||
| 84 | case EXCEPTION_FLT_DIVIDE_BY_ZERO: | ||
| 85 | case EXCEPTION_FLT_DENORMAL_OPERAND: | ||
| 86 | case EXCEPTION_FLT_OVERFLOW: | ||
| 87 | case EXCEPTION_FLT_UNDERFLOW: | ||
| 88 | case EXCEPTION_FLT_INEXACT_RESULT: | ||
| 89 | reset_fpu = 1; | ||
| 90 | /* fall through. */ | ||
| 91 | |||
| 92 | case EXCEPTION_INT_DIVIDE_BY_ZERO: | ||
| 93 | /* test if the user has set SIGFPE */ | ||
| 94 | old_handler = signal (SIGFPE, SIG_DFL); | ||
| 95 | if (old_handler == SIG_IGN) | ||
| 96 | { | ||
| 97 | signal (SIGFPE, SIG_IGN); | ||
| 98 | if (reset_fpu) | ||
| 99 | _fpreset (); | ||
| 100 | action = EXCEPTION_CONTINUE_EXECUTION; | ||
| 101 | } | ||
| 102 | else if (old_handler != SIG_DFL) | ||
| 103 | { | ||
| 104 | /* This means 'old' is a user defined function. Call it */ | ||
| 105 | (*old_handler) (SIGFPE); | ||
| 106 | action = EXCEPTION_CONTINUE_EXECUTION; | ||
| 107 | } | ||
| 108 | break; | ||
| 109 | |||
| 110 | default: | ||
| 111 | break; | ||
| 112 | } | ||
| 113 | return action; | ||
| 114 | } | ||
| 115 | |||
| 116 | |||
| 117 | extern char __RUNTIME_PSEUDO_RELOC_LIST__; | ||
| 118 | extern char __RUNTIME_PSEUDO_RELOC_LIST_END__; | ||
| 119 | extern char _image_base__; | ||
| 120 | |||
| 121 | typedef struct { | ||
| 122 | DWORD addend; | ||
| 123 | DWORD target; | ||
| 124 | } runtime_pseudo_reloc; | ||
| 125 | |||
| 126 | static void do_pseudo_reloc (void* start, void* end, void* base) | ||
| 127 | { | ||
| 128 | DWORD reloc_target; | ||
| 129 | runtime_pseudo_reloc* r; | ||
| 130 | for (r = (runtime_pseudo_reloc*) start; r < (runtime_pseudo_reloc*) end; r++) { | ||
| 131 | reloc_target = (DWORD) base + r->target; | ||
| 132 | *((DWORD*) reloc_target) += r->addend; | ||
| 133 | } | ||
| 134 | } | ||
| 135 | |||
| 136 | void _pei386_runtime_relocator () | ||
| 137 | { | ||
| 138 | do_pseudo_reloc (&__RUNTIME_PSEUDO_RELOC_LIST__, | ||
| 139 | &__RUNTIME_PSEUDO_RELOC_LIST_END__, | ||
| 140 | &_image_base__); | ||
| 141 | } | ||
| 142 | |||
| 143 | |||
| 144 | #ifdef __MSVCRT__ | ||
| 145 | #define __UNKNOWN_APP 0 | ||
| 146 | #define __CONSOLE_APP 1 | ||
| 147 | #define __GUI_APP 2 | ||
| 148 | extern "C" void __set_app_type(int); | ||
| 149 | #endif /* __MSVCRT__ */ | ||
| 150 | |||
| 151 | #define ISSPACE(a)(a == ' ' || a == '\t') | ||
| 152 | |||
| 153 | int QtWinMainCRTStartup() | ||
| 154 | { | ||
| 155 | #ifdef __MSVCRT__ | ||
| 156 | __set_app_type (__GUI_APP); | ||
| 157 | #endif | ||
| 158 | |||
| 159 | SetUnhandledExceptionFilter (_gnu_exception_handler); | ||
| 160 | |||
| 161 | /* | ||
| 162 | * Initialize floating point unit. | ||
| 163 | */ | ||
| 164 | _fpreset (); /* Supplied by the runtime library. */ | ||
| 165 | |||
| 166 | /* | ||
| 167 | * Sets the default file mode. | ||
| 168 | * If _CRT_fmode is set, also set mode for stdin, stdout | ||
| 169 | * and stderr, as well | ||
| 170 | * NOTE: DLLs don't do this because that would be rude! | ||
| 171 | */ | ||
| 172 | _mingw32_init_fmode (); | ||
| 173 | |||
| 174 | /* Adust references to dllimported data that have non-zero offsets. */ | ||
| 175 | _pei386_runtime_relocator (); | ||
| 176 | |||
| 177 | char *szCmd; | ||
| 178 | STARTUPINFO startinfo; | ||
| 179 | int nRet; | ||
| 180 | |||
| 181 | /* Get the command line passed to the process. */ | ||
| 182 | szCmd = GetCommandLineA (); | ||
| 183 | GetStartupInfo (&startinfo); | ||
| 184 | |||
| 185 | /* Strip off the name of the application and any leading | ||
| 186 | * whitespace. */ | ||
| 187 | if (szCmd) { | ||
| 188 | |||
| 189 | while (ISSPACE (*szCmd)) { | ||
| 190 | szCmd++; | ||
| 191 | } | ||
| 192 | |||
| 193 | /* On my system I always get the app name enclosed | ||
| 194 | * in quotes... */ | ||
| 195 | if (*szCmd == '\"') { | ||
| 196 | do { | ||
| 197 | szCmd++; | ||
| 198 | } while (*szCmd != '\"' && *szCmd != '\0'); | ||
| 199 | |||
| 200 | if (*szCmd == '\"') { | ||
| 201 | szCmd++; | ||
| 202 | } | ||
| 203 | } else { | ||
| 204 | /* If no quotes then assume first token is program | ||
| 205 | * name. */ | ||
| 206 | while (!ISSPACE (*szCmd) && *szCmd != '\0') { | ||
| 207 | szCmd++; | ||
| 208 | } | ||
| 209 | } | ||
| 210 | |||
| 211 | while (ISSPACE (*szCmd)) { | ||
| 212 | szCmd++; | ||
| 213 | } | ||
| 214 | } | ||
| 215 | |||
| 216 | nRet = WinMain (GetModuleHandle (NULL), NULL, szCmd, | ||
| 217 | (startinfo.dwFlags & STARTF_USESHOWWINDOW) ? | ||
| 218 | startinfo.wShowWindow : SW_SHOWDEFAULT); | ||
| 219 | |||
| 220 | /* | ||
| 221 | * Perform exit processing for the C library. This means | ||
| 222 | * flushing output and calling 'atexit' registered functions. | ||
| 223 | */ | ||
| 224 | _cexit (); | ||
| 225 | |||
| 226 | ExitProcess (nRet); | ||
| 227 | |||
| 228 | return 0; | ||
| 229 | |||
| 230 | } | ||
| 231 | |||
diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf index f7b43b9..088c7f5 100644 --- a/mkspecs/win32-icc/qmake.conf +++ b/mkspecs/win32-icc/qmake.conf | |||
| @@ -1,99 +1,106 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for Win32/Intel C++ | 4 | # qmake configuration for win32-icc |
| 5 | # | ||
| 6 | # Written for Intel C++ 5.0.1, 6.0.1, and 7.0 for Windows. | ||
| 5 | # | 7 | # |
| 6 | 8 | ||
| 7 | MAKEFILE_GENERATOR= MSVC | 9 | MAKEFILE_GENERATOR= MSVC |
| 8 | TEMPLATE = app | 10 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release incremental | 11 | CONFIG += qt warn_on release incremental link_prl |
| 10 | DEFINES += UNICODE | 12 | DEFINES += UNICODE |
| 11 | 13 | ||
| 12 | exists( $(QTDIR)\.qtwinconfig ) { | 14 | exists( $(QTDIR)\.qtwinconfig ) { |
| 13 | include( $(QTDIR)\.qtwinconfig ) | 15 | include( $(QTDIR)\.qtwinconfig ) |
| 14 | } | 16 | } |
| 15 | 17 | ||
| 16 | QMAKE_CC = icl | 18 | QMAKE_CC = icl |
| 17 | QMAKE_LEX = flex | 19 | QMAKE_LEX = flex |
| 18 | QMAKE_LEXFLAGS = | 20 | QMAKE_LEXFLAGS = |
| 19 | QMAKE_YACC = byacc | 21 | QMAKE_YACC = byacc |
| 20 | QMAKE_YACCFLAGS = -d | 22 | QMAKE_YACCFLAGS = -d |
| 21 | QMAKE_CFLAGS = -nologo -Zm200 $(CFLAGS_EXTRA) | 23 | QMAKE_CFLAGS = -nologo -Zm200 $(CFLAGS_EXTRA) |
| 22 | QMAKE_CFLAGS_WARN_ON= -W3 | 24 | QMAKE_CFLAGS_WARN_ON= -W3 |
| 23 | QMAKE_CFLAGS_WARN_OFF= -W0 | 25 | QMAKE_CFLAGS_WARN_OFF= -W0 |
| 24 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -Od -Ob1s) | 26 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), ) |
| 25 | QMAKE_CFLAGS_DEBUG= -Zi | 27 | QMAKE_CFLAGS_DEBUG= -Zi -Od |
| 26 | QMAKE_CFLAGS_MT = -MD | 28 | QMAKE_CFLAGS_MT = -MD |
| 27 | QMAKE_CFLAGS_MT_DBG= -MDd | 29 | QMAKE_CFLAGS_MT_DBG= -MDd |
| 28 | QMAKE_CFLAGS_MT_DLL= -MD | 30 | QMAKE_CFLAGS_MT_DLL= -MD |
| 29 | QMAKE_CFLAGS_MT_DLLDBG= -MDd | 31 | QMAKE_CFLAGS_MT_DLLDBG= -MDd |
| 30 | QMAKE_CFLAGS_YACC= | 32 | QMAKE_CFLAGS_YACC= |
| 31 | 33 | QMAKE_CFLAGS_STL_ON= -GX | |
| 32 | contains(CONFIG,stl){ | 34 | QMAKE_CFLAGS_STL_OFF= |
| 33 | QMAKE_CFLAGS+= -GX $(CFLAGS_EXTRA) | 35 | QMAKE_CFLAGS_RTTI_ON= -GR |
| 34 | } | 36 | QMAKE_CFLAGS_RTTI_OFF= |
| 35 | contains(CONFIG,exceptions){ | 37 | QMAKE_CFLAGS_EXCEPTIONS_ON = -GX |
| 36 | QMAKE_CFLAGS += -GX | 38 | QMAKE_CFLAGS_EXCEPTIONS_OFF = |
| 37 | } | ||
| 38 | contains(CONFIG,rtti){ | ||
| 39 | QMAKE_CFLAGS+= -GR $(CFLAGS_EXTRA) | ||
| 40 | } | ||
| 41 | 39 | ||
| 42 | QMAKE_CXX = $$QMAKE_CC | 40 | QMAKE_CXX = $$QMAKE_CC |
| 43 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 41 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 44 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 42 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 45 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 43 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 46 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 44 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 47 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 45 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 48 | QMAKE_CXXFLAGS_MT= $$QMAKE_CFLAGS_MT | 46 | QMAKE_CXXFLAGS_MT= $$QMAKE_CFLAGS_MT |
| 49 | QMAKE_CXXFLAGS_MT_DBG= $$QMAKE_CFLAGS_MT_DBG | 47 | QMAKE_CXXFLAGS_MT_DBG= $$QMAKE_CFLAGS_MT_DBG |
| 50 | QMAKE_CXXFLAGS_MT_DLL= $$QMAKE_CFLAGS_MT_DLL | 48 | QMAKE_CXXFLAGS_MT_DLL= $$QMAKE_CFLAGS_MT_DLL |
| 51 | QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG | 49 | QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG |
| 52 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 50 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 53 | QMAKE_CXXFLAGS_STL= $$QMAKE_CFLAGS_STL | 51 | QMAKE_CXXFLAGS_STL_ON= $$QMAKE_CFLAGS_STL_ON |
| 52 | QMAKE_CXXFLAGS_STL_OFF= $$QMAKE_CFLAGS_STL_OFF | ||
| 53 | QMAKE_CXXFLAGS_RTTI_ON= $$QMAKE_CFLAGS_RTTI_ON | ||
| 54 | QMAKE_CXXFLAGS_RTTI_OFF= $$QMAKE_CFLAGS_RTTI_OFF | ||
| 55 | QMAKE_CXXFLAGS_EXCEPTIONS_ON = $$QMAKE_CFLAGS_EXCEPTIONS_ON | ||
| 56 | QMAKE_CXXFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF | ||
| 54 | 57 | ||
| 55 | QMAKE_INCDIR = | 58 | QMAKE_INCDIR = |
| 56 | QMAKE_INCDIR_QT = $(QTDIR)\include | 59 | QMAKE_INCDIR_QT = $(QTDIR)\include |
| 57 | QMAKE_LIBDIR_QT = $(QTDIR)\lib | 60 | QMAKE_LIBDIR_QT = $(QTDIR)\lib |
| 58 | 61 | ||
| 59 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src | 62 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src |
| 60 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< | 63 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< |
| 64 | QMAKE_RUN_CC_IMP_BATCH= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ @<< | ||
| 61 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src | 65 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src |
| 62 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< | 66 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< |
| 67 | QMAKE_RUN_CXX_IMP_BATCH= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<< | ||
| 63 | 68 | ||
| 64 | QMAKE_LINK = link | 69 | QMAKE_LINK = link |
| 65 | QMAKE_LFLAGS = /NOLOGO $(LFLAGS_EXTRA) | 70 | QMAKE_LFLAGS = /NOLOGO $(LFLAGS_EXTRA) |
| 66 | QMAKE_LFLAGS_RELEASE= delayimp.lib /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll | 71 | QMAKE_LFLAGS_RELEASE= delayimp.lib /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll |
| 67 | QMAKE_LFLAGS_DEBUG= /DEBUG | 72 | QMAKE_LFLAGS_DEBUG= /DEBUG |
| 68 | QMAKE_LFLAGS_CONSOLE= /SUBSYSTEM:console | 73 | QMAKE_LFLAGS_CONSOLE= /SUBSYSTEM:console |
| 69 | QMAKE_LFLAGS_WINDOWS= /SUBSYSTEM:windows | 74 | QMAKE_LFLAGS_WINDOWS= /SUBSYSTEM:windows |
| 70 | QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:console /DLL | 75 | QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:console /DLL |
| 71 | QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:windows /DLL | 76 | QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:windows /DLL |
| 72 | QMAKE_LFLAGS_QT_DLL= /BASE:0x39D00000 | 77 | QMAKE_LFLAGS_QT_DLL= /BASE:0x39D00000 |
| 73 | 78 | ||
| 74 | QMAKE_LIBS = $(LIBS_EXTRA) | 79 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 75 | QMAKE_LIBS_CONSOLE= | 80 | QMAKE_LIBS_CONSOLE= |
| 76 | QMAKE_LIBS_WINDOWS= kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib winspool.lib | 81 | QMAKE_LIBS_WINDOWS= kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib winspool.lib |
| 77 | QMAKE_LIBS_QT = $(QTDIR)\lib\qt.lib | 82 | QMAKE_LIBS_QT = qt.lib |
| 78 | QMAKE_LIBS_QT_THREAD= $(QTDIR)\lib\qt-mt.lib | 83 | QMAKE_LIBS_QT_THREAD= qt-mt.lib |
| 79 | QMAKE_LIBS_QT_ENTRY= $(QTDIR)\lib\qtmain.lib | 84 | QMAKE_LIBS_QT_ENTRY= qtmain.lib |
| 80 | 85 | ||
| 81 | QMAKE_LIBS_OPENGL= opengl32.lib glu32.lib delayimp.lib | 86 | QMAKE_LIBS_OPENGL= opengl32.lib glu32.lib delayimp.lib |
| 82 | QMAKE_LFLAGS_OPENGL= /DELAYLOAD:opengl32.dll | 87 | QMAKE_LFLAGS_OPENGL= /DELAYLOAD:opengl32.dll |
| 83 | 88 | ||
| 84 | QMAKE_MOC = $(QTDIR)\bin\moc.exe | 89 | QMAKE_MOC = $(QTDIR)\bin\moc.exe |
| 85 | QMAKE_UIC = $(QTDIR)\bin\uic.exe | 90 | QMAKE_UIC = $(QTDIR)\bin\uic.exe |
| 86 | QMAKE_IDC = $(QTDIR)\bin\idc.exe | 91 | QMAKE_IDC = $(QTDIR)\bin\idc.exe |
| 87 | 92 | ||
| 88 | QMAKE_IDL = midl | 93 | QMAKE_IDL = midl |
| 89 | QMAKE_LIB = lib /NOLOGO | 94 | QMAKE_LIB = lib /NOLOGO |
| 90 | QMAKE_RC = rc | 95 | QMAKE_RC = rc |
| 91 | 96 | ||
| 92 | QMAKE_ZIP = zip -r -9 | 97 | QMAKE_ZIP = zip -r -9 |
| 93 | 98 | ||
| 94 | QMAKE_COPY = copy | 99 | QMAKE_COPY = copy |
| 95 | QMAKE_MOVE = move | 100 | QMAKE_MOVE = move |
| 96 | QMAKE_DEL_FILE = del | 101 | QMAKE_DEL_FILE = del |
| 97 | QMAKE_DEL_DIR = deltree | 102 | QMAKE_DEL_DIR = rmdir |
| 103 | QMAKE_CHK_DIR_EXISTS= if not exist | ||
| 104 | QMAKE_MKDIR = mkdir | ||
| 98 | 105 | ||
| 99 | DSP_EXTENSION = .dsp | 106 | DSP_EXTENSION = .dsp |
diff --git a/mkspecs/win32-icc/qplatformdefs.h b/mkspecs/win32-icc/qplatformdefs.h index 1d72e8a..d828db8 100644 --- a/mkspecs/win32-icc/qplatformdefs.h +++ b/mkspecs/win32-icc/qplatformdefs.h | |||
| @@ -1,85 +1,87 @@ | |||
| 1 | #ifndef QPLATFORMDEFS_H | 1 | #ifndef QPLATFORMDEFS_H |
| 2 | #define QPLATFORMDEFS_H | 2 | #define QPLATFORMDEFS_H |
| 3 | 3 | ||
| 4 | #ifdef UNICODE | 4 | #ifdef UNICODE |
| 5 | #ifndef _UNICODE | 5 | #ifndef _UNICODE |
| 6 | #define _UNICODE | 6 | #define _UNICODE |
| 7 | #endif | 7 | #endif |
| 8 | #endif | 8 | #endif |
| 9 | 9 | ||
| 10 | // Get Qt defines/settings | 10 | // Get Qt defines/settings |
| 11 | 11 | ||
| 12 | #include "qglobal.h" | 12 | #include "qglobal.h" |
| 13 | 13 | ||
| 14 | #define _POSIX_ | 14 | #define _POSIX_ |
| 15 | #include <limits.h> | 15 | #include <limits.h> |
| 16 | #undef _POSIX_ | 16 | #undef _POSIX_ |
| 17 | 17 | ||
| 18 | #include <tchar.h> | 18 | #include <tchar.h> |
| 19 | #include <io.h> | 19 | #include <io.h> |
| 20 | #include <direct.h> | 20 | #include <direct.h> |
| 21 | #include <stdio.h> | 21 | #include <stdio.h> |
| 22 | #include <fcntl.h> | 22 | #include <fcntl.h> |
| 23 | #include <errno.h> | 23 | #include <errno.h> |
| 24 | #include <sys/stat.h> | 24 | #include <sys/stat.h> |
| 25 | #include <stdlib.h> | 25 | #include <stdlib.h> |
| 26 | #include <windows.h> | 26 | #include <windows.h> |
| 27 | 27 | ||
| 28 | #define Q_FS_FAT | 28 | #define Q_FS_FAT |
| 29 | #ifdef QT_LARGE_FILE_SUPPORT | 29 | #ifdef QT_LARGEFILE_SUPPORT |
| 30 | #define QT_STATBUF struct _stati64 // non-ANSI defs | 30 | #define QT_STATBUF struct _stati64 // non-ANSI defs |
| 31 | #define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs | 31 | #define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs |
| 32 | #define QT_STAT ::_stati64 | 32 | #define QT_STAT ::_stati64 |
| 33 | #define QT_FSTAT ::_fstati64 | 33 | #define QT_FSTAT ::_fstati64 |
| 34 | #else | 34 | #else |
| 35 | #define QT_STATBUF struct _stat // non-ANSI defs | 35 | #define QT_STATBUF struct _stat // non-ANSI defs |
| 36 | #define QT_STATBUF4TSTAT struct _stat // non-ANSI defs | 36 | #define QT_STATBUF4TSTAT struct _stat // non-ANSI defs |
| 37 | #define QT_STAT ::_stat | 37 | #define QT_STAT ::_stat |
| 38 | #define QT_FSTAT ::_fstat | 38 | #define QT_FSTAT ::_fstat |
| 39 | #endif | 39 | #endif |
| 40 | #define QT_STAT_REG _S_IFREG | 40 | #define QT_STAT_REG _S_IFREG |
| 41 | #define QT_STAT_DIR _S_IFDIR | 41 | #define QT_STAT_DIR _S_IFDIR |
| 42 | #define QT_STAT_MASK _S_IFMT | 42 | #define QT_STAT_MASK _S_IFMT |
| 43 | #if defined(_S_IFLNK) | 43 | #if defined(_S_IFLNK) |
| 44 | # define QT_STAT_LNK _S_IFLNK | 44 | # define QT_STAT_LNK _S_IFLNK |
| 45 | #endif | 45 | #endif |
| 46 | #define QT_FILENO _fileno | 46 | #define QT_FILENO _fileno |
| 47 | #define QT_OPEN ::_open | 47 | #define QT_OPEN ::_open |
| 48 | #define QT_CLOSE ::_close | 48 | #define QT_CLOSE ::_close |
| 49 | #ifdef QT_LARGE_FILE_SUPPORT | 49 | #ifdef QT_LARGEFILE_SUPPORT |
| 50 | #define QT_LSEEK ::_lseeki64 | 50 | #define QT_LSEEK ::_lseeki64 |
| 51 | #define QT_TSTAT ::_tstati64 | 51 | #define QT_TSTAT ::_tstati64 |
| 52 | #else | 52 | #else |
| 53 | #define QT_LSEEK ::_lseek | 53 | #define QT_LSEEK ::_lseek |
| 54 | #define QT_TSTAT ::_tstat | 54 | #define QT_TSTAT ::_tstat |
| 55 | #endif | 55 | #endif |
| 56 | #define QT_READ ::_read | 56 | #define QT_READ ::_read |
| 57 | #define QT_WRITE ::_write | 57 | #define QT_WRITE ::_write |
| 58 | #define QT_ACCESS ::_access | 58 | #define QT_ACCESS ::_access |
| 59 | #define QT_GETCWD ::_getcwd | 59 | #define QT_GETCWD ::_getcwd |
| 60 | #define QT_CHDIR ::_chdir | 60 | #define QT_CHDIR ::_chdir |
| 61 | #define QT_MKDIR ::_mkdir | 61 | #define QT_MKDIR ::_mkdir |
| 62 | #define QT_RMDIR ::_rmdir | 62 | #define QT_RMDIR ::_rmdir |
| 63 | #define QT_OPEN_RDONLY _O_RDONLY | 63 | #define QT_OPEN_RDONLY _O_RDONLY |
| 64 | #define QT_OPEN_WRONLY _O_WRONLY | 64 | #define QT_OPEN_WRONLY _O_WRONLY |
| 65 | #define QT_OPEN_RDWR _O_RDWR | 65 | #define QT_OPEN_RDWR _O_RDWR |
| 66 | #define QT_OPEN_CREAT _O_CREAT | 66 | #define QT_OPEN_CREAT _O_CREAT |
| 67 | #define QT_OPEN_TRUNC _O_TRUNC | 67 | #define QT_OPEN_TRUNC _O_TRUNC |
| 68 | #define QT_OPEN_APPEND _O_APPEND | 68 | #define QT_OPEN_APPEND _O_APPEND |
| 69 | #if defined(O_TEXT) | 69 | #if defined(O_TEXT) |
| 70 | # define QT_OPEN_TEXT _O_TEXT | 70 | # define QT_OPEN_TEXT _O_TEXT |
| 71 | # define QT_OPEN_BINARY _O_BINARY | 71 | # define QT_OPEN_BINARY _O_BINARY |
| 72 | #endif | 72 | #endif |
| 73 | 73 | ||
| 74 | #define QT_SIGNAL_ARGS int | 74 | #define QT_SIGNAL_ARGS int |
| 75 | 75 | ||
| 76 | #define QT_VSNPRINTF ::_vsnprintf | 76 | #define QT_VSNPRINTF ::_vsnprintf |
| 77 | #define QT_SNPRINTF ::_snprintf | 77 | #define QT_SNPRINTF ::_snprintf |
| 78 | 78 | ||
| 79 | # define F_OK0 | 79 | # define F_OK0 |
| 80 | # define X_OK1 | 80 | # define X_OK1 |
| 81 | # define W_OK2 | 81 | # define W_OK2 |
| 82 | # define R_OK4 | 82 | # define R_OK4 |
| 83 | 83 | ||
| 84 | typedef int mode_t; | ||
| 85 | |||
| 84 | 86 | ||
| 85 | #endif // QPLATFORMDEFS_H | 87 | #endif // QPLATFORMDEFS_H |
diff --git a/mkspecs/win32-msvc.net/qmake.conf b/mkspecs/win32-msvc.net/qmake.conf index 92f7cc6..de8460d 100644 --- a/mkspecs/win32-msvc.net/qmake.conf +++ b/mkspecs/win32-msvc.net/qmake.conf | |||
| @@ -1,104 +1,107 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for Win32/Microsoft C++.NET | 4 | # qmake configuration for win32-msvc.net |
| 5 | # | ||
| 6 | # Written for Microsoft C++.NET. | ||
| 5 | # | 7 | # |
| 6 | 8 | ||
| 7 | MAKEFILE_GENERATOR= MSVC.NET | 9 | MAKEFILE_GENERATOR= MSVC.NET |
| 8 | TEMPLATE = app | 10 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release incremental | 11 | CONFIG += qt warn_on release incremental flat link_prl precompile_header |
| 10 | DEFINES += UNICODE WIN32 NDEBUG | 12 | DEFINES += UNICODE WIN32 |
| 11 | 13 | ||
| 12 | exists( $(QTDIR)\.qtwinconfig ) { | 14 | exists( $(QTDIR)\.qtwinconfig ) { |
| 13 | include( $(QTDIR)\.qtwinconfig ) | 15 | include( $(QTDIR)\.qtwinconfig ) |
| 14 | } | 16 | } |
| 15 | 17 | ||
| 16 | QMAKE_CC = cl | 18 | QMAKE_CC = cl |
| 17 | QMAKE_LEX = flex | 19 | QMAKE_LEX = flex |
| 18 | QMAKE_LEXFLAGS = | 20 | QMAKE_LEXFLAGS = |
| 19 | QMAKE_YACC = byacc | 21 | QMAKE_YACC = byacc |
| 20 | QMAKE_YACCFLAGS = -d | 22 | QMAKE_YACCFLAGS = -d |
| 21 | QMAKE_CFLAGS = -nologo -Zm200 $(CFLAGS_EXTRA) | 23 | QMAKE_CFLAGS = -nologo -Zm200 $(CFLAGS_EXTRA) |
| 22 | QMAKE_CFLAGS_WARN_ON= -W3 | 24 | QMAKE_CFLAGS_WARN_ON= -W3 |
| 23 | QMAKE_CFLAGS_WARN_OFF= -W0 | 25 | QMAKE_CFLAGS_WARN_OFF= -W0 |
| 24 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O1) | 26 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O1) |
| 25 | QMAKE_CFLAGS_DEBUG= -Z7 | 27 | QMAKE_CFLAGS_DEBUG= -Zi -Gm |
| 26 | QMAKE_CFLAGS_MT = -MD | 28 | QMAKE_CFLAGS_MT = -MD |
| 27 | QMAKE_CFLAGS_MT_DBG= -MD | 29 | QMAKE_CFLAGS_MT_DBG= -MDd |
| 28 | QMAKE_CFLAGS_MT_DLL= -MD | 30 | QMAKE_CFLAGS_MT_DLL= -MD |
| 29 | QMAKE_CFLAGS_MT_DLLDBG= -MD | 31 | QMAKE_CFLAGS_MT_DLLDBG= -MDd |
| 30 | QMAKE_CFLAGS_ST = -ML | ||
| 31 | QMAKE_CFLAGS_ST_DBG= -MLd | ||
| 32 | QMAKE_CFLAGS_YACC= | 32 | QMAKE_CFLAGS_YACC= |
| 33 | 33 | QMAKE_CFLAGS_STL_ON= -GX | |
| 34 | contains(CONFIG,stl){ | 34 | QMAKE_CFLAGS_STL_OFF= |
| 35 | QMAKE_CFLAGS+= -GX $(CFLAGS_EXTRA) | 35 | QMAKE_CFLAGS_RTTI_ON= -GR |
| 36 | } | 36 | QMAKE_CFLAGS_RTTI_OFF= |
| 37 | contains(CONFIG,exceptions){ | 37 | QMAKE_CFLAGS_EXCEPTIONS_ON = -GX |
| 38 | QMAKE_CFLAGS += -GX | 38 | QMAKE_CFLAGS_EXCEPTIONS_OFF = |
| 39 | } | ||
| 40 | contains(CONFIG,rtti){ | ||
| 41 | QMAKE_CFLAGS+= -GR $(CFLAGS_EXTRA) | ||
| 42 | } | ||
| 43 | 39 | ||
| 44 | QMAKE_CXX = $$QMAKE_CC | 40 | QMAKE_CXX = $$QMAKE_CC |
| 45 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 41 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 46 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 42 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON -w34100 -w34189 |
| 47 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 43 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 48 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 44 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 49 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 45 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 50 | QMAKE_CXXFLAGS_MT= $$QMAKE_CFLAGS_MT | 46 | QMAKE_CXXFLAGS_MT= $$QMAKE_CFLAGS_MT |
| 51 | QMAKE_CXXFLAGS_MT_DBG= $$QMAKE_CFLAGS_MT_DBG | 47 | QMAKE_CXXFLAGS_MT_DBG= $$QMAKE_CFLAGS_MT_DBG |
| 52 | QMAKE_CXXFLAGS_MT_DLL= $$QMAKE_CFLAGS_MT_DLL | 48 | QMAKE_CXXFLAGS_MT_DLL= $$QMAKE_CFLAGS_MT_DLL |
| 53 | QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG | 49 | QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG |
| 54 | QMAKE_CXXFLAGS_ST= $$QMAKE_CFLAGS_ST | ||
| 55 | QMAKE_CXXFLAGS_ST_DBG= $$QMAKE_CFLAGS_ST_DBG | ||
| 56 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 50 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 57 | QMAKE_CXXFLAGS_STL= $$QMAKE_CFLAGS_STL | 51 | QMAKE_CXXFLAGS_STL_ON= $$QMAKE_CFLAGS_STL_ON |
| 52 | QMAKE_CXXFLAGS_STL_OFF= $$QMAKE_CFLAGS_STL_OFF | ||
| 53 | QMAKE_CXXFLAGS_RTTI_ON= $$QMAKE_CFLAGS_RTTI_ON | ||
| 54 | QMAKE_CXXFLAGS_RTTI_OFF= $$QMAKE_CFLAGS_RTTI_OFF | ||
| 55 | QMAKE_CXXFLAGS_EXCEPTIONS_ON = $$QMAKE_CFLAGS_EXCEPTIONS_ON | ||
| 56 | QMAKE_CXXFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF | ||
| 58 | 57 | ||
| 59 | QMAKE_INCDIR = | 58 | QMAKE_INCDIR = |
| 60 | QMAKE_INCDIR_QT = $(QTDIR)\include | 59 | QMAKE_INCDIR_QT = $(QTDIR)\include |
| 61 | QMAKE_LIBDIR_QT = $(QTDIR)\lib | 60 | QMAKE_LIBDIR_QT = $(QTDIR)\lib |
| 62 | 61 | ||
| 63 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src | 62 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src |
| 64 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< | 63 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< |
| 64 | QMAKE_RUN_CC_IMP_BATCH= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ @<< | ||
| 65 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src | 65 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src |
| 66 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< | 66 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< |
| 67 | QMAKE_RUN_CXX_IMP_BATCH= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<< | ||
| 67 | 68 | ||
| 68 | QMAKE_LINK = link | 69 | QMAKE_LINK = link |
| 69 | QMAKE_LFLAGS = /NOLOGO $(LFLAGS_EXTRA) | 70 | QMAKE_LFLAGS = /NOLOGO $(LFLAGS_EXTRA) |
| 70 | QMAKE_LFLAGS_RELEASE= /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll | 71 | QMAKE_LFLAGS_RELEASE= /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll |
| 71 | QMAKE_LFLAGS_DEBUG= /DEBUG | 72 | QMAKE_LFLAGS_DEBUG= /DEBUG |
| 72 | QMAKE_LFLAGS_CONSOLE= /SUBSYSTEM:CONSOLE | 73 | QMAKE_LFLAGS_CONSOLE= /SUBSYSTEM:CONSOLE |
| 73 | QMAKE_LFLAGS_WINDOWS= /SUBSYSTEM:WINDOWS | 74 | QMAKE_LFLAGS_WINDOWS= /SUBSYSTEM:WINDOWS |
| 74 | QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:CONSOLE /DLL | 75 | QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:CONSOLE /DLL |
| 75 | QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:WINDOWS /DLL | 76 | QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:WINDOWS /DLL |
| 76 | QMAKE_LFLAGS_QT_DLL= /BASE:0x39D00000 | 77 | QMAKE_LFLAGS_QT_DLL= /BASE:0x39D00000 |
| 77 | 78 | ||
| 78 | QMAKE_LIBS = $(LIBS_EXTRA) | 79 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 79 | QMAKE_LIBS_CONSOLE= | 80 | QMAKE_LIBS_CONSOLE= |
| 80 | QMAKE_LIBS_WINDOWS= kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib winspool.lib | 81 | QMAKE_LIBS_WINDOWS= kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib winspool.lib delayimp.lib |
| 81 | QMAKE_LIBS_QT = qt.lib | 82 | QMAKE_LIBS_QT = qt.lib |
| 82 | QMAKE_LIBS_QT_THREAD= qt-mt.lib | 83 | QMAKE_LIBS_QT_THREAD= qt-mt.lib |
| 83 | QMAKE_LIBS_QT_ENTRY= qtmain.lib | 84 | QMAKE_LIBS_QT_ENTRY= qtmain.lib |
| 84 | 85 | ||
| 85 | QMAKE_LIBS_OPENGL= opengl32.lib glu32.lib delayimp.lib | 86 | QMAKE_LIBS_OPENGL= opengl32.lib glu32.lib |
| 86 | QMAKE_LFLAGS_OPENGL= /DELAYLOAD:opengl32.dll | 87 | QMAKE_LFLAGS_OPENGL= /DELAYLOAD:opengl32.dll |
| 87 | 88 | ||
| 88 | QMAKE_MOC = $(QTDIR)\bin\moc.exe | 89 | QMAKE_MOC = $(QTDIR)\bin\moc.exe |
| 89 | QMAKE_UIC = $(QTDIR)\bin\uic.exe | 90 | QMAKE_UIC = $(QTDIR)\bin\uic.exe |
| 90 | QMAKE_IDC = $(QTDIR)\bin\idc.exe | 91 | QMAKE_IDC = $(QTDIR)\bin\idc.exe |
| 91 | 92 | ||
| 92 | QMAKE_IDL = midl | 93 | QMAKE_IDL = midl |
| 93 | QMAKE_LIB = lib /NOLOGO | 94 | QMAKE_LIB = lib /NOLOGO |
| 94 | QMAKE_RC = rc | 95 | QMAKE_RC = rc |
| 95 | 96 | ||
| 96 | QMAKE_ZIP = zip -r -9 | 97 | QMAKE_ZIP = zip -r -9 |
| 97 | 98 | ||
| 98 | QMAKE_COPY = copy | 99 | QMAKE_COPY = copy |
| 99 | QMAKE_MOVE = move | 100 | QMAKE_MOVE = move |
| 100 | QMAKE_DEL_FILE = del | 101 | QMAKE_DEL_FILE = del |
| 101 | QMAKE_DEL_DIR = deltree | 102 | QMAKE_DEL_DIR = rmdir |
| 103 | QMAKE_CHK_DIR_EXISTS= if not exist | ||
| 104 | QMAKE_MKDIR = mkdir | ||
| 102 | 105 | ||
| 103 | VCPROJ_EXTENSION= .vcproj | 106 | VCPROJ_EXTENSION= .vcproj |
| 104 | VCSOLUTION_EXTENSION= .vcs | 107 | VCSOLUTION_EXTENSION= .sln |
diff --git a/mkspecs/win32-msvc.net/qplatformdefs.h b/mkspecs/win32-msvc.net/qplatformdefs.h index 76ed8af..d828db8 100644 --- a/mkspecs/win32-msvc.net/qplatformdefs.h +++ b/mkspecs/win32-msvc.net/qplatformdefs.h | |||
| @@ -1,87 +1,87 @@ | |||
| 1 | #ifndef QPLATFORMDEFS_H | 1 | #ifndef QPLATFORMDEFS_H |
| 2 | #define QPLATFORMDEFS_H | 2 | #define QPLATFORMDEFS_H |
| 3 | 3 | ||
| 4 | #ifdef UNICODE | 4 | #ifdef UNICODE |
| 5 | #ifndef _UNICODE | 5 | #ifndef _UNICODE |
| 6 | #define _UNICODE | 6 | #define _UNICODE |
| 7 | #endif | 7 | #endif |
| 8 | #endif | 8 | #endif |
| 9 | 9 | ||
| 10 | // Get Qt defines/settings | 10 | // Get Qt defines/settings |
| 11 | 11 | ||
| 12 | #include "qglobal.h" | 12 | #include "qglobal.h" |
| 13 | 13 | ||
| 14 | #define _POSIX_ | 14 | #define _POSIX_ |
| 15 | #include <limits.h> | 15 | #include <limits.h> |
| 16 | #undef _POSIX_ | 16 | #undef _POSIX_ |
| 17 | 17 | ||
| 18 | #include <tchar.h> | 18 | #include <tchar.h> |
| 19 | #include <io.h> | 19 | #include <io.h> |
| 20 | #include <direct.h> | 20 | #include <direct.h> |
| 21 | #include <stdio.h> | 21 | #include <stdio.h> |
| 22 | #include <fcntl.h> | 22 | #include <fcntl.h> |
| 23 | #include <errno.h> | 23 | #include <errno.h> |
| 24 | #include <sys/stat.h> | 24 | #include <sys/stat.h> |
| 25 | #include <stdlib.h> | 25 | #include <stdlib.h> |
| 26 | #include <windows.h> | 26 | #include <windows.h> |
| 27 | 27 | ||
| 28 | #define Q_FS_FAT | 28 | #define Q_FS_FAT |
| 29 | #ifdef QT_LARGE_FILE_SUPPORT | 29 | #ifdef QT_LARGEFILE_SUPPORT |
| 30 | #define QT_STATBUF struct _stati64 // non-ANSI defs | 30 | #define QT_STATBUF struct _stati64 // non-ANSI defs |
| 31 | #define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs | 31 | #define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs |
| 32 | #define QT_STAT ::_stati64 | 32 | #define QT_STAT ::_stati64 |
| 33 | #define QT_FSTAT ::_fstati64 | 33 | #define QT_FSTAT ::_fstati64 |
| 34 | #else | 34 | #else |
| 35 | #define QT_STATBUF struct _stat // non-ANSI defs | 35 | #define QT_STATBUF struct _stat // non-ANSI defs |
| 36 | #define QT_STATBUF4TSTAT struct _stat // non-ANSI defs | 36 | #define QT_STATBUF4TSTAT struct _stat // non-ANSI defs |
| 37 | #define QT_STAT ::_stat | 37 | #define QT_STAT ::_stat |
| 38 | #define QT_FSTAT ::_fstat | 38 | #define QT_FSTAT ::_fstat |
| 39 | #endif | 39 | #endif |
| 40 | #define QT_STAT_REG _S_IFREG | 40 | #define QT_STAT_REG _S_IFREG |
| 41 | #define QT_STAT_DIR _S_IFDIR | 41 | #define QT_STAT_DIR _S_IFDIR |
| 42 | #define QT_STAT_MASK _S_IFMT | 42 | #define QT_STAT_MASK _S_IFMT |
| 43 | #if defined(_S_IFLNK) | 43 | #if defined(_S_IFLNK) |
| 44 | # define QT_STAT_LNK _S_IFLNK | 44 | # define QT_STAT_LNK _S_IFLNK |
| 45 | #endif | 45 | #endif |
| 46 | #define QT_FILENO _fileno | 46 | #define QT_FILENO _fileno |
| 47 | #define QT_OPEN ::_open | 47 | #define QT_OPEN ::_open |
| 48 | #define QT_CLOSE ::_close | 48 | #define QT_CLOSE ::_close |
| 49 | #ifdef QT_LARGE_FILE_SUPPORT | 49 | #ifdef QT_LARGEFILE_SUPPORT |
| 50 | #define QT_LSEEK ::_lseeki64 | 50 | #define QT_LSEEK ::_lseeki64 |
| 51 | #define QT_TSTAT ::_tstati64 | 51 | #define QT_TSTAT ::_tstati64 |
| 52 | #else | 52 | #else |
| 53 | #define QT_LSEEK ::_lseek | 53 | #define QT_LSEEK ::_lseek |
| 54 | #define QT_TSTAT ::_tstat | 54 | #define QT_TSTAT ::_tstat |
| 55 | #endif | 55 | #endif |
| 56 | #define QT_READ ::_read | 56 | #define QT_READ ::_read |
| 57 | #define QT_WRITE ::_write | 57 | #define QT_WRITE ::_write |
| 58 | #define QT_ACCESS ::_access | 58 | #define QT_ACCESS ::_access |
| 59 | #define QT_GETCWD ::_getcwd | 59 | #define QT_GETCWD ::_getcwd |
| 60 | #define QT_CHDIR ::_chdir | 60 | #define QT_CHDIR ::_chdir |
| 61 | #define QT_MKDIR ::_mkdir | 61 | #define QT_MKDIR ::_mkdir |
| 62 | #define QT_RMDIR ::_rmdir | 62 | #define QT_RMDIR ::_rmdir |
| 63 | #define QT_OPEN_RDONLY _O_RDONLY | 63 | #define QT_OPEN_RDONLY _O_RDONLY |
| 64 | #define QT_OPEN_WRONLY _O_WRONLY | 64 | #define QT_OPEN_WRONLY _O_WRONLY |
| 65 | #define QT_OPEN_RDWR _O_RDWR | 65 | #define QT_OPEN_RDWR _O_RDWR |
| 66 | #define QT_OPEN_CREAT _O_CREAT | 66 | #define QT_OPEN_CREAT _O_CREAT |
| 67 | #define QT_OPEN_TRUNC _O_TRUNC | 67 | #define QT_OPEN_TRUNC _O_TRUNC |
| 68 | #define QT_OPEN_APPEND _O_APPEND | 68 | #define QT_OPEN_APPEND _O_APPEND |
| 69 | #if defined(O_TEXT) | 69 | #if defined(O_TEXT) |
| 70 | # define QT_OPEN_TEXT _O_TEXT | 70 | # define QT_OPEN_TEXT _O_TEXT |
| 71 | # define QT_OPEN_BINARY _O_BINARY | 71 | # define QT_OPEN_BINARY _O_BINARY |
| 72 | #endif | 72 | #endif |
| 73 | 73 | ||
| 74 | #define QT_SIGNAL_ARGS int | 74 | #define QT_SIGNAL_ARGS int |
| 75 | 75 | ||
| 76 | #define QT_VSNPRINTF ::_vsnprintf | 76 | #define QT_VSNPRINTF ::_vsnprintf |
| 77 | #define QT_SNPRINTF ::_snprintf | 77 | #define QT_SNPRINTF ::_snprintf |
| 78 | 78 | ||
| 79 | # define F_OK0 | 79 | # define F_OK0 |
| 80 | # define X_OK1 | 80 | # define X_OK1 |
| 81 | # define W_OK2 | 81 | # define W_OK2 |
| 82 | # define R_OK4 | 82 | # define R_OK4 |
| 83 | 83 | ||
| 84 | typedef int mode_t; | 84 | typedef int mode_t; |
| 85 | 85 | ||
| 86 | 86 | ||
| 87 | #endif // QPLATFORMDEFS_H | 87 | #endif // QPLATFORMDEFS_H |
diff --git a/mkspecs/win32-msvc/qmake.conf b/mkspecs/win32-msvc/qmake.conf index 6175be3..2d0c6da 100644 --- a/mkspecs/win32-msvc/qmake.conf +++ b/mkspecs/win32-msvc/qmake.conf | |||
| @@ -1,99 +1,106 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for Win32/Microsoft C++ | 4 | # qmake configuration for win32-msvc |
| 5 | # | ||
| 6 | # Written for Microsoft C++. | ||
| 5 | # | 7 | # |
| 6 | 8 | ||
| 7 | MAKEFILE_GENERATOR= MSVC | 9 | MAKEFILE_GENERATOR= MSVC |
| 8 | TEMPLATE = app | 10 | TEMPLATE = app |
| 9 | CONFIG += qt warn_on release incremental flat | 11 | CONFIG += qt warn_on release incremental flat link_prl precompile_header |
| 10 | DEFINES += UNICODE | 12 | DEFINES += UNICODE |
| 11 | 13 | ||
| 12 | exists( $(QTDIR)\.qtwinconfig ) { | 14 | exists( $(QTDIR)\.qtwinconfig ) { |
| 13 | include( $(QTDIR)\.qtwinconfig ) | 15 | include( $(QTDIR)\.qtwinconfig ) |
| 14 | } | 16 | } |
| 15 | 17 | ||
| 16 | QMAKE_CC = cl | 18 | QMAKE_CC = cl |
| 17 | QMAKE_LEX = flex | 19 | QMAKE_LEX = flex |
| 18 | QMAKE_LEXFLAGS = | 20 | QMAKE_LEXFLAGS = |
| 19 | QMAKE_YACC = byacc | 21 | QMAKE_YACC = byacc |
| 20 | QMAKE_YACCFLAGS = -d | 22 | QMAKE_YACCFLAGS = -d |
| 21 | QMAKE_CFLAGS = -nologo -Zm200 $(CFLAGS_EXTRA) | 23 | QMAKE_CFLAGS = -nologo -Zm200 $(CFLAGS_EXTRA) |
| 22 | QMAKE_CFLAGS_WARN_ON= -W3 | 24 | QMAKE_CFLAGS_WARN_ON= -W3 |
| 23 | QMAKE_CFLAGS_WARN_OFF= -W0 | 25 | QMAKE_CFLAGS_WARN_OFF= -W0 |
| 24 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O1) | 26 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O1) |
| 25 | QMAKE_CFLAGS_DEBUG= -Zi | 27 | QMAKE_CFLAGS_DEBUG= -Zi |
| 26 | QMAKE_CFLAGS_MT = -MD | 28 | QMAKE_CFLAGS_MT = -MD |
| 27 | QMAKE_CFLAGS_MT_DBG= -MDd | 29 | QMAKE_CFLAGS_MT_DBG= -MDd |
| 28 | QMAKE_CFLAGS_MT_DLL= -MD | 30 | QMAKE_CFLAGS_MT_DLL= -MD |
| 29 | QMAKE_CFLAGS_MT_DLLDBG= -MDd | 31 | QMAKE_CFLAGS_MT_DLLDBG= -MDd |
| 30 | QMAKE_CFLAGS_YACC= | 32 | QMAKE_CFLAGS_YACC= |
| 31 | 33 | QMAKE_CFLAGS_STL_ON= -GX | |
| 32 | contains(CONFIG,stl){ | 34 | QMAKE_CFLAGS_STL_OFF= |
| 33 | QMAKE_CFLAGS+= -GX $(CFLAGS_EXTRA) | 35 | QMAKE_CFLAGS_RTTI_ON= -GR |
| 34 | } | 36 | QMAKE_CFLAGS_RTTI_OFF= |
| 35 | contains(CONFIG,exceptions){ | 37 | QMAKE_CFLAGS_EXCEPTIONS_ON = -GX |
| 36 | QMAKE_CFLAGS += -GX | 38 | QMAKE_CFLAGS_EXCEPTIONS_OFF = |
| 37 | } | ||
| 38 | contains(CONFIG,rtti){ | ||
| 39 | QMAKE_CFLAGS+= -GR $(CFLAGS_EXTRA) | ||
| 40 | } | ||
| 41 | 39 | ||
| 42 | QMAKE_CXX = $$QMAKE_CC | 40 | QMAKE_CXX = $$QMAKE_CC |
| 43 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 41 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 44 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 42 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 45 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 43 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 46 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 44 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 47 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 45 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 48 | QMAKE_CXXFLAGS_MT= $$QMAKE_CFLAGS_MT | 46 | QMAKE_CXXFLAGS_MT= $$QMAKE_CFLAGS_MT |
| 49 | QMAKE_CXXFLAGS_MT_DBG= $$QMAKE_CFLAGS_MT_DBG | 47 | QMAKE_CXXFLAGS_MT_DBG= $$QMAKE_CFLAGS_MT_DBG |
| 50 | QMAKE_CXXFLAGS_MT_DLL= $$QMAKE_CFLAGS_MT_DLL | 48 | QMAKE_CXXFLAGS_MT_DLL= $$QMAKE_CFLAGS_MT_DLL |
| 51 | QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG | 49 | QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG |
| 52 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 50 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 53 | QMAKE_CXXFLAGS_STL= $$QMAKE_CFLAGS_STL | 51 | QMAKE_CXXFLAGS_STL_ON= $$QMAKE_CFLAGS_STL_ON |
| 52 | QMAKE_CXXFLAGS_STL_OFF= $$QMAKE_CFLAGS_STL_OFF | ||
| 53 | QMAKE_CXXFLAGS_RTTI_ON= $$QMAKE_CFLAGS_RTTI_ON | ||
| 54 | QMAKE_CXXFLAGS_RTTI_OFF= $$QMAKE_CFLAGS_RTTI_OFF | ||
| 55 | QMAKE_CXXFLAGS_EXCEPTIONS_ON = $$QMAKE_CFLAGS_EXCEPTIONS_ON | ||
| 56 | QMAKE_CXXFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF | ||
| 54 | 57 | ||
| 55 | QMAKE_INCDIR = | 58 | QMAKE_INCDIR = |
| 56 | QMAKE_INCDIR_QT = $(QTDIR)\include | 59 | QMAKE_INCDIR_QT = $(QTDIR)\include |
| 57 | QMAKE_LIBDIR_QT = $(QTDIR)\lib | 60 | QMAKE_LIBDIR_QT = $(QTDIR)\lib |
| 58 | 61 | ||
| 59 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src | 62 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src |
| 60 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< | 63 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< |
| 64 | QMAKE_RUN_CC_IMP_BATCH= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ @<< | ||
| 61 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src | 65 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src |
| 62 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< | 66 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< |
| 67 | QMAKE_RUN_CXX_IMP_BATCH= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<< | ||
| 63 | 68 | ||
| 64 | QMAKE_LINK = link | 69 | QMAKE_LINK = link |
| 65 | QMAKE_LFLAGS = /NOLOGO $(LFLAGS_EXTRA) | 70 | QMAKE_LFLAGS = /NOLOGO $(LFLAGS_EXTRA) |
| 66 | QMAKE_LFLAGS_RELEASE= delayimp.lib /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll | 71 | QMAKE_LFLAGS_RELEASE= delayimp.lib /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll |
| 67 | QMAKE_LFLAGS_DEBUG= /DEBUG | 72 | QMAKE_LFLAGS_DEBUG= /DEBUG |
| 68 | QMAKE_LFLAGS_CONSOLE= /SUBSYSTEM:console | 73 | QMAKE_LFLAGS_CONSOLE= /SUBSYSTEM:console |
| 69 | QMAKE_LFLAGS_WINDOWS= /SUBSYSTEM:windows | 74 | QMAKE_LFLAGS_WINDOWS= /SUBSYSTEM:windows |
| 70 | QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:console /DLL | 75 | QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:console /DLL |
| 71 | QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:windows /DLL | 76 | QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:windows /DLL |
| 72 | QMAKE_LFLAGS_QT_DLL= /BASE:0x39D00000 | 77 | QMAKE_LFLAGS_QT_DLL= /BASE:0x39D00000 |
| 73 | 78 | ||
| 74 | QMAKE_LIBS = $(LIBS_EXTRA) | 79 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 75 | QMAKE_LIBS_CONSOLE= | 80 | QMAKE_LIBS_CONSOLE= |
| 76 | QMAKE_LIBS_WINDOWS= kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib winspool.lib | 81 | QMAKE_LIBS_WINDOWS= kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib winspool.lib |
| 77 | QMAKE_LIBS_QT = qt.lib | 82 | QMAKE_LIBS_QT = qt.lib |
| 78 | QMAKE_LIBS_QT_THREAD= qt-mt.lib | 83 | QMAKE_LIBS_QT_THREAD= qt-mt.lib |
| 79 | QMAKE_LIBS_QT_ENTRY= qtmain.lib | 84 | QMAKE_LIBS_QT_ENTRY= qtmain.lib |
| 80 | 85 | ||
| 81 | QMAKE_LIBS_OPENGL= opengl32.lib glu32.lib delayimp.lib | 86 | QMAKE_LIBS_OPENGL= opengl32.lib glu32.lib delayimp.lib |
| 82 | QMAKE_LFLAGS_OPENGL= /DELAYLOAD:opengl32.dll | 87 | QMAKE_LFLAGS_OPENGL= /DELAYLOAD:opengl32.dll |
| 83 | 88 | ||
| 84 | QMAKE_MOC = $(QTDIR)\bin\moc.exe | 89 | QMAKE_MOC = $(QTDIR)\bin\moc.exe |
| 85 | QMAKE_UIC = $(QTDIR)\bin\uic.exe | 90 | QMAKE_UIC = $(QTDIR)\bin\uic.exe |
| 86 | QMAKE_IDC = $(QTDIR)\bin\idc.exe | 91 | QMAKE_IDC = $(QTDIR)\bin\idc.exe |
| 87 | 92 | ||
| 88 | QMAKE_IDL = midl | 93 | QMAKE_IDL = midl |
| 89 | QMAKE_LIB = lib /NOLOGO | 94 | QMAKE_LIB = lib /NOLOGO |
| 90 | QMAKE_RC = rc | 95 | QMAKE_RC = rc |
| 91 | 96 | ||
| 92 | QMAKE_ZIP = zip -r -9 | 97 | QMAKE_ZIP = zip -r -9 |
| 93 | 98 | ||
| 94 | QMAKE_COPY = copy | 99 | QMAKE_COPY = copy |
| 95 | QMAKE_MOVE = move | 100 | QMAKE_MOVE = move |
| 96 | QMAKE_DEL_FILE = del | 101 | QMAKE_DEL_FILE = del |
| 97 | QMAKE_DEL_DIR = deltree | 102 | QMAKE_DEL_DIR = rmdir |
| 103 | QMAKE_CHK_DIR_EXISTS= if not exist | ||
| 104 | QMAKE_MKDIR = mkdir | ||
| 98 | 105 | ||
| 99 | DSP_EXTENSION = .dsp | 106 | DSP_EXTENSION = .dsp |
diff --git a/mkspecs/win32-msvc/qplatformdefs.h b/mkspecs/win32-msvc/qplatformdefs.h index 76ed8af..d828db8 100644 --- a/mkspecs/win32-msvc/qplatformdefs.h +++ b/mkspecs/win32-msvc/qplatformdefs.h | |||
| @@ -1,87 +1,87 @@ | |||
| 1 | #ifndef QPLATFORMDEFS_H | 1 | #ifndef QPLATFORMDEFS_H |
| 2 | #define QPLATFORMDEFS_H | 2 | #define QPLATFORMDEFS_H |
| 3 | 3 | ||
| 4 | #ifdef UNICODE | 4 | #ifdef UNICODE |
| 5 | #ifndef _UNICODE | 5 | #ifndef _UNICODE |
| 6 | #define _UNICODE | 6 | #define _UNICODE |
| 7 | #endif | 7 | #endif |
| 8 | #endif | 8 | #endif |
| 9 | 9 | ||
| 10 | // Get Qt defines/settings | 10 | // Get Qt defines/settings |
| 11 | 11 | ||
| 12 | #include "qglobal.h" | 12 | #include "qglobal.h" |
| 13 | 13 | ||
| 14 | #define _POSIX_ | 14 | #define _POSIX_ |
| 15 | #include <limits.h> | 15 | #include <limits.h> |
| 16 | #undef _POSIX_ | 16 | #undef _POSIX_ |
| 17 | 17 | ||
| 18 | #include <tchar.h> | 18 | #include <tchar.h> |
| 19 | #include <io.h> | 19 | #include <io.h> |
| 20 | #include <direct.h> | 20 | #include <direct.h> |
| 21 | #include <stdio.h> | 21 | #include <stdio.h> |
| 22 | #include <fcntl.h> | 22 | #include <fcntl.h> |
| 23 | #include <errno.h> | 23 | #include <errno.h> |
| 24 | #include <sys/stat.h> | 24 | #include <sys/stat.h> |
| 25 | #include <stdlib.h> | 25 | #include <stdlib.h> |
| 26 | #include <windows.h> | 26 | #include <windows.h> |
| 27 | 27 | ||
| 28 | #define Q_FS_FAT | 28 | #define Q_FS_FAT |
| 29 | #ifdef QT_LARGE_FILE_SUPPORT | 29 | #ifdef QT_LARGEFILE_SUPPORT |
| 30 | #define QT_STATBUF struct _stati64 // non-ANSI defs | 30 | #define QT_STATBUF struct _stati64 // non-ANSI defs |
| 31 | #define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs | 31 | #define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs |
| 32 | #define QT_STAT ::_stati64 | 32 | #define QT_STAT ::_stati64 |
| 33 | #define QT_FSTAT ::_fstati64 | 33 | #define QT_FSTAT ::_fstati64 |
| 34 | #else | 34 | #else |
| 35 | #define QT_STATBUF struct _stat // non-ANSI defs | 35 | #define QT_STATBUF struct _stat // non-ANSI defs |
| 36 | #define QT_STATBUF4TSTAT struct _stat // non-ANSI defs | 36 | #define QT_STATBUF4TSTAT struct _stat // non-ANSI defs |
| 37 | #define QT_STAT ::_stat | 37 | #define QT_STAT ::_stat |
| 38 | #define QT_FSTAT ::_fstat | 38 | #define QT_FSTAT ::_fstat |
| 39 | #endif | 39 | #endif |
| 40 | #define QT_STAT_REG _S_IFREG | 40 | #define QT_STAT_REG _S_IFREG |
| 41 | #define QT_STAT_DIR _S_IFDIR | 41 | #define QT_STAT_DIR _S_IFDIR |
| 42 | #define QT_STAT_MASK _S_IFMT | 42 | #define QT_STAT_MASK _S_IFMT |
| 43 | #if defined(_S_IFLNK) | 43 | #if defined(_S_IFLNK) |
| 44 | # define QT_STAT_LNK _S_IFLNK | 44 | # define QT_STAT_LNK _S_IFLNK |
| 45 | #endif | 45 | #endif |
| 46 | #define QT_FILENO _fileno | 46 | #define QT_FILENO _fileno |
| 47 | #define QT_OPEN ::_open | 47 | #define QT_OPEN ::_open |
| 48 | #define QT_CLOSE ::_close | 48 | #define QT_CLOSE ::_close |
| 49 | #ifdef QT_LARGE_FILE_SUPPORT | 49 | #ifdef QT_LARGEFILE_SUPPORT |
| 50 | #define QT_LSEEK ::_lseeki64 | 50 | #define QT_LSEEK ::_lseeki64 |
| 51 | #define QT_TSTAT ::_tstati64 | 51 | #define QT_TSTAT ::_tstati64 |
| 52 | #else | 52 | #else |
| 53 | #define QT_LSEEK ::_lseek | 53 | #define QT_LSEEK ::_lseek |
| 54 | #define QT_TSTAT ::_tstat | 54 | #define QT_TSTAT ::_tstat |
| 55 | #endif | 55 | #endif |
| 56 | #define QT_READ ::_read | 56 | #define QT_READ ::_read |
| 57 | #define QT_WRITE ::_write | 57 | #define QT_WRITE ::_write |
| 58 | #define QT_ACCESS ::_access | 58 | #define QT_ACCESS ::_access |
| 59 | #define QT_GETCWD ::_getcwd | 59 | #define QT_GETCWD ::_getcwd |
| 60 | #define QT_CHDIR ::_chdir | 60 | #define QT_CHDIR ::_chdir |
| 61 | #define QT_MKDIR ::_mkdir | 61 | #define QT_MKDIR ::_mkdir |
| 62 | #define QT_RMDIR ::_rmdir | 62 | #define QT_RMDIR ::_rmdir |
| 63 | #define QT_OPEN_RDONLY _O_RDONLY | 63 | #define QT_OPEN_RDONLY _O_RDONLY |
| 64 | #define QT_OPEN_WRONLY _O_WRONLY | 64 | #define QT_OPEN_WRONLY _O_WRONLY |
| 65 | #define QT_OPEN_RDWR _O_RDWR | 65 | #define QT_OPEN_RDWR _O_RDWR |
| 66 | #define QT_OPEN_CREAT _O_CREAT | 66 | #define QT_OPEN_CREAT _O_CREAT |
| 67 | #define QT_OPEN_TRUNC _O_TRUNC | 67 | #define QT_OPEN_TRUNC _O_TRUNC |
| 68 | #define QT_OPEN_APPEND _O_APPEND | 68 | #define QT_OPEN_APPEND _O_APPEND |
| 69 | #if defined(O_TEXT) | 69 | #if defined(O_TEXT) |
| 70 | # define QT_OPEN_TEXT _O_TEXT | 70 | # define QT_OPEN_TEXT _O_TEXT |
| 71 | # define QT_OPEN_BINARY _O_BINARY | 71 | # define QT_OPEN_BINARY _O_BINARY |
| 72 | #endif | 72 | #endif |
| 73 | 73 | ||
| 74 | #define QT_SIGNAL_ARGS int | 74 | #define QT_SIGNAL_ARGS int |
| 75 | 75 | ||
| 76 | #define QT_VSNPRINTF ::_vsnprintf | 76 | #define QT_VSNPRINTF ::_vsnprintf |
| 77 | #define QT_SNPRINTF ::_snprintf | 77 | #define QT_SNPRINTF ::_snprintf |
| 78 | 78 | ||
| 79 | # define F_OK0 | 79 | # define F_OK0 |
| 80 | # define X_OK1 | 80 | # define X_OK1 |
| 81 | # define W_OK2 | 81 | # define W_OK2 |
| 82 | # define R_OK4 | 82 | # define R_OK4 |
| 83 | 83 | ||
| 84 | typedef int mode_t; | 84 | typedef int mode_t; |
| 85 | 85 | ||
| 86 | 86 | ||
| 87 | #endif // QPLATFORMDEFS_H | 87 | #endif // QPLATFORMDEFS_H |
diff --git a/mkspecs/win32-msvc/win32app.dsp b/mkspecs/win32-msvc/win32app.dsp index d09aa86..61d6a4a 100644 --- a/mkspecs/win32-msvc/win32app.dsp +++ b/mkspecs/win32-msvc/win32app.dsp | |||
| @@ -1,111 +1,111 @@ | |||
| 1 | # Microsoft Developer Studio Project File - Name="$$MSVCDSP_PROJECT" - Package Owner=<4> | 1 | # Microsoft Developer Studio Project File - Name="$$MSVCDSP_PROJECT" - Package Owner=<4> |
| 2 | # Microsoft Developer Studio Generated Build File, Format Version $$MSVCDSP_VER | 2 | # Microsoft Developer Studio Generated Build File, Format Version $$MSVCDSP_VER |
| 3 | # ** DO NOT EDIT ** | 3 | # ** DO NOT EDIT ** |
| 4 | 4 | ||
| 5 | # TARGTYPE "Win32 (x86) $$MSVCDSP_CONSOLE Application" $$MSVCDSP_DSPTYPE | 5 | # TARGTYPE "Win32 (x86) $$MSVCDSP_CONSOLE Application" $$MSVCDSP_DSPTYPE |
| 6 | 6 | ||
| 7 | CFG=$$MSVCDSP_PROJECT - Win32 $$MSVCDSP_CONFIGMODE | 7 | CFG=$$MSVCDSP_PROJECT - Win32 $$MSVCDSP_CONFIGMODE |
| 8 | !MESSAGE This is not a valid makefile. To build this project using NMAKE, | 8 | !MESSAGE This is not a valid makefile. To build this project using NMAKE, |
| 9 | !MESSAGE use the Export Makefile command and run | 9 | !MESSAGE use the Export Makefile command and run |
| 10 | !MESSAGE | 10 | !MESSAGE |
| 11 | !MESSAGE NMAKE /f "$$MSVCDSP_PROJECT.mak". | 11 | !MESSAGE NMAKE /f "$$MSVCDSP_PROJECT.mak". |
| 12 | !MESSAGE | 12 | !MESSAGE |
| 13 | !MESSAGE You can specify a configuration when running NMAKE | 13 | !MESSAGE You can specify a configuration when running NMAKE |
| 14 | !MESSAGE by defining the macro CFG on the command line. For example: | 14 | !MESSAGE by defining the macro CFG on the command line. For example: |
| 15 | !MESSAGE | 15 | !MESSAGE |
| 16 | !MESSAGE NMAKE /f "$$MSVCDSP_PROJECT.mak" CFG="$$MSVCDSP_PROJECT - Win32 Debug" | 16 | !MESSAGE NMAKE /f "$$MSVCDSP_PROJECT.mak" CFG="$$MSVCDSP_PROJECT - Win32 Debug" |
| 17 | !MESSAGE | 17 | !MESSAGE |
| 18 | !MESSAGE Possible choices for configuration are: | 18 | !MESSAGE Possible choices for configuration are: |
| 19 | !MESSAGE | 19 | !MESSAGE |
| 20 | !MESSAGE "$$MSVCDSP_PROJECT - Win32 Release" (based on "Win32 (x86) Application") | 20 | !MESSAGE "$$MSVCDSP_PROJECT - Win32 Release" (based on "Win32 (x86) Application") |
| 21 | !MESSAGE "$$MSVCDSP_PROJECT - Win32 Debug" (based on "Win32 (x86) Application") | 21 | !MESSAGE "$$MSVCDSP_PROJECT - Win32 Debug" (based on "Win32 (x86) Application") |
| 22 | !MESSAGE | 22 | !MESSAGE |
| 23 | 23 | ||
| 24 | # Begin Project | 24 | # Begin Project |
| 25 | # PROP AllowPerConfigDependencies 0 | 25 | # PROP AllowPerConfigDependencies 0 |
| 26 | # PROP Scc_ProjName "" | 26 | # PROP Scc_ProjName "" |
| 27 | # PROP Scc_LocalPath "" | 27 | # PROP Scc_LocalPath "" |
| 28 | CPP=cl.exe | 28 | CPP=cl.exe |
| 29 | MTL=midl.exe | 29 | MTL=midl.exe |
| 30 | RSC=rc.exe | 30 | RSC=rc.exe |
| 31 | 31 | ||
| 32 | !IF "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Release" | 32 | !IF "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Release" |
| 33 | 33 | ||
| 34 | # PROP BASE Use_MFC 0 | 34 | # PROP BASE Use_MFC 0 |
| 35 | # PROP BASE Use_Debug_Libraries 0 | 35 | # PROP BASE Use_Debug_Libraries 0 |
| 36 | # PROP BASE Output_Dir "$$MSVCDSP_TARGETDIRREL" | 36 | # PROP BASE Output_Dir "$$MSVCDSP_TARGETDIRREL" |
| 37 | # PROP BASE Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL" | 37 | # PROP BASE Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL" |
| 38 | # PROP BASE Target_Dir "" | 38 | # PROP BASE Target_Dir "" |
| 39 | # PROP Use_MFC 0 | 39 | # PROP Use_MFC 0 |
| 40 | # PROP Use_Debug_Libraries 0 | 40 | # PROP Use_Debug_Libraries 0 |
| 41 | # PROP Output_Dir "$$MSVCDSP_TARGETDIRREL" | 41 | # PROP Output_Dir "$$MSVCDSP_TARGETDIRREL" |
| 42 | # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL" | 42 | # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL" |
| 43 | # PROP Target_Dir "" | 43 | # PROP Target_Dir "" |
| 44 | # ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "$$MSVCDSP_WINCONDEF" /D "_MBCS" $$MSVCDSP_DEFINES $$MSVCDSP_RELDEFS /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE | 44 | # ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "$$MSVCDSP_WINCONDEF" $$MSVCDSP_DEFINES $$MSVCDSP_RELDEFS /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE $$PRECOMPILED_FLAGS_REL |
| 45 | # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 | 45 | # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 |
| 46 | # ADD RSC /l 0x409 /d "NDEBUG" | 46 | # ADD RSC /l 0x409 /d "NDEBUG" |
| 47 | BSC32=bscmake.exe | 47 | BSC32=bscmake.exe |
| 48 | # ADD BSC32 /nologo | 48 | # ADD BSC32 /nologo |
| 49 | LINK32=link.exe | 49 | LINK32=link.exe |
| 50 | # ADD LINK32 $$MSVCDSP_LIBS $$MSVCDSP_VERSION /subsystem:$$MSVCDSP_SUBSYSTEM $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS $$QMAKE_LFLAGS_RELEASE | 50 | # ADD LINK32 $$MSVCDSP_LIBS $$MSVCDSP_VERSION $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS $$QMAKE_LFLAGS_RELEASE $$PRECOMPILED_OBJECT |
| 51 | $$MSVCDSP_REGSVR_REL | 51 | $$MSVCDSP_POST_LINK_REL |
| 52 | 52 | ||
| 53 | !ELSEIF "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Debug" | 53 | !ELSEIF "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Debug" |
| 54 | 54 | ||
| 55 | # PROP BASE Use_MFC 0 | 55 | # PROP BASE Use_MFC 0 |
| 56 | # PROP BASE Use_Debug_Libraries 1 | 56 | # PROP BASE Use_Debug_Libraries 1 |
| 57 | # PROP BASE Output_Dir "$$MSVCDSP_TARGETDIRDEB" | 57 | # PROP BASE Output_Dir "$$MSVCDSP_TARGETDIRDEB" |
| 58 | # PROP BASE Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB" | 58 | # PROP BASE Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB" |
| 59 | # PROP BASE Target_Dir "" | 59 | # PROP BASE Target_Dir "" |
| 60 | # PROP Use_MFC 0 | 60 | # PROP Use_MFC 0 |
| 61 | # PROP Use_Debug_Libraries 1 | 61 | # PROP Use_Debug_Libraries 1 |
| 62 | # PROP Output_Dir "$$MSVCDSP_TARGETDIRDEB" | 62 | # PROP Output_Dir "$$MSVCDSP_TARGETDIRDEB" |
| 63 | # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB" | 63 | # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB" |
| 64 | # PROP Target_Dir "" | 64 | # PROP Target_Dir "" |
| 65 | # ADD CPP $$MSVCDSP_MTDEFD /W3 /Gm $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "$$MSVCDSP_WINCONDEF" /D "_MBCS" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_DEBUG | 65 | # ADD CPP $$MSVCDSP_MTDEFD /W3 $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "$$MSVCDSP_WINCONDEF" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_DEBUG $$PRECOMPILED_FLAGS_DEB |
| 66 | # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 | 66 | # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 |
| 67 | # ADD RSC /l 0x409 /d "_DEBUG" | 67 | # ADD RSC /l 0x409 /d "_DEBUG" |
| 68 | BSC32=bscmake.exe | 68 | BSC32=bscmake.exe |
| 69 | # ADD BSC32 /nologo | 69 | # ADD BSC32 /nologo |
| 70 | LINK32=link.exe | 70 | LINK32=link.exe |
| 71 | # ADD LINK32 $$MSVCDSP_LIBS $$MSVCDSP_VERSION /subsystem:$$MSVCDSP_SUBSYSTEM $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS /pdbtype:sept $$QMAKE_LFLAGS_DEBUG | 71 | # ADD LINK32 $$MSVCDSP_LIBS $$MSVCDSP_VERSION $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS /pdbtype:sept $$QMAKE_LFLAGS_DEBUG $$PRECOMPILED_OBJECT |
| 72 | $$MSVCDSP_REGSVR_DBG | 72 | $$MSVCDSP_POST_LINK_DBG |
| 73 | 73 | ||
| 74 | !ENDIF | 74 | !ENDIF |
| 75 | 75 | ||
| 76 | # Begin Target | 76 | # Begin Target |
| 77 | 77 | ||
| 78 | # Name "$$MSVCDSP_PROJECT - Win32 Release" | 78 | # Name "$$MSVCDSP_PROJECT - Win32 Release" |
| 79 | # Name "$$MSVCDSP_PROJECT - Win32 Debug" | 79 | # Name "$$MSVCDSP_PROJECT - Win32 Debug" |
| 80 | # Begin Group "Source Files" | 80 | # Begin Group "Source Files" |
| 81 | 81 | ||
| 82 | # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" | 82 | # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" |
| 83 | $$MSVCDSP_SOURCES | 83 | $$MSVCDSP_SOURCES |
| 84 | # End Group | 84 | # End Group |
| 85 | # Begin Group "Header Files" | 85 | # Begin Group "Header Files" |
| 86 | 86 | ||
| 87 | # PROP Default_Filter "h;hpp;hxx;hm;inl" | 87 | # PROP Default_Filter "h;hpp;hxx;hm;inl" |
| 88 | $$MSVCDSP_HEADERS | 88 | $$MSVCDSP_HEADERS |
| 89 | # End Group | 89 | # End Group |
| 90 | # Begin Group "Resource Files" | 90 | # Begin Group "Resource Files" |
| 91 | 91 | ||
| 92 | # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" | 92 | # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" |
| 93 | # End Group | 93 | # End Group |
| 94 | 94 | ||
| 95 | $$MSVCDSP_FORMS | 95 | $$MSVCDSP_FORMS |
| 96 | $$MSVCDSP_TRANSLATIONS | 96 | $$MSVCDSP_TRANSLATIONS |
| 97 | $$MSVCDSP_LEXSOURCES | 97 | $$MSVCDSP_LEXSOURCES |
| 98 | $$MSVCDSP_YACCSOURCES | 98 | $$MSVCDSP_YACCSOURCES |
| 99 | $$MSVCDSP_PICTURES | 99 | $$MSVCDSP_PICTURES |
| 100 | 100 | ||
| 101 | # Begin Group "Generated" | 101 | # Begin Group "Generated" |
| 102 | $$MSVCDSP_MOCSOURCES | 102 | $$MSVCDSP_MOCSOURCES |
| 103 | $$MSVCDSP_FORMSOURCES | 103 | $$MSVCDSP_FORMSOURCES |
| 104 | $$MSVCDSP_FORMHEADERS | 104 | $$MSVCDSP_FORMHEADERS |
| 105 | $$MSVCDSP_IMAGES | 105 | $$MSVCDSP_IMAGES |
| 106 | $$MSVCDSP_STRIPPEDTRANSLATIONS | 106 | $$MSVCDSP_STRIPPEDTRANSLATIONS |
| 107 | $$MSVCDSP_IDLSOURCES | 107 | $$MSVCDSP_IDLSOURCES |
| 108 | # Prop Default_Filter "moc" | 108 | # Prop Default_Filter "moc" |
| 109 | # End Group | 109 | # End Group |
| 110 | # End Target | 110 | # End Target |
| 111 | # End Project | 111 | # End Project |
diff --git a/mkspecs/win32-msvc/win32dll.dsp b/mkspecs/win32-msvc/win32dll.dsp index 78b68d5..c619db4 100644 --- a/mkspecs/win32-msvc/win32dll.dsp +++ b/mkspecs/win32-msvc/win32dll.dsp | |||
| @@ -1,113 +1,113 @@ | |||
| 1 | # Microsoft Developer Studio Project File - Name="$$MSVCDSP_PROJECT" - Package Owner=<4> | 1 | # Microsoft Developer Studio Project File - Name="$$MSVCDSP_PROJECT" - Package Owner=<4> |
| 2 | # Microsoft Developer Studio Generated Build File, Format Version $$MSVCDSP_VER | 2 | # Microsoft Developer Studio Generated Build File, Format Version $$MSVCDSP_VER |
| 3 | # ** DO NOT EDIT ** | 3 | # ** DO NOT EDIT ** |
| 4 | 4 | ||
| 5 | # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 | 5 | # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 |
| 6 | 6 | ||
| 7 | CFG=$$MSVCDSP_PROJECT - Win32 $$MSVCDSP_CONFIGMODE | 7 | CFG=$$MSVCDSP_PROJECT - Win32 $$MSVCDSP_CONFIGMODE |
| 8 | !MESSAGE This is not a valid makefile. To build this project using NMAKE, | 8 | !MESSAGE This is not a valid makefile. To build this project using NMAKE, |
| 9 | !MESSAGE use the Export Makefile command and run | 9 | !MESSAGE use the Export Makefile command and run |
| 10 | !MESSAGE | 10 | !MESSAGE |
| 11 | !MESSAGE NMAKE /f "$$MSVCDSP_PROJECT.mak". | 11 | !MESSAGE NMAKE /f "$$MSVCDSP_PROJECT.mak". |
| 12 | !MESSAGE | 12 | !MESSAGE |
| 13 | !MESSAGE You can specify a configuration when running NMAKE | 13 | !MESSAGE You can specify a configuration when running NMAKE |
| 14 | !MESSAGE by defining the macro CFG on the command line. For example: | 14 | !MESSAGE by defining the macro CFG on the command line. For example: |
| 15 | !MESSAGE | 15 | !MESSAGE |
| 16 | !MESSAGE NMAKE /f "$$MSVCDSP_PROJECT.mak" CFG="$$MSVCDSP_PROJECT - Win32 Debug" | 16 | !MESSAGE NMAKE /f "$$MSVCDSP_PROJECT.mak" CFG="$$MSVCDSP_PROJECT - Win32 Debug" |
| 17 | !MESSAGE | 17 | !MESSAGE |
| 18 | !MESSAGE Possible choices for configuration are: | 18 | !MESSAGE Possible choices for configuration are: |
| 19 | !MESSAGE | 19 | !MESSAGE |
| 20 | !MESSAGE "$$MSVCDSP_PROJECT - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") | 20 | !MESSAGE "$$MSVCDSP_PROJECT - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") |
| 21 | !MESSAGE "$$MSVCDSP_PROJECT - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") | 21 | !MESSAGE "$$MSVCDSP_PROJECT - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") |
| 22 | !MESSAGE | 22 | !MESSAGE |
| 23 | 23 | ||
| 24 | # Begin Project | 24 | # Begin Project |
| 25 | # PROP AllowPerConfigDependencies 0 | 25 | # PROP AllowPerConfigDependencies 0 |
| 26 | # PROP Scc_ProjName "" | 26 | # PROP Scc_ProjName "" |
| 27 | # PROP Scc_LocalPath "" | 27 | # PROP Scc_LocalPath "" |
| 28 | CPP=cl.exe | 28 | CPP=cl.exe |
| 29 | MTL=midl.exe | 29 | MTL=midl.exe |
| 30 | RSC=rc.exe | 30 | RSC=rc.exe |
| 31 | 31 | ||
| 32 | !IF "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Release" | 32 | !IF "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Release" |
| 33 | 33 | ||
| 34 | # PROP BASE Use_MFC 0 | 34 | # PROP BASE Use_MFC 0 |
| 35 | # PROP BASE Use_Debug_Libraries 0 | 35 | # PROP BASE Use_Debug_Libraries 0 |
| 36 | # PROP BASE Output_Dir "$$MSVCDSP_TARGETDIRREL" | 36 | # PROP BASE Output_Dir "$$MSVCDSP_TARGETDIRREL" |
| 37 | # PROP BASE Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL" | 37 | # PROP BASE Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL" |
| 38 | # PROP BASE Target_Dir "" | 38 | # PROP BASE Target_Dir "" |
| 39 | # PROP Use_MFC 0 | 39 | # PROP Use_MFC 0 |
| 40 | # PROP Use_Debug_Libraries 0 | 40 | # PROP Use_Debug_Libraries 0 |
| 41 | # PROP Output_Dir "$$MSVCDSP_TARGETDIRREL" | 41 | # PROP Output_Dir "$$MSVCDSP_TARGETDIRREL" |
| 42 | # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL" | 42 | # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL" |
| 43 | # PROP Ignore_Export_Lib 1 | 43 | # PROP Ignore_Export_Lib 1 |
| 44 | # PROP Target_Dir "" | 44 | # PROP Target_Dir "" |
| 45 | # ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" $$MSVCDSP_DEFINES $$MSVCDSP_RELDEFS /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE | 45 | # ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" $$MSVCDSP_DEFINES $$MSVCDSP_RELDEFS /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE $$PRECOMPILED_FLAGS_REL |
| 46 | # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 | 46 | # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 |
| 47 | # ADD RSC /l 0x409 /d "NDEBUG" | 47 | # ADD RSC /l 0x409 /d "NDEBUG" |
| 48 | BSC32=bscmake.exe | 48 | BSC32=bscmake.exe |
| 49 | # ADD BSC32 /nologo | 49 | # ADD BSC32 /nologo |
| 50 | LINK32=link.exe | 50 | LINK32=link.exe |
| 51 | # ADD LINK32 $$MSVCDSP_LIBS /dll $$MSVCDSP_VERSION $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS $$QMAKE_LFLAGS_RELEASE | 51 | # ADD LINK32 $$MSVCDSP_LIBS /dll $$MSVCDSP_VERSION $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS $$QMAKE_LFLAGS_RELEASE $$PRECOMPILED_OBJECT |
| 52 | $$MSVCDSP_COPY_DLL_REL | 52 | $$MSVCDSP_POST_LINK_REL |
| 53 | 53 | ||
| 54 | !ELSEIF "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Debug" | 54 | !ELSEIF "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Debug" |
| 55 | 55 | ||
| 56 | # PROP BASE Use_MFC 0 | 56 | # PROP BASE Use_MFC 0 |
| 57 | # PROP BASE Use_Debug_Libraries 1 | 57 | # PROP BASE Use_Debug_Libraries 1 |
| 58 | # PROP BASE Output_Dir "$$MSVCDSP_TARGETDIRDEB" | 58 | # PROP BASE Output_Dir "$$MSVCDSP_TARGETDIRDEB" |
| 59 | # PROP BASE Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB" | 59 | # PROP BASE Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB" |
| 60 | # PROP BASE Target_Dir "" | 60 | # PROP BASE Target_Dir "" |
| 61 | # PROP Use_MFC 0 | 61 | # PROP Use_MFC 0 |
| 62 | # PROP Use_Debug_Libraries 1 | 62 | # PROP Use_Debug_Libraries 1 |
| 63 | # PROP Output_Dir "$$MSVCDSP_TARGETDIRDEB" | 63 | # PROP Output_Dir "$$MSVCDSP_TARGETDIRDEB" |
| 64 | # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB" | 64 | # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB" |
| 65 | # PROP Ignore_Export_Lib 1 | 65 | # PROP Ignore_Export_Lib 1 |
| 66 | # PROP Target_Dir "" | 66 | # PROP Target_Dir "" |
| 67 | # ADD CPP $$MSVCDSP_MTDEFD /W3 /Gm $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_DEBUG | 67 | # ADD CPP $$MSVCDSP_MTDEFD /W3 $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_DEBUG $$PRECOMPILED_FLAGS_DEB |
| 68 | # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 | 68 | # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 |
| 69 | # ADD RSC /l 0x409 /d "_DEBUG" | 69 | # ADD RSC /l 0x409 /d "_DEBUG" |
| 70 | BSC32=bscmake.exe | 70 | BSC32=bscmake.exe |
| 71 | # ADD BSC32 /nologo | 71 | # ADD BSC32 /nologo |
| 72 | LINK32=link.exe | 72 | LINK32=link.exe |
| 73 | # ADD LINK32 $$MSVCDSP_LIBS /dll $$MSVCDSP_VERSION $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS /pdbtype:sept $$QMAKE_LFLAGS_DEBUG | 73 | # ADD LINK32 $$MSVCDSP_LIBS /dll $$MSVCDSP_VERSION $$MSVCDSP_TARGET $$MSVCDSP_LFLAGS /pdbtype:sept $$QMAKE_LFLAGS_DEBUG $$PRECOMPILED_OBJECT |
| 74 | $$MSVCDSP_COPY_DLL_DBG | 74 | $$MSVCDSP_POST_LINK_DBG |
| 75 | 75 | ||
| 76 | !ENDIF | 76 | !ENDIF |
| 77 | 77 | ||
| 78 | # Begin Target | 78 | # Begin Target |
| 79 | 79 | ||
| 80 | # Name "$$MSVCDSP_PROJECT - Win32 Release" | 80 | # Name "$$MSVCDSP_PROJECT - Win32 Release" |
| 81 | # Name "$$MSVCDSP_PROJECT - Win32 Debug" | 81 | # Name "$$MSVCDSP_PROJECT - Win32 Debug" |
| 82 | # Begin Group "Source Files" | 82 | # Begin Group "Source Files" |
| 83 | 83 | ||
| 84 | # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" | 84 | # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" |
| 85 | $$MSVCDSP_SOURCES | 85 | $$MSVCDSP_SOURCES |
| 86 | # End Group | 86 | # End Group |
| 87 | # Begin Group "Header Files" | 87 | # Begin Group "Header Files" |
| 88 | 88 | ||
| 89 | # PROP Default_Filter "h;hpp;hxx;hm;inl" | 89 | # PROP Default_Filter "h;hpp;hxx;hm;inl" |
| 90 | $$MSVCDSP_HEADERS | 90 | $$MSVCDSP_HEADERS |
| 91 | # End Group | 91 | # End Group |
| 92 | # Begin Group "Resource Files" | 92 | # Begin Group "Resource Files" |
| 93 | 93 | ||
| 94 | # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" | 94 | # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" |
| 95 | # End Group | 95 | # End Group |
| 96 | 96 | ||
| 97 | $$MSVCDSP_FORMS | 97 | $$MSVCDSP_FORMS |
| 98 | $$MSVCDSP_TRANSLATIONS | 98 | $$MSVCDSP_TRANSLATIONS |
| 99 | $$MSVCDSP_LEXSOURCES | 99 | $$MSVCDSP_LEXSOURCES |
| 100 | $$MSVCDSP_YACCSOURCES | 100 | $$MSVCDSP_YACCSOURCES |
| 101 | $$MSVCDSP_PICTURES | 101 | $$MSVCDSP_PICTURES |
| 102 | 102 | ||
| 103 | # Begin Group "Generated" | 103 | # Begin Group "Generated" |
| 104 | $$MSVCDSP_MOCSOURCES | 104 | $$MSVCDSP_MOCSOURCES |
| 105 | $$MSVCDSP_FORMSOURCES | 105 | $$MSVCDSP_FORMSOURCES |
| 106 | $$MSVCDSP_FORMHEADERS | 106 | $$MSVCDSP_FORMHEADERS |
| 107 | $$MSVCDSP_IMAGES | 107 | $$MSVCDSP_IMAGES |
| 108 | $$MSVCDSP_STRIPPEDTRANSLATIONS | 108 | $$MSVCDSP_STRIPPEDTRANSLATIONS |
| 109 | $$MSVCDSP_IDLSOURCES | 109 | $$MSVCDSP_IDLSOURCES |
| 110 | # Prop Default_Filter "moc" | 110 | # Prop Default_Filter "moc" |
| 111 | # End Group | 111 | # End Group |
| 112 | # End Target | 112 | # End Target |
| 113 | # End Project | 113 | # End Project |
diff --git a/mkspecs/win32-msvc/win32lib.dsp b/mkspecs/win32-msvc/win32lib.dsp index 70263c0..81d9f5a 100644 --- a/mkspecs/win32-msvc/win32lib.dsp +++ b/mkspecs/win32-msvc/win32lib.dsp | |||
| @@ -1,105 +1,107 @@ | |||
| 1 | # Microsoft Developer Studio Project File - Name="$$MSVCDSP_PROJECT" - Package Owner=<4> | 1 | # Microsoft Developer Studio Project File - Name="$$MSVCDSP_PROJECT" - Package Owner=<4> |
| 2 | # Microsoft Developer Studio Generated Build File, Format Version $$MSVCDSP_VER | 2 | # Microsoft Developer Studio Generated Build File, Format Version $$MSVCDSP_VER |
| 3 | # ** DO NOT EDIT ** | 3 | # ** DO NOT EDIT ** |
| 4 | 4 | ||
| 5 | # TARGTYPE "Win32 (x86) Static Library" 0x0104 | 5 | # TARGTYPE "Win32 (x86) Static Library" 0x0104 |
| 6 | 6 | ||
| 7 | CFG=$$MSVCDSP_PROJECT - Win32 $$MSVCDSP_CONFIGMODE | 7 | CFG=$$MSVCDSP_PROJECT - Win32 $$MSVCDSP_CONFIGMODE |
| 8 | !MESSAGE This is not a valid makefile. To build this project using NMAKE, | 8 | !MESSAGE This is not a valid makefile. To build this project using NMAKE, |
| 9 | !MESSAGE use the Export Makefile command and run | 9 | !MESSAGE use the Export Makefile command and run |
| 10 | !MESSAGE | 10 | !MESSAGE |
| 11 | !MESSAGE NMAKE /f "$$MSVCDSP_PROJECT.mak". | 11 | !MESSAGE NMAKE /f "$$MSVCDSP_PROJECT.mak". |
| 12 | !MESSAGE | 12 | !MESSAGE |
| 13 | !MESSAGE You can specify a configuration when running NMAKE | 13 | !MESSAGE You can specify a configuration when running NMAKE |
| 14 | !MESSAGE by defining the macro CFG on the command line. For example: | 14 | !MESSAGE by defining the macro CFG on the command line. For example: |
| 15 | !MESSAGE | 15 | !MESSAGE |
| 16 | !MESSAGE NMAKE /f "$$MSVCDSP_PROJECT.mak" CFG="$$MSVCDSP_PROJECT - Win32 Debug" | 16 | !MESSAGE NMAKE /f "$$MSVCDSP_PROJECT.mak" CFG="$$MSVCDSP_PROJECT - Win32 Debug" |
| 17 | !MESSAGE | 17 | !MESSAGE |
| 18 | !MESSAGE Possible choices for configuration are: | 18 | !MESSAGE Possible choices for configuration are: |
| 19 | !MESSAGE | 19 | !MESSAGE |
| 20 | !MESSAGE "$$MSVCDSP_PROJECT - Win32 Release" (based on "Win32 (x86) Static Library") | 20 | !MESSAGE "$$MSVCDSP_PROJECT - Win32 Release" (based on "Win32 (x86) Static Library") |
| 21 | !MESSAGE "$$MSVCDSP_PROJECT - Win32 Debug" (based on "Win32 (x86) Static Library") | 21 | !MESSAGE "$$MSVCDSP_PROJECT - Win32 Debug" (based on "Win32 (x86) Static Library") |
| 22 | !MESSAGE | 22 | !MESSAGE |
| 23 | 23 | ||
| 24 | # Begin Project | 24 | # Begin Project |
| 25 | # PROP AllowPerConfigDependencies 0 | 25 | # PROP AllowPerConfigDependencies 0 |
| 26 | # PROP Scc_ProjName "" | 26 | # PROP Scc_ProjName "" |
| 27 | # PROP Scc_LocalPath "" | 27 | # PROP Scc_LocalPath "" |
| 28 | CPP=cl.exe | 28 | CPP=cl.exe |
| 29 | RSC=rc.exe | 29 | RSC=rc.exe |
| 30 | 30 | ||
| 31 | !IF "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Release" | 31 | !IF "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Release" |
| 32 | 32 | ||
| 33 | # PROP BASE Use_MFC 0 | 33 | # PROP BASE Use_MFC 0 |
| 34 | # PROP BASE Use_Debug_Libraries 0 | 34 | # PROP BASE Use_Debug_Libraries 0 |
| 35 | # PROP BASE Output_Dir "$$MSVCDSP_TARGETDIRREL" | 35 | # PROP BASE Output_Dir "$$MSVCDSP_TARGETDIRREL" |
| 36 | # PROP BASE Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL" | 36 | # PROP BASE Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL" |
| 37 | # PROP BASE Target_Dir "" | 37 | # PROP BASE Target_Dir "" |
| 38 | # PROP Use_MFC 0 | 38 | # PROP Use_MFC 0 |
| 39 | # PROP Use_Debug_Libraries 0 | 39 | # PROP Use_Debug_Libraries 0 |
| 40 | # PROP Output_Dir "$$MSVCDSP_TARGETDIRREL" | 40 | # PROP Output_Dir "$$MSVCDSP_TARGETDIRREL" |
| 41 | # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL" | 41 | # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL" |
| 42 | # PROP Target_Dir "" | 42 | # PROP Target_Dir "" |
| 43 | # ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE | 43 | # ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "_LIB" $$MSVCDSP_DEFINES $$MSVCDSP_RELDEFS /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE $$PRECOMPILED_FLAGS_REL |
| 44 | # ADD RSC /l 0x409 /d "NDEBUG" | 44 | # ADD RSC /l 0x409 /d "NDEBUG" |
| 45 | BSC32=bscmake.exe | 45 | BSC32=bscmake.exe |
| 46 | # ADD BSC32 /nologo | 46 | # ADD BSC32 /nologo |
| 47 | LIB32=link.exe -lib | 47 | LIB32=link.exe -lib |
| 48 | # ADD LIB32 /nologo $$MSVCDSP_TARGET | 48 | # ADD LIB32 /nologo $$MSVCDSP_TARGET $$PRECOMPILED_OBJECT |
| 49 | $$MSVCDSP_POST_LINK_REL | ||
| 49 | 50 | ||
| 50 | !ELSEIF "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Debug" | 51 | !ELSEIF "$(CFG)" == "$$MSVCDSP_PROJECT - Win32 Debug" |
| 51 | 52 | ||
| 52 | # PROP BASE Use_MFC 0 | 53 | # PROP BASE Use_MFC 0 |
| 53 | # PROP BASE Use_Debug_Libraries 1 | 54 | # PROP BASE Use_Debug_Libraries 1 |
| 54 | # PROP BASE Output_Dir "$$MSVCDSP_TARGETDIRDEB" | 55 | # PROP BASE Output_Dir "$$MSVCDSP_TARGETDIRDEB" |
| 55 | # PROP BASE Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB" | 56 | # PROP BASE Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB" |
| 56 | # PROP BASE Target_Dir "" | 57 | # PROP BASE Target_Dir "" |
| 57 | # PROP Use_MFC 0 | 58 | # PROP Use_MFC 0 |
| 58 | # PROP Use_Debug_Libraries 1 | 59 | # PROP Use_Debug_Libraries 1 |
| 59 | # PROP Output_Dir "$$MSVCDSP_TARGETDIRDEB" | 60 | # PROP Output_Dir "$$MSVCDSP_TARGETDIRDEB" |
| 60 | # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB" | 61 | # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB" |
| 61 | # PROP Target_Dir "" | 62 | # PROP Target_Dir "" |
| 62 | # ADD CPP $$MSVCDSP_MTDEFD /W3 /Gm $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_DEBUG | 63 | # ADD CPP $$MSVCDSP_MTDEFD /W3 $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "_LIB" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_DEBUG $$PRECOMPILED_FLAGS_DEB |
| 63 | # ADD RSC /l 0x409 /d "_DEBUG" | 64 | # ADD RSC /l 0x409 /d "_DEBUG" |
| 64 | BSC32=bscmake.exe | 65 | BSC32=bscmake.exe |
| 65 | # ADD BSC32 /nologo | 66 | # ADD BSC32 /nologo |
| 66 | LIB32=link.exe -lib | 67 | LIB32=link.exe -lib |
| 67 | # ADD LIB32 /nologo $$MSVCDSP_TARGET | 68 | # ADD LIB32 /nologo $$MSVCDSP_TARGET $$PRECOMPILED_OBJECT |
| 69 | $$MSVCDSP_POST_LINK_DBG | ||
| 68 | 70 | ||
| 69 | !ENDIF | 71 | !ENDIF |
| 70 | 72 | ||
| 71 | # Begin Target | 73 | # Begin Target |
| 72 | 74 | ||
| 73 | # Name "$$MSVCDSP_PROJECT - Win32 Release" | 75 | # Name "$$MSVCDSP_PROJECT - Win32 Release" |
| 74 | # Name "$$MSVCDSP_PROJECT - Win32 Debug" | 76 | # Name "$$MSVCDSP_PROJECT - Win32 Debug" |
| 75 | # Begin Group "Source Files" | 77 | # Begin Group "Source Files" |
| 76 | 78 | ||
| 77 | # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" | 79 | # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" |
| 78 | $$MSVCDSP_SOURCES | 80 | $$MSVCDSP_SOURCES |
| 79 | # End Group | 81 | # End Group |
| 80 | # Begin Group "Header Files" | 82 | # Begin Group "Header Files" |
| 81 | 83 | ||
| 82 | # PROP Default_Filter "h;hpp;hxx;hm;inl" | 84 | # PROP Default_Filter "h;hpp;hxx;hm;inl" |
| 83 | $$MSVCDSP_HEADERS | 85 | $$MSVCDSP_HEADERS |
| 84 | # End Group | 86 | # End Group |
| 85 | # Begin Group "Resource Files" | 87 | # Begin Group "Resource Files" |
| 86 | 88 | ||
| 87 | # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" | 89 | # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" |
| 88 | # End Group | 90 | # End Group |
| 89 | 91 | ||
| 90 | $$MSVCDSP_FORMS | 92 | $$MSVCDSP_FORMS |
| 91 | $$MSVCDSP_TRANSLATIONS | 93 | $$MSVCDSP_TRANSLATIONS |
| 92 | $$MSVCDSP_LEXSOURCES | 94 | $$MSVCDSP_LEXSOURCES |
| 93 | $$MSVCDSP_YACCSOURCES | 95 | $$MSVCDSP_YACCSOURCES |
| 94 | $$MSVCDSP_PICTURES | 96 | $$MSVCDSP_PICTURES |
| 95 | 97 | ||
| 96 | # Begin Group "Generated" | 98 | # Begin Group "Generated" |
| 97 | $$MSVCDSP_MOCSOURCES | 99 | $$MSVCDSP_MOCSOURCES |
| 98 | $$MSVCDSP_FORMSOURCES | 100 | $$MSVCDSP_FORMSOURCES |
| 99 | $$MSVCDSP_FORMHEADERS | 101 | $$MSVCDSP_FORMHEADERS |
| 100 | $$MSVCDSP_IMAGES | 102 | $$MSVCDSP_IMAGES |
| 101 | $$MSVCDSP_STRIPPEDTRANSLATIONS | 103 | $$MSVCDSP_STRIPPEDTRANSLATIONS |
| 102 | # Prop Default_Filter "moc" | 104 | # Prop Default_Filter "moc" |
| 103 | # End Group | 105 | # End Group |
| 104 | # End Target | 106 | # End Target |
| 105 | # End Project | 107 | # End Project |
diff --git a/mkspecs/win32-visage/qmake.conf b/mkspecs/win32-visage/qmake.conf index cbd0a7f..2db104d 100644 --- a/mkspecs/win32-visage/qmake.conf +++ b/mkspecs/win32-visage/qmake.conf | |||
| @@ -1,67 +1,67 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for Win32/IBM Visual Age | 4 | # qmake configuration for Win32/IBM Visual Age |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | TEMPLATE = app | 7 | TEMPLATE = app |
| 8 | CONFIG += qt warn_on release | 8 | CONFIG += qt warn_on release |
| 9 | 9 | ||
| 10 | QMAKE_CC = icc -C | 10 | QMAKE_CC = icc -C |
| 11 | QMAKE_LEX = flex | 11 | QMAKE_LEX = flex |
| 12 | QMAKE_LEXFLAGS = | 12 | QMAKE_LEXFLAGS = |
| 13 | QMAKE_YACC = byacc | 13 | QMAKE_YACC = byacc |
| 14 | QMAKE_YACCFLAGS = -d | 14 | QMAKE_YACCFLAGS = -d |
| 15 | QMAKE_CFLAGS = -Q -Ft -Gd -Gm+ -qrtti=all $(CFLAGS_EXTRA) | 15 | QMAKE_CFLAGS = -Q -Ft -Gd -Gm+ -qrtti=all $(CFLAGS_EXTRA) $(CFLAGS_EXTRA) |
| 16 | QMAKE_CFLAGS_WARN_ON= -W3 | 16 | QMAKE_CFLAGS_WARN_ON= -W3 |
| 17 | QMAKE_CFLAGS_WARN_OFF= -W0 | 17 | QMAKE_CFLAGS_WARN_OFF= -W0 |
| 18 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -Gl+ -O -Oc+) | 18 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -Gl+ -O -Oc+)) |
| 19 | QMAKE_CFLAGS_DEBUG= -Fb* -Ti -Tm | 19 | QMAKE_CFLAGS_DEBUG= -Fb* -Ti -Tm |
| 20 | QMAKE_CFLAGS_YACC= | 20 | QMAKE_CFLAGS_YACC= |
| 21 | 21 | ||
| 22 | QMAKE_CXX = $$QMAKE_CC | 22 | QMAKE_CXX = $$QMAKE_CC |
| 23 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 23 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) $(CXXFLAGS_EXTRA) |
| 24 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 24 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 25 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 25 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 26 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 26 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 27 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 27 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 28 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 28 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 29 | 29 | ||
| 30 | QMAKE_INCDIR = | 30 | QMAKE_INCDIR = |
| 31 | QMAKE_INCDIR_QT = $(QTDIR)\include | 31 | QMAKE_INCDIR_QT = $(QTDIR)\include |
| 32 | 32 | ||
| 33 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo"$obj" $src | 33 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo"$obj" $src |
| 34 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo"$@" $< | 34 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo"$@" $< |
| 35 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$obj" $src | 35 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$obj" $src |
| 36 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$@" $< | 36 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$@" $< |
| 37 | 37 | ||
| 38 | QMAKE_LINK = icc -Tdp $(CFLAGS) | 38 | QMAKE_LINK = icc -Tdp $(CFLAGS) |
| 39 | QMAKE_LFLAGS = -nologo -code:RX -data:RW -def -noe $(LFLAGS_EXTRA) | 39 | QMAKE_LFLAGS = -nologo -code:RX -data:RW -def -noe $(LFLAGS_EXTRA) $(LFLAGS_EXTRA) |
| 40 | QMAKE_LFLAGS_RELEASE= -OPTF | 40 | QMAKE_LFLAGS_RELEASE= -OPTF |
| 41 | QMAKE_LFLAGS_DEBUG= -de -br | 41 | QMAKE_LFLAGS_DEBUG= -de -br |
| 42 | QMAKE_LFLAGS_CONSOLE= -pmtype:vio | 42 | QMAKE_LFLAGS_CONSOLE= -pmtype:vio |
| 43 | QMAKE_LFLAGS_WINDOWS= -pmtype:pm | 43 | QMAKE_LFLAGS_WINDOWS= -pmtype:pm |
| 44 | QMAKE_LFLAGS_CONSOLE_DLL= -DLL | 44 | QMAKE_LFLAGS_CONSOLE_DLL= -DLL |
| 45 | QMAKE_LFLAGS_WINDOWS_DLL= -DLL | 45 | QMAKE_LFLAGS_WINDOWS_DLL= -DLL |
| 46 | 46 | ||
| 47 | QMAKE_LIBS = $(LIBS_EXTRA) | 47 | QMAKE_LIBS = $(LIBS_EXTRA) $(LIBS_EXTRA) |
| 48 | QMAKE_LIBS_CONSOLE= | 48 | QMAKE_LIBS_CONSOLE= |
| 49 | QMAKE_LIBS_WINDOWS= user32.lib gdi32.lib comdlg32.lib imm32.lib winmm.lib ole32.lib uuid.lib wsock32.lib | 49 | QMAKE_LIBS_WINDOWS= user32.lib gdi32.lib comdlg32.lib imm32.lib winmm.lib ole32.lib uuid.lib wsock32.lib |
| 50 | QMAKE_LIBS_QT = $(QTDIR)\lib\qt.lib | 50 | QMAKE_LIBS_QT = $(QTDIR)\lib\qt.lib |
| 51 | QMAKE_LIBS_QT_ENTRY= $(QTDIR)\lib\qtmain.lib | 51 | QMAKE_LIBS_QT_ENTRY= $(QTDIR)\lib\qtmain.lib |
| 52 | 52 | ||
| 53 | QMAKE_LIBS_OPENGL= opengl32.lib glu32.lib | 53 | QMAKE_LIBS_OPENGL= opengl32.lib glu32.lib |
| 54 | 54 | ||
| 55 | QMAKE_MOC = $(QTDIR)/bin/moc.exe | 55 | QMAKE_MOC = $(QTDIR)/bin/moc.exe |
| 56 | QMAKE_UIC = $(QTDIR)/bin/uic.exe | 56 | QMAKE_UIC = $(QTDIR)/bin/uic.exe |
| 57 | QMAKE_IDC = $(QTDIR)/bin/idc.exe | 57 | QMAKE_IDC = $(QTDIR)/bin/idc.exe |
| 58 | 58 | ||
| 59 | QMAKE_LIB = ilib | 59 | QMAKE_LIB = ilib |
| 60 | QMAKE_RC = rc | 60 | QMAKE_RC = rc |
| 61 | 61 | ||
| 62 | QMAKE_ZIP = zip -r -9 | 62 | QMAKE_ZIP = zip -r -9 |
| 63 | 63 | ||
| 64 | QMAKE_COPY = copy | 64 | QMAKE_COPY = copy |
| 65 | QMAKE_MOVE = move | 65 | QMAKE_MOVE = move |
| 66 | QMAKE_DEL_FILE = del | 66 | QMAKE_DEL_FILE = del |
| 67 | QMAKE_DEL_DIR = deltree | 67 | QMAKE_DEL_DIR = deltree |
diff --git a/mkspecs/win32-watcom/qmake.conf b/mkspecs/win32-watcom/qmake.conf index fe6f3ed..cbe07bb 100644 --- a/mkspecs/win32-watcom/qmake.conf +++ b/mkspecs/win32-watcom/qmake.conf | |||
| @@ -1,65 +1,69 @@ | |||
| 1 | # | 1 | # |
| 2 | # $Id$ | 2 | # $Id$ |
| 3 | # | 3 | # |
| 4 | # qmake configuration for Win32/Watcom C++ | 4 | # qmake configuration for win32-watcom |
| 5 | # | ||
| 6 | # Written for Watcom C++, now OpenWatcom. | ||
| 5 | # | 7 | # |
| 6 | 8 | ||
| 7 | TEMPLATE = app | 9 | TEMPLATE = app |
| 8 | CONFIG += qt warn_on release | 10 | CONFIG += qt warn_on release link_prl |
| 9 | 11 | ||
| 10 | QMAKE_CC = wcl386 | 12 | QMAKE_CC = wcl386 |
| 11 | QMAKE_LEX = flex | 13 | QMAKE_LEX = flex |
| 12 | QMAKE_LEXFLAGS = | 14 | QMAKE_LEXFLAGS = |
| 13 | QMAKE_YACC = byacc | 15 | QMAKE_YACC = byacc |
| 14 | QMAKE_YACCFLAGS = -d | 16 | QMAKE_YACCFLAGS = -d |
| 15 | QMAKE_CFLAGS = -zq $(CFLAGS_EXTRA) | 17 | QMAKE_CFLAGS = -zq $(CFLAGS_EXTRA) |
| 16 | QMAKE_CFLAGS_WARN_ON= -w2 | 18 | QMAKE_CFLAGS_WARN_ON= -w2 |
| 17 | QMAKE_CFLAGS_WARN_OFF= -w0 | 19 | QMAKE_CFLAGS_WARN_OFF= -w0 |
| 18 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -ox) | 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -ox) |
| 19 | QMAKE_CFLAGS_DEBUG= -d2 | 21 | QMAKE_CFLAGS_DEBUG= -d2 |
| 20 | QMAKE_CFLAGS_YACC= | 22 | QMAKE_CFLAGS_YACC= |
| 21 | 23 | ||
| 22 | QMAKE_CXX = $$QMAKE_CC | 24 | QMAKE_CXX = $$QMAKE_CC |
| 23 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) | 25 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
| 24 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 26 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| 25 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 27 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
| 26 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 28 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
| 27 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 29 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
| 28 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 30 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
| 29 | 31 | ||
| 30 | QMAKE_INCDIR = | 32 | QMAKE_INCDIR = |
| 31 | QMAKE_INCDIR_QT = $(QTDIR)\include | 33 | QMAKE_INCDIR_QT = $(QTDIR)\include |
| 32 | 34 | ||
| 33 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -fo=$obj $src | 35 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -fo=$obj $src |
| 34 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -fo=$obj $src | 36 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -fo=$obj $src |
| 35 | 37 | ||
| 36 | QMAKE_LINK = wlink | 38 | QMAKE_LINK = wlink |
| 37 | QMAKE_LFLAGS = op quiet op c $(LFLAGS_EXTRA) | 39 | QMAKE_LFLAGS = op quiet op c $(LFLAGS_EXTRA) |
| 38 | QMAKE_LFLAGS_RELEASE= | 40 | QMAKE_LFLAGS_RELEASE= |
| 39 | QMAKE_LFLAGS_DEBUG= d all | 41 | QMAKE_LFLAGS_DEBUG= d all |
| 40 | QMAKE_LFLAGS_CONSOLE= sys nt | 42 | QMAKE_LFLAGS_CONSOLE= sys nt |
| 41 | QMAKE_LFLAGS_WINDOWS= sys nt_win | 43 | QMAKE_LFLAGS_WINDOWS= sys nt_win |
| 42 | QMAKE_LFLAGS_CONSOLE_DLL= sys nt | 44 | QMAKE_LFLAGS_CONSOLE_DLL= sys nt |
| 43 | QMAKE_LFLAGS_WINDOWS_DLL= sys nt_win | 45 | QMAKE_LFLAGS_WINDOWS_DLL= sys nt_win |
| 44 | 46 | ||
| 45 | QMAKE_LIBS = $(LIBS_EXTRA) | 47 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 46 | QMAKE_LIBS_CONSOLE= | 48 | QMAKE_LIBS_CONSOLE= |
| 47 | QMAKE_LIBS_WINDOWS= | 49 | QMAKE_LIBS_WINDOWS= |
| 48 | QMAKE_LIBS_QT = %QTDIR%\lib\qt.lib | 50 | QMAKE_LIBS_QT = %QTDIR%\lib\qt.lib |
| 49 | QMAKE_LIBS_QT_ENTRY= %QTDIR%\lib\qtmain.lib | 51 | QMAKE_LIBS_QT_ENTRY= %QTDIR%\lib\qtmain.lib |
| 50 | 52 | ||
| 51 | QMAKE_LIBS_OPENGL= opengl32.lib | 53 | QMAKE_LIBS_OPENGL= opengl32.lib |
| 52 | 54 | ||
| 53 | QMAKE_MOC = $(QTDIR)/bin/moc.exe | 55 | QMAKE_MOC = $(QTDIR)/bin/moc.exe |
| 54 | QMAKE_UIC = $(QTDIR)/bin/uic.exe | 56 | QMAKE_UIC = $(QTDIR)/bin/uic.exe |
| 55 | QMAKE_IDC = $(QTDIR)/bin/idc.exe | 57 | QMAKE_IDC = $(QTDIR)/bin/idc.exe |
| 56 | 58 | ||
| 57 | QMAKE_LIB = wlib -b -c -n -q -p=512 | 59 | QMAKE_LIB = wlib -b -c -n -q -p=512 |
| 58 | QMAKE_RC = rc | 60 | QMAKE_RC = rc |
| 59 | 61 | ||
| 60 | QMAKE_ZIP = zip -r -9 | 62 | QMAKE_ZIP = zip -r -9 |
| 61 | 63 | ||
| 62 | QMAKE_COPY = copy | 64 | QMAKE_COPY = copy |
| 63 | QMAKE_MOVE = move | 65 | QMAKE_MOVE = move |
| 64 | QMAKE_DEL_FILE = del | 66 | QMAKE_DEL_FILE = del |
| 65 | QMAKE_DEL_DIR = deltree | 67 | QMAKE_DEL_DIR = rmdir |
| 68 | QMAKE_CHK_DIR_EXISTS= test -d | ||
| 69 | QMAKE_MKDIR = mkdir -p | ||