Fix wrong in wxListCtrl::SetItemColumnImage() in r74716.

[wxWidgets.git] / tests / benchmarks / Makefile.in

diff --git a/tests/benchmarks/Makefile.in b/tests/benchmarks/Makefile.in
index 85960202dd6591b1ce2bc70ff39bef7d2ca61b7e..d221ea33c31b703e7a8b088ff923dbe037f09161 100644 (file)
--- a/tests/benchmarks/Makefile.in
+++ b/tests/benchmarks/Makefile.in
@@ -80,7 +80,7 @@ BENCH_GUI_OBJECTS =  \
 @COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
 @COND_MONOLITHIC_1@    $(EXTRALIBS_XML) $(EXTRALIBS_GUI)
 @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
 @COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
 @COND_MONOLITHIC_1@    $(EXTRALIBS_XML) $(EXTRALIBS_GUI)
 @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)

-@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 

 @COND_PLATFORM_MAC_0@__bench___mac_setfilecmd = @true
 @COND_PLATFORM_MAC_1@__bench___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL bench$(EXEEXT)
 @COND_PLATFORM_MAC_0@__bench___mac_setfilecmd = @true
 @COND_PLATFORM_MAC_1@__bench___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL bench$(EXEEXT)


@@ -120,6 +120,9 @@ COND_MONOLITHIC_0___WXLIB_NET_p = \
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)

+@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
+@COND_MONOLITHIC_1_USE_STC_1@  = \
+@COND_MONOLITHIC_1_USE_STC_1@  -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)


@@ -187,33 +190,33 @@ data:
        done
 
 @COND_USE_GUI_1@bench_gui$(EXEEXT): $(BENCH_GUI_OBJECTS) $(__bench_gui___win32rc)
        done
 
 @COND_USE_GUI_1@bench_gui$(EXEEXT): $(BENCH_GUI_OBJECTS) $(__bench_gui___win32rc)

-@COND_USE_GUI_1@       $(CXX) -o $@ $(BENCH_GUI_OBJECTS)    -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG)  $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
-@COND_USE_GUI_1@
+@COND_USE_GUI_1@       $(CXX) -o $@ $(BENCH_GUI_OBJECTS)    -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG)  $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+@COND_USE_GUI_1@       

 @COND_USE_GUI_1@       $(__bench_gui___mac_setfilecmd)
 
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@bench_gui.app/Contents/PkgInfo: $(__bench_gui___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     mkdir -p bench_gui.app/Contents
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     mkdir -p bench_gui.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     mkdir -p bench_gui.app/Contents/Resources
 @COND_USE_GUI_1@       $(__bench_gui___mac_setfilecmd)
 
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@bench_gui.app/Contents/PkgInfo: $(__bench_gui___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     mkdir -p bench_gui.app/Contents
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     mkdir -p bench_gui.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     mkdir -p bench_gui.app/Contents/Resources

-@COND_PLATFORM_MACOSX_1_USE_GUI_1@
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@     
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@     

 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     -e "s/EXECUTABLE/bench_gui/" \
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     -e "s/VERSION/$(WX_VERSION)/" \
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     $(top_srcdir)/src/osx/carbon/Info.plist.in >bench_gui.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     -e "s/EXECUTABLE/bench_gui/" \
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     -e "s/VERSION/$(WX_VERSION)/" \
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     $(top_srcdir)/src/osx/carbon/Info.plist.in >bench_gui.app/Contents/Info.plist

-@COND_PLATFORM_MACOSX_1_USE_GUI_1@
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@     
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@     

 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     /bin/echo "APPL????" >bench_gui.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     /bin/echo "APPL????" >bench_gui.app/Contents/PkgInfo

-@COND_PLATFORM_MACOSX_1_USE_GUI_1@
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@     
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@     

 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     ln -f bench_gui$(EXEEXT) bench_gui.app/Contents/MacOS/bench_gui
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     ln -f bench_gui$(EXEEXT) bench_gui.app/Contents/MacOS/bench_gui

-@COND_PLATFORM_MACOSX_1_USE_GUI_1@
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@     
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@     

 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns bench_gui.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@bench_gui_bundle: $(____bench_gui_BUNDLE_TGT_REF_DEP)
 
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns bench_gui.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@bench_gui_bundle: $(____bench_gui_BUNDLE_TGT_REF_DEP)
 

-data-image:
+data-image: 

        @mkdir -p .
        @for f in ../../samples/image/horse.bmp ../../samples/image/horse.jpg ../../samples/image/horse.png ../../samples/image/horse.tif; do \
        if test ! -f ./$$f -a ! -d ./$$f ; \
        @mkdir -p .
        @for f in ../../samples/image/horse.bmp ../../samples/image/horse.jpg ../../samples/image/horse.png ../../samples/image/horse.tif; do \
        if test ! -f ./$$f -a ! -d ./$$f ; \