projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow adjusting the combo button size (patch 1489452)
[wxWidgets.git]
/
samples
/
dragimag
/
Makefile.in
diff --git
a/samples/dragimag/Makefile.in
b/samples/dragimag/Makefile.in
index 462ac4ffd2eb77bd44d4a0022ae100b0845ac2fa..5cdb80f8e0e23e0599137853e5b158586abd66f7 100644
(file)
--- a/
samples/dragimag/Makefile.in
+++ b/
samples/dragimag/Makefile.in
@@
-1,6
+1,6
@@
# =========================================================================
# This makefile was generated by
# =========================================================================
# This makefile was generated by
-# Bakefile 0.
1.8
(http://bakefile.sourceforge.net)
+# Bakefile 0.
2.0
(http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
# Do not modify, all changes will be overwritten!
# =========================================================================
@@
-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,7
+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_
NAME = @TOOLCHAIN_
NAME@
+TOOLCHAIN_
FULLNAME = @TOOLCHAIN_FULL
NAME@
EXTRALIBS = @EXTRALIBS@
EXTRALIBS_GUI = @EXTRALIBS_GUI@
HOST_SUFFIX = @HOST_SUFFIX@
EXTRALIBS = @EXTRALIBS@
EXTRALIBS_GUI = @EXTRALIBS_GUI@
HOST_SUFFIX = @HOST_SUFFIX@
@@
-36,7
+37,7
@@
SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
### Variables: ###
DESTDIR =
### Variables: ###
DESTDIR =
-WX_RELEASE = 2.
6
+WX_RELEASE = 2.
7
WX_VERSION = $(WX_RELEASE).0
LIBDIRNAME = $(top_builddir)lib
DRAGIMAG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
WX_VERSION = $(WX_RELEASE).0
LIBDIRNAME = $(top_builddir)lib
DRAGIMAG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
@@
-83,6
+84,10
@@
DRAGIMAG_OBJECTS = \
COND_PLATFORM_OS2_1___dragimag___os2_emxbindcmd = $(NM) dragimag$(EXEEXT) | if \
grep -q pmwin.763 ; then emxbind -ep dragimag$(EXEEXT) ; fi
@COND_PLATFORM_OS2_1@__dragimag___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___dragimag___os2_emxbindcmd)
COND_PLATFORM_OS2_1___dragimag___os2_emxbindcmd = $(NM) dragimag$(EXEEXT) | if \
grep -q pmwin.763 ; then emxbind -ep dragimag$(EXEEXT) ; fi
@COND_PLATFORM_OS2_1@__dragimag___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___dragimag___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@__dragimag_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__dragimag_bundle___depname = dragimag_bundle
@COND_PLATFORM_OS2_1@__dragimag_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__dragimag_bundle___depname = dragimag_bundle
@@
-118,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 dragimag$(EXEEXT)
\
-
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0
.r sample.r
+ $(srcdir)/../../samples
$(__RCDEFDIR_p) -i $(top_srcdir)/include -o
\
+
dragimag$(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: ###
@@
-151,7
+156,7
@@
dragimag$(EXEEXT): $(DRAGIMAG_OBJECTS) $(__dragimag___win32rc)
$(__dragimag___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
$(__dragimag___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
-dragimag.app/Contents/PkgInfo: dragimag$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(
LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(
top_srcdir)/src/mac/carbon/wxmac.icns
+dragimag.app/Contents/PkgInfo: dragimag$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p dragimag.app/Contents
mkdir -p dragimag.app/Contents/MacOS
mkdir -p dragimag.app/Contents/Resources
mkdir -p dragimag.app/Contents
mkdir -p dragimag.app/Contents/MacOS
mkdir -p dragimag.app/Contents/Resources
@@
-169,7
+174,6
@@
dragimag.app/Contents/PkgInfo: dragimag$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
ln -f dragimag$(EXEEXT) dragimag.app/Contents/MacOS/dragimag
ln -f dragimag$(EXEEXT) dragimag.app/Contents/MacOS/dragimag
- cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc dragimag.app/Contents/Resources/dragimag.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dragimag.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@dragimag_bundle: $(____dragimag_BUNDLE_TGT_REF_DEP)
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dragimag.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@dragimag_bundle: $(____dragimag_BUNDLE_TGT_REF_DEP)
@@
-177,7
+181,7
@@
dragimag.app/Contents/PkgInfo: dragimag$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
data:
@mkdir -p .
@for f in backgrnd.png shape01.png shape02.png shape03.png; do \
data:
@mkdir -p .
@for f in backgrnd.png shape01.png shape02.png shape03.png; do \
- if test ! -
e
./$$f ; \
+ if test ! -
f ./$$f -a ! -d
./$$f ; \
then x=yep ; \
else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
fi; \
then x=yep ; \
else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
fi; \
@@
-190,7
+194,7
@@
dragimag_dragimag.o: $(srcdir)/dragimag.cpp
$(CXXC) -c -o $@ $(DRAGIMAG_CXXFLAGS) $(srcdir)/dragimag.cpp
dragimag_dragimag_rc.o: $(srcdir)/dragimag.rc
$(CXXC) -c -o $@ $(DRAGIMAG_CXXFLAGS) $(srcdir)/dragimag.cpp
dragimag_dragimag_rc.o: $(srcdir)/dragimag.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: