author | zecke <zecke> | 2004-07-18 19:32:20 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-07-18 19:32:20 (UTC) |
commit | 8795812a0d763742a5273f356c35313af0fed84d (patch) (unidiff) | |
tree | 34b7259e1595e53e1fa2069d7d79bbdef67293e8 /mkspecs/hpux-acc | |
parent | 8e8fcd65b8d8657650728bae604c5a34dc31338e (diff) | |
download | opie-8795812a0d763742a5273f356c35313af0fed84d.zip opie-8795812a0d763742a5273f356c35313af0fed84d.tar.gz opie-8795812a0d763742a5273f356c35313af0fed84d.tar.bz2 |
-CHECK if DIR exist added to qmake.conf's
-use arm-linux-g++ for linking now
hopefully not removed anything important
Added python tool to opiefy mkspecs
-rw-r--r-- | mkspecs/hpux-acc/qmake.conf | 23 | ||||
-rw-r--r-- | mkspecs/hpux-acc/qplatformdefs.h | 9 |
2 files changed, 23 insertions, 9 deletions
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 | |||
@@ -23,34 +23,35 @@ | |||
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 | ||
@@ -62,39 +63,43 @@ 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 | |||
@@ -32,17 +32,25 @@ | |||
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 |
@@ -78,9 +86,10 @@ extern "C" int res_init(); | |||
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 |