projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Missing API of wxMenuItem. const corrections. PalmOS specific note.
[wxWidgets.git]
/
samples
/
treectrl
/
Makefile.in
diff --git
a/samples/treectrl/Makefile.in
b/samples/treectrl/Makefile.in
index 4e7883dd77ac95a258156082e36cb7d89bbd5354..be82cd3ca53f8f7b12900f9bad5b5aa81bfdce4e 100644
(file)
--- a/
samples/treectrl/Makefile.in
+++ b/
samples/treectrl/Makefile.in
@@
-1,6
+1,6
@@
# =========================================================================
# This makefile was generated by
# =========================================================================
# This makefile was generated by
-# Bakefile 0.1.
4
(http://bakefile.sourceforge.net)
+# Bakefile 0.1.
7
(http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
# Do not modify, all changes will be overwritten!
# =========================================================================
@@
-37,7
+37,7
@@
SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
DESTDIR =
WX_RELEASE = 2.5
DESTDIR =
WX_RELEASE = 2.5
-WX_VERSION = $(WX_RELEASE).
2
+WX_VERSION = $(WX_RELEASE).
4
LIBDIRNAME = $(top_builddir)lib
TREECTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
LIBDIRNAME = $(top_builddir)lib
TREECTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@
-57,6
+57,10
@@
TREECTRL_OBJECTS = \
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
@COND_PLATFORM_MAC_1@__treectrl___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C treectrl$(EXEEXT)
@COND_PLATFORM_MAC_1@__treectrl___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@COND_PLATFORM_MAC_1@__treectrl___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C treectrl$(EXEEXT)
@COND_PLATFORM_MAC_1@__treectrl___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@
-98,7
+102,7
@@
COND_MONOLITHIC_1___WXLIB_MONO_p = \
@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(
WX_LIB_FLAVOUR)-$(WX_RELEASE)$(
HOST_SUFFIX)
COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
@@
-107,7
+111,7
@@
COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o treectrl$(EXEEXT) \
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../samples -i $(top_srcdir)/include -o treectrl$(EXEEXT) \
- Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).
2
.r sample.r
+ Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).
4
.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: ###
@@
-127,16
+131,16
@@
clean:
rm -rf treectrl.app
distclean: clean
rm -rf treectrl.app
distclean: clean
- rm -f config
ure config
.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+ rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
treectrl$(EXEEXT): $(TREECTRL_OBJECTS) $(__treectrl___win32rc)
treectrl$(EXEEXT): $(TREECTRL_OBJECTS) $(__treectrl___win32rc)
- $(CXX) -o $@ $(TREECTRL_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
) $(EXTRALIBS
_GUI)
+ $(CXX) -o $@ $(TREECTRL_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)
$(__treectrl___mac_rezcmd)
$(__treectrl___mac_setfilecmd)
$(__treectrl___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
$(__treectrl___mac_rezcmd)
$(__treectrl___mac_setfilecmd)
$(__treectrl___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
-treectrl.app/Contents/PkgInfo: treectrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).
2
.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+treectrl.app/Contents/PkgInfo: treectrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).
4
.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p treectrl.app/Contents
mkdir -p treectrl.app/Contents/MacOS
mkdir -p treectrl.app/Contents/Resources
mkdir -p treectrl.app/Contents
mkdir -p treectrl.app/Contents/MacOS
mkdir -p treectrl.app/Contents/Resources
@@
-154,16
+158,16
@@
treectrl.app/Contents/PkgInfo: treectrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
ln -f treectrl$(EXEEXT) treectrl.app/Contents/MacOS/treectrl
ln -f treectrl$(EXEEXT) treectrl.app/Contents/MacOS/treectrl
- cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).
2
.rsrc treectrl.app/Contents/Resources/treectrl.rsrc
+ cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).
4
.rsrc treectrl.app/Contents/Resources/treectrl.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns treectrl.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@treectrl_bundle: $(____treectrl_BUNDLE_TGT_REF_DEP)
treectrl_treetest.o: $(srcdir)/treetest.cpp
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns treectrl.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@treectrl_bundle: $(____treectrl_BUNDLE_TGT_REF_DEP)
treectrl_treetest.o: $(srcdir)/treetest.cpp
- $(CXXC) -c -o $@ $(TREECTRL_CXXFLAGS) $
<
+ $(CXXC) -c -o $@ $(TREECTRL_CXXFLAGS) $
(srcdir)/treetest.cpp
treectrl_treetest_rc.o: $(srcdir)/treetest.rc
treectrl_treetest_rc.o: $(srcdir)/treetest.rc
- $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include
+ $(RESCOMP) -i$< -o$@
--define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include
# Include dependency info, if present:
# Include dependency info, if present: