-rw-r--r-- | mkspecs/hpux-acc-64/qmake.conf | 23 | ||||
-rw-r--r-- | mkspecs/hpux-acc-64/qplatformdefs.h | 12 |
2 files changed, 23 insertions, 12 deletions
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 | |||
@@ -49,7 +49,7 @@ | |||
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 |
@@ -58,7 +58,7 @@ 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 |
@@ -66,7 +66,8 @@ 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 |
@@ -88,21 +89,23 @@ 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 | ||
@@ -119,3 +122,5 @@ 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 | |||
@@ -22,9 +22,7 @@ | |||
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> |
@@ -37,7 +35,15 @@ | |||
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 | ||