use install_name_tool so that samples use uninstalled shared libs on OSX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -39,10 +39,16 @@
|
||||
</template>
|
||||
|
||||
<template id="wx_sample" template="wx_util">
|
||||
<ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
|
||||
<if cond="FORMAT=='autoconf'">
|
||||
<ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
|
||||
<__command>$(LF)$(SAMPLES_RPATH_POSTLINK)</__command>
|
||||
</if>
|
||||
</template>
|
||||
<template id="wx_sample_console" template="wx_util_console">
|
||||
<ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
|
||||
<if cond="FORMAT=='autoconf'">
|
||||
<ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
|
||||
<__command>$(SAMPLES_RPATH_POSTLINK)</__command>
|
||||
</if>
|
||||
</template>
|
||||
|
||||
|
||||
|
@@ -168,8 +168,9 @@ compiled .lib files and setup.h under the lib/ toplevel directory.
|
||||
<option name="EXTRALIBS_ODBC"/>
|
||||
<option name="EXTRALIBS_GUI"/>
|
||||
<option name="EXTRALIBS_OPENGL"/>
|
||||
<option name="SAMPLES_RPATH_FLAG"/>
|
||||
<option name="HOST_SUFFIX"/>
|
||||
<option name="SAMPLES_RPATH_FLAG"/>
|
||||
<option name="SAMPLES_RPATH_POSTLINK"/>
|
||||
|
||||
<set var="TOP_SRCDIR">$(top_srcdir)/</set>
|
||||
<set var="RUNTIME_LIBS">dynamic</set>
|
||||
@@ -197,7 +198,6 @@ it if SHARED=1 unless you know what you are doing.
|
||||
<set var="TOOLKIT">MSW</set>
|
||||
<set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
|
||||
<set var="TOOLKIT_VERSION"/>
|
||||
<set var="SAMPLES_RPATH_FLAG"/>
|
||||
<set var="HOST_SUFFIX"/>
|
||||
<set var="EXTRALIBS"/>
|
||||
<set var="EXTRALIBS_XML"/>
|
||||
|
Reference in New Issue
Block a user