projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Blind fixes for warnings in wxTinderbox.
[wxWidgets.git]
/
samples
/
oleauto
/
Makefile.in
diff --git
a/samples/oleauto/Makefile.in
b/samples/oleauto/Makefile.in
index 9b8b932396ee422de63531a30031aaaeb7ebcf81..28e3d93dbef7f130b2918210c7946d5bbcd4ff1c 100644
(file)
--- a/
samples/oleauto/Makefile.in
+++ b/
samples/oleauto/Makefile.in
@@
-11,7
+11,8
@@
prefix = @prefix@
exec_prefix = @exec_prefix@
INSTALL = @INSTALL@
EXEEXT = @EXEEXT@
exec_prefix = @exec_prefix@
INSTALL = @INSTALL@
EXEEXT = @EXEEXT@
-RESCOMP = @RESCOMP@
+WINDRES = @WINDRES@
+REZ = @REZ@
SETFILE = @SETFILE@
NM = @NM@
srcdir = @srcdir@
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@
TOOLKIT = @TOOLKIT@
TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
TOOLKIT_VERSION = @TOOLKIT_VERSION@
+TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
EXTRALIBS = @EXTRALIBS@
EXTRALIBS_GUI = @EXTRALIBS_GUI@
HOST_SUFFIX = @HOST_SUFFIX@
EXTRALIBS = @EXTRALIBS@
EXTRALIBS_GUI = @EXTRALIBS_GUI@
HOST_SUFFIX = @HOST_SUFFIX@
@@
-35,8
+37,8
@@
SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
### Variables: ###
DESTDIR =
### Variables: ###
DESTDIR =
-WX_RELEASE = 2.
6
-WX_VERSION = $(WX_RELEASE).
2
+WX_RELEASE = 2.
7
+WX_VERSION = $(WX_RELEASE).
0
LIBDIRNAME = $(top_builddir)lib
OLEAUTO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
LIBDIRNAME = $(top_builddir)lib
OLEAUTO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
@@
-82,6
+84,10
@@
OLEAUTO_OBJECTS = \
COND_PLATFORM_OS2_1___oleauto___os2_emxbindcmd = $(NM) oleauto$(EXEEXT) | if \
grep -q pmwin.763 ; then emxbind -ep oleauto$(EXEEXT) ; fi
@COND_PLATFORM_OS2_1@__oleauto___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___oleauto___os2_emxbindcmd)
COND_PLATFORM_OS2_1___oleauto___os2_emxbindcmd = $(NM) oleauto$(EXEEXT) | if \
grep -q pmwin.763 ; then emxbind -ep oleauto$(EXEEXT) ; fi
@COND_PLATFORM_OS2_1@__oleauto___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___oleauto___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@__oleauto_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__oleauto_bundle___depname = oleauto_bundle
@COND_PLATFORM_OS2_1@__oleauto_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__oleauto_bundle___depname = oleauto_bundle
@@
-117,11
+123,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_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 = $(RE
SCOMP
) -d __DARWIN__ -t APPL -d \
+COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RE
Z
) -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 \
__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 oleauto$(EXEEXT) Carbon.r
\
- sample.r
+ $(srcdir)/../../samples
$(__RCDEFDIR_p) -i $(top_srcdir)/include -o
\
+
oleauto$(EXEEXT) Carbon.r
sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
@@
-176,7
+182,7
@@
oleauto_oleauto.o: $(srcdir)/oleauto.cpp
$(CXXC) -c -o $@ $(OLEAUTO_CXXFLAGS) $(srcdir)/oleauto.cpp
oleauto_oleauto_rc.o: $(srcdir)/oleauto.rc
$(CXXC) -c -o $@ $(OLEAUTO_CXXFLAGS) $(srcdir)/oleauto.cpp
oleauto_oleauto_rc.o: $(srcdir)/oleauto.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:
# Include dependency info, if present: