X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b2cb4316b4deca34ae451493449e97e4bdb3f3b..a97d569cbbf90ba8bb293214055c3a8c19d447b5:/samples/treectrl/Makefile.in?ds=sidebyside diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in index a116017705..1d03512e06 100644 --- a/samples/treectrl/Makefile.in +++ b/samples/treectrl/Makefile.in @@ -38,7 +38,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ DESTDIR = WX_RELEASE = 2.7 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(top_builddir)lib TREECTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ @@ -101,7 +101,7 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \ COND_MONOLITHIC_0___WXLIB_BASE_p = \ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) -@COND_PLATFORM_WIN32_1@__treectrl___win32rc = treectrl_treetest_rc.o +@COND_PLATFORM_WIN32_1@__treectrl___win32rc = treectrl_sample_rc.o COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @@ -181,7 +181,7 @@ treectrl.app/Contents/PkgInfo: treectrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/In treectrl_treetest.o: $(srcdir)/treetest.cpp $(CXXC) -c -o $@ $(TREECTRL_CXXFLAGS) $(srcdir)/treetest.cpp -treectrl_treetest_rc.o: $(srcdir)/treetest.rc +treectrl_sample_rc.o: $(srcdir)/../sample.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include