63 lines
2.2 KiB
Text
63 lines
2.2 KiB
Text
$NetBSD: patch-ac,v 1.6 2004/03/22 15:06:52 bouyer Exp $
|
|
|
|
--- configs/solaris-g++-static.orig Fri Feb 26 12:02:12 1999
|
|
+++ configs/solaris-g++-static
|
|
@@ -1,30 +1,31 @@
|
|
# Compiling
|
|
SYSCONF_CXX = g++
|
|
+SYSCONF_CXX_LIB = $(LIBTOOL) --mode=compile ${SYSCONF_CXX}
|
|
|
|
# Compiling with support libraries
|
|
-SYSCONF_CXXFLAGS_X11 = -I/usr/openwin/include
|
|
+SYSCONF_CXXFLAGS_X11 = -I${X11BASE}/include
|
|
SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include
|
|
-SYSCONF_CXXFLAGS_OPENGL =
|
|
+SYSCONF_CXXFLAGS_OPENGL = -I${X11BASE}/include
|
|
|
|
# Compiline YACC output
|
|
SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses
|
|
|
|
# Linking with support libraries
|
|
# X11
|
|
-SYSCONF_LFLAGS_X11 = -L/usr/openwin/lib
|
|
+SYSCONF_LFLAGS_X11 = -L${X11BASE}/lib
|
|
SYSCONF_LIBS_X11 = -lX11 -lXext
|
|
# Qt, Qt+OpenGL
|
|
SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
|
|
SYSCONF_LIBS_QT = -lqt
|
|
SYSCONF_LIBS_QT_OPENGL = -lqgl
|
|
# OpenGL
|
|
-SYSCONF_LFLAGS_OPENGL =
|
|
-SYSCONF_LIBS_OPENGL = -lGL -lGLU -lXmu
|
|
+SYSCONF_LFLAGS_OPENGL = -L${X11BASE}/lib
|
|
+SYSCONF_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu -lXext -lm
|
|
# Yacc
|
|
SYSCONF_LIBS_YACC =
|
|
|
|
# Linking applications
|
|
SYSCONF_LINK = g++
|
|
SYSCONF_LFLAGS =
|
|
SYSCONF_LIBS =
|
|
|
|
@@ -54,15 +55,15 @@
|
|
# - Build the $(TARGET) library, eg. lib$(TARGET).a
|
|
# - Place target in $(DESTDIR) - which has a trailing /
|
|
#
|
|
-SYSCONF_AR = ar cq
|
|
-SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a
|
|
+SYSCONF_AR = $(LIBTOOL) --mode=link $(SYSCONF_CXX) -rpath $(QTPREFIX)/lib -version-info $(VER_MAJ):$(VER_MIN) -o
|
|
+SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).la
|
|
SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
|
|
- $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC)
|
|
+ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS:.o=.lo) $(OBJMOC:.o=.lo)
|
|
# Compiling application source
|
|
-SYSCONF_CXXFLAGS = -O2 -fno-strength-reduce
|
|
+SYSCONF_CXXFLAGS = ${CXXOPTS} -fno-strength-reduce
|
|
# Compiling library source
|
|
-SYSCONF_CXXFLAGS_LIB = -O2 -fno-strength-reduce -fPIC
|
|
+SYSCONF_CXXFLAGS_LIB = ${CXXOPTS} -fno-strength-reduce -fPIC
|
|
# Compiling shared-object source
|
|
-SYSCONF_CXXFLAGS_SHOBJ = -O2 -fno-strength-reduce -fPIC
|
|
+SYSCONF_CXXFLAGS_SHOBJ = ${CXXOPTS} -fno-strength-reduce -fPIC
|
|
SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC)
|
|
SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_STATIC)
|