From 8795812a0d763742a5273f356c35313af0fed84d Mon Sep 17 00:00:00 2001 From: zecke Date: Sun, 18 Jul 2004 19:32:20 +0000 Subject: -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 --- (limited to 'mkspecs/hpux-acc-64') 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 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt warn_on release +CONFIG += qt warn_on release link_prl QMAKE_CC = cc QMAKE_LEX = flex @@ -58,7 +58,7 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d QMAKE_CFLAGS = -Ae +DA2.0W -w $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -QMAKE_CFLAGS_WARN_OFF = +QMAKE_CFLAGS_WARN_OFF = -w QMAKE_CFLAGS_RELEASE = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O +Osize) QMAKE_CFLAGS_DEBUG = -g QMAKE_CFLAGS_SHLIB = +Z @@ -66,7 +66,8 @@ QMAKE_CFLAGS_YACC = QMAKE_CFLAGS_THREAD = -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE QMAKE_CXX = aCC -QMAKE_CXXFLAGS = -Aa +DA2.0W -w -D__STRICT_ANSI__ $(CXXFLAGS_EXTRA) +QMAKE_CXXFLAGS = -Aa +DA2.0W -w -D__STRICT_ANSI__ -D_HPUX_SOURCE $(CXXFLAGS_EXTRA) +QMAKE_CXXFLAGS_DEPS = +M QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE @@ -88,21 +89,23 @@ QMAKE_LINK = aCC QMAKE_LINK_SHLIB = aCC QMAKE_LFLAGS = +DA2.0W -Wl,+s $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = -O -QMAKE_LFLAGS_DEBUG = -Wl,+tools -g -QMAKE_LFLAGS_SHLIB = -b +QMAKE_LFLAGS_DEBUG = -g +QMAKE_LFLAGS_SHLIB = -b -Wl,-a,shared QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,+h, QMAKE_LFLAGS_THREAD = QMAKE_RPATH = -Wl,+b, +QMAKE_HPUX_SHLIB = 3 +QMAKE_EXTENSION_SHLIB = sl -QMAKE_LIBS = $(LIBS_EXTRA) -QMAKE_LIBS_DYNLOAD = -ldld +QMAKE_LIBS = -lm $(LIBS_EXTRA) +QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_X11 = -lXext -lX11 QMAKE_LIBS_X11SM = -lSM -lICE QMAKE_LIBS_QT = -lqt QMAKE_LIBS_QT_THREAD = -lqt-mt -QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -QMAKE_LIBS_OPENGL_QT = -lGL -lXm +QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -lXt +QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -lXt QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly @@ -119,3 +122,5 @@ QMAKE_COPY = cp -f QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir +QMAKE_CHK_DIR_EXISTS = test -d +QMAKE_MKDIR = mkdir -p diff --git a/mkspecs/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 @@ #include #include #include -#include -#define QT_HPUX_LD -#define QT_NO_LIBRARY_UNLOAD +#include #include #include @@ -37,7 +35,15 @@ // DNS header files are not fully covered by X/Open specifications. // In particular nothing is said about res_* :/ +// #ifdef __cplusplus +// extern "C" { +// #endif +// getres() is mangled because of missing extern "C" on +// HP-UX 11.x systems missing PHCO_23963 #include +// #ifdef __cplusplus +// } +// #endif // Undeclared - at least on HP-UX 10.20. extern "C" int res_init(); -- cgit v0.9.0.2