X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7da00c46e1f16b97c3d49e5d992b7f859f81d032..7d7cb80036e7cf1421d751f74528f660f9c90a33:/samples/dataview/Makefile.in?ds=sidebyside diff --git a/samples/dataview/Makefile.in b/samples/dataview/Makefile.in index 959504a903..2f424dc3a9 100644 --- a/samples/dataview/Makefile.in +++ b/samples/dataview/Makefile.in @@ -35,7 +35,6 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@ CXXWARNINGS = @CXXWARNINGS@ HOST_SUFFIX = @HOST_SUFFIX@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ -SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ wx_top_builddir = @wx_top_builddir@ ### Variables: ### @@ -51,6 +50,7 @@ DATAVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ DATAVIEW_OBJECTS = \ $(__dataview_os2_lib_res) \ dataview_dataview.o \ + dataview_mymodels.o \ $(__dataview___win32rc) ### Conditionally set variables: ### @@ -156,7 +156,6 @@ dataview$(EXEEXT): $(DATAVIEW_OBJECTS) $(__dataview___win32rc) $(__dataview___mac_setfilecmd) $(__dataview___os2_emxbindcmd) - $(SAMPLES_RPATH_POSTLINK) @COND_PLATFORM_MACOSX_1@dataview.app/Contents/PkgInfo: dataview$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p dataview.app/Contents @@ -183,6 +182,9 @@ dataview$(EXEEXT): $(DATAVIEW_OBJECTS) $(__dataview___win32rc) dataview_dataview.o: $(srcdir)/dataview.cpp $(CXXC) -c -o $@ $(DATAVIEW_CXXFLAGS) $(srcdir)/dataview.cpp +dataview_mymodels.o: $(srcdir)/mymodels.cpp + $(CXXC) -c -o $@ $(DATAVIEW_CXXFLAGS) $(srcdir)/mymodels.cpp + dataview_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