support creating larger minidumps; support WX_CRASH_FLAGS env var

[wxWidgets.git] / samples / shaped / Makefile.in

diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in
index fcff23f20a39616c7537a4e23b01f1e726d8ed12..6c344e69b0d993aae601b412382cffb13708af4c 100644 (file)
--- a/samples/shaped/Makefile.in
+++ b/samples/shaped/Makefile.in
@@ -19,6 +19,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
+NM = @NM@
 RESCOMP = @RESCOMP@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
@@ -33,6 +34,7 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
+DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
 SHAPED_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
@@ -40,7 +42,7 @@ SHAPED_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 SHAPED_OBJECTS =  \
        shaped_shaped.o \
        $(__shaped___win32rc)
-WX_VERSION = 2.5.0
+WX_VERSION = 2.5.1
 
 ### Conditionally set variables: ###
 
@@ -76,7 +78,7 @@ WX_VERSION = 2.5.0
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \
        $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o shaped$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
@@ -92,8 +94,9 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_PLATFORM_MAC_1@__shaped___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__shaped___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C shaped$(EXEEXT)
-@COND_PLATFORM_OS2_1@__shaped___os2_emxbindcmd = \
-@COND_PLATFORM_OS2_1@  emxbind -ep shaped$(EXEEXT)
+COND_PLATFORM_OS2_1___shaped___os2_emxbindcmd = $(NM) shaped$(EXEEXT) | if grep \
+       -q pmwin.763 ; then emxbind -ep shaped$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__shaped___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___shaped___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__shaped___win32rc = shaped_shaped_rc.o
 @COND_PLATFORM_MACOSX_1@__shaped_bundle___depname = shaped_bundle
 
@@ -129,7 +132,7 @@ shaped$(EXEEXT): $(SHAPED_OBJECTS) $(__shaped___win32rc)
        $(__shaped___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-shaped.app/Contents/PkgInfo: shaped$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+shaped.app/Contents/PkgInfo: shaped$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
        mkdir -p shaped.app/Contents
        mkdir -p shaped.app/Contents/MacOS
        mkdir -p shaped.app/Contents/Resources
@@ -147,7 +150,7 @@ shaped.app/Contents/PkgInfo: shaped$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in
        ln -f shaped$(EXEEXT) shaped.app/Contents/MacOS/shaped
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc shaped.app/Contents/Resources/shaped.rsrc
+       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc shaped.app/Contents/Resources/shaped.rsrc
        ln -f $(top_srcdir)/src/mac/wxmac.icns shaped.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@shaped_bundle: shaped.app/Contents/PkgInfo
@@ -156,7 +159,7 @@ shaped_shaped.o: $(srcdir)/shaped.cpp
        $(CXXC) -c -o $@ $(SHAPED_CXXFLAGS) $<
 
 shaped_shaped_rc.o: $(srcdir)/shaped.rc
-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
+       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
 
 uninstall: