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

use specific linker flags under Mac OS X when linking executables against the

Browse Source 
wxWindows dynamic shared library (LDFLAGS_EXE)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2002-04-19 18:39:06 +00:00
parent 010afced51
commit 40f7145ca5
5 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@@ -13570,7 +13570,7 @@ echo "$ac_t""$wx_cv_prog_icc" 1>&6
*-*-darwin* ) *-*-darwin* )
CFLAGS="$CFLAGS -fno-common -DDYLIB_INIT" CFLAGS="$CFLAGS -fno-common -DDYLIB_INIT"
CXXFLAGS="$CXXFLAGS -fno-common -DDYLIB_INIT" CXXFLAGS="$CXXFLAGS -fno-common -DDYLIB_INIT"
LDFLAGS="$LDFLAGS -Wl,-bind_at_load" LDFLAGS_EXE="$LDFLAGS_EXE -Wl,-bind_at_load"
SHARED_LD="$CXX -dynamiclib -init _wxWindowsDylibInit -o" SHARED_LD="$CXX -dynamiclib -init _wxWindowsDylibInit -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}"
@@ -20471,10 +20471,11 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
echo "configure:20478: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo "configure:20479: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@@ -20752,6 +20753,7 @@ s%@PORT_FILES@%$PORT_FILES%g
s%@DISTDIR@%$DISTDIR%g s%@DISTDIR@%$DISTDIR%g
s%@SAMPLES_SUBDIRS@%$SAMPLES_SUBDIRS%g s%@SAMPLES_SUBDIRS@%$SAMPLES_SUBDIRS%g
s%@LDFLAGS_GL@%$LDFLAGS_GL%g s%@LDFLAGS_GL@%$LDFLAGS_GL%g
s%@LDFLAGS_EXE@%$LDFLAGS_EXE%g
s%@OPENGL_LIBS@%$OPENGL_LIBS%g s%@OPENGL_LIBS@%$OPENGL_LIBS%g
s%@DMALLOC_LIBS@%$DMALLOC_LIBS%g s%@DMALLOC_LIBS@%$DMALLOC_LIBS%g
s%@EXTRADEFS@%$EXTRADEFS%g s%@EXTRADEFS@%$EXTRADEFS%g

3
configure.in
View File

@@ -2433,7 +2433,7 @@ if test "$wxUSE_SHARED" = "yes"; then
CXXFLAGS="$CXXFLAGS -fno-common -DDYLIB_INIT" CXXFLAGS="$CXXFLAGS -fno-common -DDYLIB_INIT"
dnl Executables must necessarily fully bind the wxWindows library at dnl Executables must necessarily fully bind the wxWindows library at
dnl program launch otherwise lazy binding breaks RTTI class info dnl program launch otherwise lazy binding breaks RTTI class info
LDFLAGS="$LDFLAGS -Wl,-bind_at_load" LDFLAGS_EXE="$LDFLAGS_EXE -Wl,-bind_at_load"
SHARED_LD="$CXX -dynamiclib -init _wxWindowsDylibInit -o" SHARED_LD="$CXX -dynamiclib -init _wxWindowsDylibInit -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}"
@@ -4883,6 +4883,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_EXE)
AC_SUBST(OPENGL_LIBS) AC_SUBST(OPENGL_LIBS)
AC_SUBST(DMALLOC_LIBS) AC_SUBST(DMALLOC_LIBS)
AC_SUBST(EXTRADEFS) AC_SUBST(EXTRADEFS)

4
src/make.env.in
View File

@@ -75,3 +75,7 @@ PICFLAGS = @PIC_FLAG@
# EXTRALIBS instead (see above) # EXTRALIBS instead (see above)
# LDFLAGS = @LDFLAGS@ # LDFLAGS = @LDFLAGS@
# specific linker flags for when building executables since there
# Mac OS X requires specific linker flags for executables linked
# against dynamic shared libraries
LDFLAGS_EXE = @LDFLAGS_EXE@

2
src/makeprog.env.in
View File

@@ -30,7 +30,7 @@ include $(top_builddir)/src/make.env
all: $(BIN_PROGRAM) @MACOSX_BUNDLE@ install_dirs install_data all: $(BIN_PROGRAM) @MACOSX_BUNDLE@ install_dirs install_data
$(BIN_PROGRAM): $(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(RES_PROGRAM_OBJ) @LIBWXMACRES@ $(BIN_PROGRAM): $(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(RES_PROGRAM_OBJ) @LIBWXMACRES@
$(CXX) $(LDFLAGS) -o $(BIN_PROGRAM) $(OBJECTS) $(LDLIBS) $(LIBRARIES) $(RES_PROGRAM_OBJ) $(CXX) $(LDFLAGS_EXE) -o $(BIN_PROGRAM) $(OBJECTS) $(LDLIBS) $(LIBRARIES) $(RES_PROGRAM_OBJ)
@LIBWXMACRESCOMP@ @LIBWXMACRESCOMP@
install_dirs: install_dirs:

6
wx-config.in
View File

@@ -14,7 +14,8 @@ usage()
{ {
cat <<EOF cat <<EOF
Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--static] Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--static]
[--libs] [--gl-libs] [--cppflags] [--cflags] [--cxxflags] [--rezflags] [--libs] [--gl-libs]
[--cppflags] [--cflags] [--cxxflags] [--ldflags] [--rezflags]
[--cc] [--cxx] [--ld] [--cc] [--cxx] [--ld]
wx-config returns configuration information about the installed wx-config returns configuration information about the installed
@@ -88,6 +89,9 @@ while test $# -gt 0; do
--cxxflags) --cxxflags)
echo `cppflags` @CODE_GEN_FLAGS@ @CODE_GEN_FLAGS_CXX@ echo `cppflags` @CODE_GEN_FLAGS@ @CODE_GEN_FLAGS_CXX@
;; ;;
--ldflags)
echo @LDFLAGS_EXE@
;;
--rezflags) --rezflags)
echo @LIBWXMACRESWXCONFIG@ echo @LIBWXMACRESWXCONFIG@
;; ;;