Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-11-03 23:58:38 +00:00
parent 282eb70450
commit aaa7e220f7
4 changed files with 516 additions and 519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1014
configure vendored
View File

File diff suppressed because it is too large Load Diff

15
configure.in
View File

@@ -2723,19 +2723,19 @@ if test "$wxUSE_SHARED" = "yes"; then
WX_VERSIONED_SYMBOLS([\$(top_builddir)/version-script]) WX_VERSIONED_SYMBOLS([\$(top_builddir)/version-script])
dnl the command to use for creating the shared library dnl the command to use for creating the shared library
SHARED_LD="${CXX} -shared $LDFLAGS_VERSIONING -o" SHARED_LD="${CXX} -shared -o"
case "${host}" in case "${host}" in
*-hp-hpux* ) *-hp-hpux* )
dnl default settings are good for gcc but not for the native HP-UX dnl default settings are good for gcc but not for the native HP-UX
if test "$GCC" = "yes"; then if test "$GCC" = "yes"; then
dnl -o flag must be after PIC flag dnl -o flag must be after PIC flag
SHARED_LD="${CXX} -shared ${PIC_FLAG} $LDFLAGS_VERSIONING -o" SHARED_LD="${CXX} -shared ${PIC_FLAG} -o"
else else
dnl no idea why it wants it, but it does dnl no idea why it wants it, but it does
LDFLAGS="$LDFLAGS -L/usr/lib" LDFLAGS="$LDFLAGS -L/usr/lib"
SHARED_LD="${CXX} -b $LDFLAGS_VERSIONING -o" SHARED_LD="${CXX} -b -o"
PIC_FLAG="+Z" PIC_FLAG="+Z"
fi fi
@@ -2781,7 +2781,7 @@ if test "$wxUSE_SHARED" = "yes"; then
dnl Solaris (which use old style C syntax) dnl Solaris (which use old style C syntax)
CPPFLAGS="$CPPFLAGS -isystem /usr/openwin/include" CPPFLAGS="$CPPFLAGS -isystem /usr/openwin/include"
else else
SHARED_LD="${CXX} -G $LDFLAGS_VERSIONING -o" SHARED_LD="${CXX} -G -o"
PIC_FLAG="-KPIC" PIC_FLAG="-KPIC"
SONAME_FLAGS="-h ${WX_LIBRARY_NAME_SHARED}" SONAME_FLAGS="-h ${WX_LIBRARY_NAME_SHARED}"
SONAME_FLAGS_GL="-h ${WX_LIBRARY_NAME_SHARED_GL}" SONAME_FLAGS_GL="-h ${WX_LIBRARY_NAME_SHARED_GL}"
@@ -2798,7 +2798,7 @@ if test "$wxUSE_SHARED" = "yes"; then
dnl this can be done either with the exe linker flag -Wl,-bind_at_load dnl this can be done either with the exe linker flag -Wl,-bind_at_load
dnl or with a double stage link in order to create a single module dnl or with a double stage link in order to create a single module
dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved
SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -undefined suppress -flat_namespace $LDFLAGS_VERSIONING -o" SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -undefined suppress -flat_namespace -o"
PIC_FLAG="-dynamic -fPIC" PIC_FLAG="-dynamic -fPIC"
SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION}" SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION}"
SONAME_FLAGS_GL=${SONAME_FLAGS} SONAME_FLAGS_GL=${SONAME_FLAGS}
@@ -2812,7 +2812,7 @@ if test "$wxUSE_SHARED" = "yes"; then
AC_CHECK_PROG(AIX_CXX_LD, makeC++SharedLib, AC_CHECK_PROG(AIX_CXX_LD, makeC++SharedLib,
makeC++SharedLib, /usr/lpp/xlC/bin/makeC++SharedLib) makeC++SharedLib, /usr/lpp/xlC/bin/makeC++SharedLib)
SHARED_LD="$(AIX_CXX_LD) -p 0 $LDFLAGS_VERSIONING -o" SHARED_LD="$(AIX_CXX_LD) -p 0 -o"
fi fi
;; ;;
@@ -2836,7 +2836,7 @@ if test "$wxUSE_SHARED" = "yes"; then
*-*-beos* ) *-*-beos* )
dnl can't use gcc under BeOS for shared library creation because it dnl can't use gcc under BeOS for shared library creation because it
dnl complains about missing 'main' dnl complains about missing 'main'
SHARED_LD="${LD} -shared $LDFLAGS_VERSIONING -o" SHARED_LD="${LD} -shared -o"
;; ;;
*-*-irix* ) *-*-irix* )
@@ -5227,6 +5227,7 @@ AC_SUBST(SAMPLES_SUBDIRS)
dnl additional libraries and linker settings dnl additional libraries and linker settings
AC_SUBST(LDFLAGS) AC_SUBST(LDFLAGS)
AC_SUBST(LDFLAGS_GL) AC_SUBST(LDFLAGS_GL)
AC_SUBST(LDFLAGS_VERSIONING)
AC_SUBST(LDFLAGS_EXE) AC_SUBST(LDFLAGS_EXE)
AC_SUBST(OPENGL_LIBS) AC_SUBST(OPENGL_LIBS)
AC_SUBST(DMALLOC_LIBS) AC_SUBST(DMALLOC_LIBS)

2
src/make.env.in
View File

@@ -12,7 +12,7 @@
####################### GENERAL SETTINGS ############################ ####################### GENERAL SETTINGS ############################
# see comment near LDFLAGS at the end of file # see comment near LDFLAGS at the end of file
EXTRALIBS = @LDFLAGS@ @LIBS@ @DMALLOC_LIBS@ EXTRALIBS = @LDFLAGS@ @LDFLAGS_VERSIONING@ @LIBS@ @DMALLOC_LIBS@
OPENGLLIBS = @OPENGL_LIBS@ OPENGLLIBS = @OPENGL_LIBS@
LDLIBS = ${APPEXTRALIBS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${EXTRALIBS} LDLIBS = ${APPEXTRALIBS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${EXTRALIBS}

4
src/makelib.env.in
View File

@@ -41,6 +41,8 @@ TARGETLIB_LINK2 = $(TARGET_LIBNAME).so
TARGETLIB_SONAME = @WX_TARGET_LIBRARY_SONAME@ TARGETLIB_SONAME = @WX_TARGET_LIBRARY_SONAME@
LDFLAGS_VERSIONING = @LDFLAGS_VERSIONING@
# NB: see remark in Makefile.in as to why we don't use %.foo: %.bar rules # NB: see remark in Makefile.in as to why we don't use %.foo: %.bar rules
.SUFFIXES: .o .c .cpp .cxx .SUFFIXES: .o .c .cpp .cxx
@@ -68,7 +70,7 @@ libtype_a: $(top_builddir)/lib/$(TARGETLIB_STATIC)
$(top_builddir)/lib/$(TARGETLIB_SHARED): $(OBJECTS) $(top_builddir)/lib/$(TARGETLIB_SHARED): $(OBJECTS)
@$(INSTALL) -d $(top_builddir)/lib @$(INSTALL) -d $(top_builddir)/lib
$(SHARED_LD) $@ $(TARGETLIB_SONAME) $(OBJECTS) $(SHARED_LD) $@ $(TARGETLIB_SONAME) $(OBJECTS) $(LDFLAGS_VERSIONING)
cd $(top_builddir)/lib \ cd $(top_builddir)/lib \
&& $(RM) $(TARGETLIB_LINK1) $(TARGETLIB_LINK2) \ && $(RM) $(TARGETLIB_LINK1) $(TARGETLIB_LINK2) \
&& $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \ && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \