Ran make -f build/autogen.mk

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

diff --git a/samples/multimon/Makefile.in b/samples/multimon/Makefile.in
index ea56f3528cb8c4fba5a73fc400fb0d1e32ef51b5..a0cdaeb78fafafcdf45c3d37ca5c42cb2221186f 100644 (file)
--- a/samples/multimon/Makefile.in
+++ b/samples/multimon/Makefile.in
@@ -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@
@@ -84,6 +86,10 @@ COND_PLATFORM_OS2_1___multimon_test___os2_emxbindcmd = $(NM) \
        multimon_test$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep \
        multimon_test$(EXEEXT) ; fi
 @COND_PLATFORM_OS2_1@__multimon_test___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___multimon_test___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_WIN32_1@__multimon_test___win32rc = \
 @COND_PLATFORM_WIN32_1@        multimon_test_sample_rc.o
 @COND_PLATFORM_OS2_1@__multimon_test_os2_lib_res = \
@@ -121,11 +127,11 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
 @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
 @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
 @COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
+COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(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 multimon_test$(EXEEXT) \
-       Carbon.r sample.r
+       $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \
+       multimon_test$(EXEEXT) Carbon.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
@@ -177,7 +183,7 @@ multimon_test.app/Contents/PkgInfo: multimon_test$(EXEEXT) $(top_srcdir)/src/mac
 @COND_PLATFORM_MACOSX_1@multimon_test_bundle: $(____multimon_test_BUNDLE_TGT_REF_DEP)
 
 multimon_test_sample_rc.o: $(srcdir)/../../samples/sample.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
 
 multimon_test_multimon_test.o: $(srcdir)/multimon_test.cpp
        $(CXXC) -c -o $@ $(MULTIMON_TEST_CXXFLAGS) $(srcdir)/multimon_test.cpp