mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-31 21:57:12 +00:00
1ebd628ccb
it doesn't really work (or so I've been told). This does not affect the build for non-XFree86-4.0.2 users. Apologies for not getting this in sooner. Thanks to: Andrew <elitetek@flashcom.net> for loaning me access to a fast machine with XFree86 4.0.2 to do my testing on, as well as being the first one to contact me about this.
61 lines
2.4 KiB
Plaintext
61 lines
2.4 KiB
Plaintext
--- configs/freebsd-g++-shared Sun Dec 24 02:41:35 2000
|
|
+++ configs/freebsd-g++-shared.new Sun Dec 24 02:42:49 2000
|
|
@@ -6,7 +6,7 @@
|
|
|
|
# Compiling with support libraries
|
|
SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include
|
|
-SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include
|
|
+SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include $(SYSCONF_CXXFLAGS_THREAD)
|
|
SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include
|
|
|
|
# Compiling YACC output
|
|
@@ -23,7 +23,7 @@
|
|
SYSCONF_LIBS_X11 = -lXext -lX11 -lm
|
|
# Qt, Qt+OpenGL
|
|
SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
|
|
-SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX)
|
|
+SYSCONF_LIBS_QT = -lqt2$(QT_THREAD_SUFFIX) $(SYSCONF_LFLAGS_THREAD)
|
|
SYSCONF_LIBS_QT_OPENGL =
|
|
# OpenGL
|
|
SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
|
|
@@ -46,7 +46,7 @@
|
|
SYSCONF_LIBS_THREAD =
|
|
|
|
# Meta-object compiler
|
|
-SYSCONF_MOC = $(QTDIR)/bin/moc
|
|
+SYSCONF_MOC = $(QTDIR)/bin/moc2
|
|
|
|
# UI compiler
|
|
SYSCONF_UIC = $(QTDIR)/bin/uic
|
|
@@ -57,16 +57,14 @@
|
|
# - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
|
|
#
|
|
SYSCONF_LINK_SHLIB = g++
|
|
-SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
|
|
+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ)
|
|
SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared \
|
|
$(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
|
|
$(OBJECTS) $(OBJMOC) $(LIBS) && \
|
|
mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
|
|
cd $(DESTDIR) && \
|
|
- rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \
|
|
- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \
|
|
- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ); \
|
|
- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
|
|
+ rm -f lib$(TARGET).so;\
|
|
+ ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so
|
|
|
|
# Linking static libraries
|
|
# - Build the $(TARGET) library, eg. lib$(TARGET).a
|
|
@@ -77,8 +75,8 @@
|
|
SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
|
|
$(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC)
|
|
# Compiling application source
|
|
-SYSCONF_CXXFLAGS = -pipe -O2
|
|
-SYSCONF_CFLAGS = -pipe -O2
|
|
+SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2
|
|
+SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2
|
|
# Default link type (static linking is still be used where required)
|
|
SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED)
|
|
SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED)
|