fix for infinite loop in wxFileConfig when reading from input stream fails (patch...

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

diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in
index b243d48f05002ac5e1bf22f3ff89904837a5e5e1..cd72bb93277f0141ba04fe5ad96b98f697962ac3 100644 (file)
--- a/samples/treectrl/Makefile.in
+++ b/samples/treectrl/Makefile.in
@@ -36,10 +36,11 @@ top_srcdir = @top_srcdir@
 
 DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
 
 DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib

-TREECTRL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+TREECTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \

        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \

-       -I$(srcdir)/../../samples $(CXXFLAGS)
+       -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)

 TREECTRL_OBJECTS =  \
 TREECTRL_OBJECTS =  \

+       $(__treectrl_os2_lib_res) \

        treectrl_treetest.o \
        $(__treectrl___win32rc)
 WX_VERSION = 2.5.1
        treectrl_treetest.o \
        $(__treectrl___win32rc)
 WX_VERSION = 2.5.1


@@ -99,6 +100,8 @@ COND_PLATFORM_OS2_1___treectrl___os2_emxbindcmd = $(NM) treectrl$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__treectrl___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___treectrl___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__treectrl___win32rc = treectrl_treetest_rc.o
 @COND_PLATFORM_MACOSX_1@__treectrl_bundle___depname = treectrl_bundle
 @COND_PLATFORM_OS2_1@__treectrl___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___treectrl___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__treectrl___win32rc = treectrl_treetest_rc.o
 @COND_PLATFORM_MACOSX_1@__treectrl_bundle___depname = treectrl_bundle

+@COND_PLATFORM_OS2_1@__treectrl_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res

 
 ### Targets: ###
 
 
 ### Targets: ###
 


@@ -142,8 +145,8 @@ treectrl.app/Contents/PkgInfo: treectrl$(EXEEXT) $(top_srcdir)/src/mac/Info.plis
        ln -f treectrl$(EXEEXT) treectrl.app/Contents/MacOS/treectrl
        
        
        ln -f treectrl$(EXEEXT) treectrl.app/Contents/MacOS/treectrl
        
        

-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc treectrl.app/Contents/Resources/treectrl.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns treectrl.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc treectrl.app/Contents/Resources/treectrl.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns treectrl.app/Contents/Resources/wxmac.icns

 
 @COND_PLATFORM_MACOSX_1@treectrl_bundle: treectrl.app/Contents/PkgInfo
 
 
 @COND_PLATFORM_MACOSX_1@treectrl_bundle: treectrl.app/Contents/PkgInfo