projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rebaked makefiles after htmllistbox and collapsable panel additions.
[wxWidgets.git]
/
samples
/
mediaplayer
/
Makefile.in
diff --git
a/samples/mediaplayer/Makefile.in
b/samples/mediaplayer/Makefile.in
index 5fb613dcc6f62448ba9662a6249edb8aef895ae9..ae8fe1c3c3a9afca0ee484348c8749a711b09457 100644
(file)
--- a/
samples/mediaplayer/Makefile.in
+++ b/
samples/mediaplayer/Makefile.in
@@
-1,6
+1,6
@@
# =========================================================================
# This makefile was generated by
# =========================================================================
# 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!
# =========================================================================
# 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,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).
1
LIBDIRNAME = $(top_builddir)lib
MEDIAPLAYER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
LIBDIRNAME = $(top_builddir)lib
MEDIAPLAYER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
@@
-83,6
+85,10
@@
COND_PLATFORM_OS2_1___mediaplayer___os2_emxbindcmd = $(NM) \
mediaplayer$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep \
mediaplayer$(EXEEXT) ; fi
@COND_PLATFORM_OS2_1@__mediaplayer___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___mediaplayer___os2_emxbindcmd)
mediaplayer$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep \
mediaplayer$(EXEEXT) ; fi
@COND_PLATFORM_OS2_1@__mediaplayer___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___mediaplayer___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@__mediaplayer___win32rc = mediaplayer_sample_rc.o
@COND_PLATFORM_OS2_1@__mediaplayer_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_WIN32_1@__mediaplayer___win32rc = mediaplayer_sample_rc.o
@COND_PLATFORM_OS2_1@__mediaplayer_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@@
-91,9
+97,9
@@
COND_PLATFORM_OS2_1___mediaplayer___os2_emxbindcmd = $(NM) \
@COND_TOOLKIT_COCOA@ = mediaplayer.app/Contents/PkgInfo
@COND_TOOLKIT_MAC@____mediaplayer_BUNDLE_TGT_REF_DEP = \
@COND_TOOLKIT_MAC@ mediaplayer.app/Contents/PkgInfo
@COND_TOOLKIT_COCOA@ = mediaplayer.app/Contents/PkgInfo
@COND_TOOLKIT_MAC@____mediaplayer_BUNDLE_TGT_REF_DEP = \
@COND_TOOLKIT_MAC@ mediaplayer.app/Contents/PkgInfo
-COND_MONOLITHIC_0___WXLIB_MEDIA_p = \
+COND_MONOLITHIC_0_
USE_MEDIA_1_
__WXLIB_MEDIA_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0
@__WXLIB_MEDIA_p = $(COND_MONOLITHIC_0
___WXLIB_MEDIA_p)
+@COND_MONOLITHIC_0
_USE_MEDIA_1@__WXLIB_MEDIA_p = $(COND_MONOLITHIC_0_USE_MEDIA_1
___WXLIB_MEDIA_p)
COND_MONOLITHIC_0___WXLIB_CORE_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
COND_MONOLITHIC_0___WXLIB_CORE_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@
-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_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 mediaplayer$(EXEEXT)
\
- Carbon.r sample.r
+ $(srcdir)/../../samples
$(__RCDEFDIR_p) -i $(top_srcdir)/include -o
\
+
mediaplayer$(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: ###
@@
-148,7
+154,7
@@
distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
mediaplayer$(EXEEXT): $(MEDIAPLAYER_OBJECTS) $(__mediaplayer___win32rc)
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
mediaplayer$(EXEEXT): $(MEDIAPLAYER_OBJECTS) $(__mediaplayer___win32rc)
- $(CXX) -o $@ $(MEDIAPLAYER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_MEDIA_p) $(__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 $@ $(MEDIAPLAYER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_MEDIA_p) $(__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
)
$(__mediaplayer___mac_rezcmd)
$(__mediaplayer___mac_setfilecmd)
$(__mediaplayer___os2_emxbindcmd)
$(__mediaplayer___mac_rezcmd)
$(__mediaplayer___mac_setfilecmd)
$(__mediaplayer___os2_emxbindcmd)
@@
-177,7
+183,7
@@
mediaplayer.app/Contents/PkgInfo: mediaplayer$(EXEEXT) $(top_srcdir)/src/mac/car
@COND_PLATFORM_MACOSX_1@mediaplayer_bundle: $(____mediaplayer_BUNDLE_TGT_REF_DEP)
mediaplayer_sample_rc.o: $(srcdir)/../../samples/sample.rc
@COND_PLATFORM_MACOSX_1@mediaplayer_bundle: $(____mediaplayer_BUNDLE_TGT_REF_DEP)
mediaplayer_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
mediaplayer_mediaplayer.o: $(srcdir)/mediaplayer.cpp
$(CXXC) -c -o $@ $(MEDIAPLAYER_CXXFLAGS) $(srcdir)/mediaplayer.cpp
mediaplayer_mediaplayer.o: $(srcdir)/mediaplayer.cpp
$(CXXC) -c -o $@ $(MEDIAPLAYER_CXXFLAGS) $(srcdir)/mediaplayer.cpp