X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0ee4059da25c15b2765ddb2abfc42c3cbf64c045..17b1d76b4add82305463d10b9f65668d06169363:/samples/docview/Makefile.in?ds=inline

diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in
index 94141112b5..76a69c2e9a 100644
--- a/samples/docview/Makefile.in
+++ b/samples/docview/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -11,7 +11,8 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 INSTALL = @INSTALL@
 EXEEXT = @EXEEXT@
-RESCOMP = @RESCOMP@
+WINDRES = @WINDRES@
+REZ = @REZ@
 SETFILE = @SETFILE@
 NM = @NM@
 srcdir = @srcdir@
@@ -26,6 +27,7 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
+TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
@@ -36,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
 DOCVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
@@ -65,11 +67,11 @@ DOCVIEW_OBJECTS =  \
 @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
 @COND_PLATFORM_MAC_1@__docview___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@	$(SETFILE) -a C docview$(EXEEXT)
-COND_PLATFORM_MAC_1___docview___mac_rezcmd = $(RESCOMP) -d __DARWIN__ -t APPL -d \
+COND_PLATFORM_MAC_1___docview___mac_rezcmd = $(REZ) -d __DARWIN__ -t APPL -d \
 	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
 	$(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
-	$(srcdir)/../../samples -i $(top_srcdir)/include -o docview$(EXEEXT) chart.r \
-	doc.r docview.r mondrian.r
+	$(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \
+	docview$(EXEEXT) chart.r doc.r docview.r mondrian.r
 @COND_PLATFORM_MAC_1@__docview___mac_rezcmd = $(COND_PLATFORM_MAC_1___docview___mac_rezcmd)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
@@ -89,6 +91,10 @@ COND_PLATFORM_MAC_1___docview___mac_rezcmd = $(RESCOMP) -d __DARWIN__ -t APPL -d
 COND_PLATFORM_OS2_1___docview___os2_emxbindcmd = $(NM) docview$(EXEEXT) | if \
 	grep -q pmwin.763 ; then emxbind -ep docview$(EXEEXT) ; fi
 @COND_PLATFORM_OS2_1@__docview___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___docview___os2_emxbindcmd)
+@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \
+@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
+@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__docview_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__docview_bundle___depname = docview_bundle
@@ -145,7 +151,7 @@ distclean: clean
 	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc)
-	$(CXX) -o $@ $(DOCVIEW_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI)
+	$(CXX) -o $@ $(DOCVIEW_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
 	$(__docview___mac_rezcmd)
 	$(__docview___mac_setfilecmd)
 	$(__docview___os2_emxbindcmd)
@@ -183,7 +189,7 @@ docview_view.o: $(srcdir)/view.cpp
 	$(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $(srcdir)/view.cpp
 
 docview_docview_rc.o: $(srcdir)/docview.rc
-	$(RESCOMP) -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 --include-dir $(top_srcdir)/include
+	$(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
 
 
 # Include dependency info, if present: