Compared files  

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\mmedia\Makefile.in
Last modified2005-08-13 02:23:42.000 +0200
Size23.3 Kb (453 Lines)
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\src\mmedia\Makefile.in
Last modified2006-03-16 14:01:14.001 +0100
Size23.7 Kb (460 Lines)
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged13439
Inserted23
Deleted00
Ignored00
Changed1032



   Comparison Details  

1U1U# =========================================================================
2U2U#     This makefile was generated by
3C#     Bakefile 0.1.9 (http://bakefile.sourceforge.net) 3C#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
4U4U#     Do not modify, all changes will be overwritten!
5U5U# =========================================================================
6U6U 
9 skipped lines
16U16USO_SUFFIX = @SO_SUFFIX@
17U17UDLLIMP_SUFFIX = @DLLIMP_SUFFIX@
18U18ULN_S = @LN_S@
19CRESCOMP = @RESCOMP@ 19CWINDRES = @WINDRES@
20U20UPIC_FLAG = @PIC_FLAG@
21U21USONAME_FLAG = @SONAME_FLAG@
22U22USTRIP = @STRIP@
18 skipped lines
41U41UTOOLKIT = @TOOLKIT@
42U42UTOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
43U43UTOOLKIT_VERSION = @TOOLKIT_VERSION@
  44ATOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
44U45UEXTRALIBS = @EXTRALIBS@
45U46UEXTRALIBS_GUI = @EXTRALIBS_GUI@
46U47UHOST_SUFFIX = @HOST_SUFFIX@
59 skipped lines
106U107U@COND_DEPS_TRACKING_0@CXXC = $(CXX)
107U108U@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
108U109U@COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
109C@COND_PLATFORM_MACOSX_1@-compatibility_version 2.0 -current_version 2.0 110C@COND_PLATFORM_MACOSX_1@-compatibility_version 3.0 -current_version 3.1
110U111U@COND_USE_GUI_0@PORTNAME = base
111U112U@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
112U113U@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
31 skipped lines
144U145U    -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
145U146U@COND_WINDOWS_IMPLIB_1@__mmediadll___importlib = $(COND_WINDOWS_IMPLIB_1___mmediadll___importlib)
146U147U@COND_GCC_PCH_1@__mmediadll_PCH_INC = -I.pch/wxprec_mmediadll
  148C@COND_ICC_PCH_1@__mmediadll_PCH_INC = -use_pch \
  149C@COND_ICC_PCH_1@.pch/wxprec_mmediadll/wx/wxprec.h.gch
147C@COND_GCC_PCH_1@___pch_wxprec_mmediadll_wx_wxprec_h_gch___depname \ 150C@COND_USE_PCH_1@___pch_wxprec_mmediadll_wx_wxprec_h_gch___depname \
148C@COND_GCC_PCH_1@= .pch/wxprec_mmediadll/wx/wxprec.h.gch 151C@COND_USE_PCH_1@= .pch/wxprec_mmediadll/wx/wxprec.h.gch
149U152U@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__mmediadll___targetsuf2 \
150U153U@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@= .$(SO_SUFFIX).0
151U154U@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__mmediadll___targetsuf2 \
1 skipped line
153U156U@COND_USE_SOVERSION_0@__mmediadll___targetsuf2 = .$(SO_SUFFIX)
154U157U@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__mmediadll___targetsuf3 \
155U158U@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  = \
156C@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  .$(SO_SUFFIX).0.2.0 159C@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  .$(SO_SUFFIX).0.3.1
157U160U@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__mmediadll___targetsuf3 \
158C@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@= .0.2.0.$(SO_SUFFIX) 161C@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@= .0.3.1.$(SO_SUFFIX)
159U162U@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__mmediadll___targetsuf3 \
160U163U@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@= -0.$(SO_SUFFIX)
161U164U@COND_USE_SOVERSION_0@__mmediadll___targetsuf3 = .$(SO_SUFFIX)
23 skipped lines
185U188U    $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) \
186U189U    $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
187U190U@COND_USE_SOSYMLINKS_1@__mmediadll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_inst_cmd)
  191A@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  192A@COND_TOOLKIT_MSW@  $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
188U193U@COND_PLATFORM_WIN32_1@__mmediadll___win32rc = mmediadll_version_rc.o
189U194UCOND_MONOLITHIC_1___WXLIB_MONO_p = \
190U195U    -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
36 skipped lines
227U232U@COND_SHARED_0@__mmedialib___depname = $(COND_SHARED_0___mmedialib___depname)
228U233U@COND_SHARED_0@__install_mmedialib___depname = install_mmedialib
229U234U@COND_GCC_PCH_1@__mmedialib_PCH_INC = -I.pch/wxprec_mmedialib
  235C@COND_ICC_PCH_1@__mmedialib_PCH_INC = -use_pch \
  236C@COND_ICC_PCH_1@.pch/wxprec_mmedialib/wx/wxprec.h.gch
230C@COND_GCC_PCH_1@___pch_wxprec_mmedialib_wx_wxprec_h_gch___depname \ 237C@COND_USE_PCH_1@___pch_wxprec_mmedialib_wx_wxprec_h_gch___depname \
231C@COND_GCC_PCH_1@= .pch/wxprec_mmedialib/wx/wxprec.h.gch 238C@COND_USE_PCH_1@= .pch/wxprec_mmedialib/wx/wxprec.h.gch
232U239UCOND_PLATFORM_UNIX_1___MMEDIA_PLATFORM_SRC_OBJECTS_1 =  \
233U240U    mmedialib_cdunix.o \
234U241U    mmedialib_sndesd.o \
48 skipped lines
283U290U@COND_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) $(DESTDIR)$(libdir)
284U291U@COND_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__mmediadll___so_symlinks_inst_cmd))
285U292U 
286C@COND_GCC_PCH_1@.pch/wxprec_mmediadll/wx/wxprec.h.gch:  293C@COND_USE_PCH_1@.pch/wxprec_mmediadll/wx/wxprec.h.gch: 
287C@COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_mmediadll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MMEDIADLL_CXXFLAGS) 294C@COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_mmediadll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MMEDIADLL_CXXFLAGS)
288U295U 
289U296U@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(MMEDIALIB_OBJECTS)
290U297U@COND_SHARED_0@   rm -f $@
4 skipped lines
295U302U@COND_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
296U303U@COND_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
297U304U 
298C@COND_GCC_PCH_1@.pch/wxprec_mmedialib/wx/wxprec.h.gch:  305C@COND_USE_PCH_1@.pch/wxprec_mmedialib/wx/wxprec.h.gch: 
299C@COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_mmedialib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MMEDIALIB_CXXFLAGS) 306C@COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_mmedialib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MMEDIALIB_CXXFLAGS)
300U307U 
301U308Ummediadll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(MMEDIADLL_ODEP)
302C    $(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include 309C    $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
303U310U 
304U311Ummediadll_cdunix.o: $(srcdir)/cdunix.cpp $(MMEDIADLL_ODEP)
305U312U    $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(srcdir)/cdunix.cpp
148 skipped lines

   Text comparison Options  

Match character case: yes.
Match line endings: no.
Match spaces

At start of lines: yes,
In middle of lines: yes,
At end of lines: yes.
Blank lines as empty lines: no.
Activate comparison algorithm
At word level: yes,
At character level: no.


   Legend  

UExample of unchanged line
CExample of modified line
AExample of added line
RExample of removed line
IExample of ignored line
Modified text
Added text
Removed text

This report has been generated by Ellié Computing Merge on 2006-09-07 16:23:25.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.