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 | |||
@@ -30,3 +30,3 @@ 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 | ||
@@ -37,8 +37,8 @@ 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= |
@@ -47,3 +47,4 @@ QMAKE_CFLAGS_THREAD = -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE | |||
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 |
@@ -69,3 +70,3 @@ 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 |
@@ -75,4 +76,6 @@ 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 |
@@ -82,4 +85,4 @@ 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 |
@@ -100 +103,3 @@ 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 | |||
@@ -39,3 +39,11 @@ | |||
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. |
@@ -85,2 +93,3 @@ extern "C" int res_init(); | |||
85 | 93 | ||
94 | |||
86 | #endif // QPLATFORMDEFS_H | 95 | #endif // QPLATFORMDEFS_H |