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  

1 1 # =========================================================================
2 2 #     This makefile was generated by
3 #     Bakefile 0.1.9 (http://bakefile.sourceforge.net) 3 #     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
4 4 #     Do not modify, all changes will be overwritten!
5 5 # =========================================================================
6 6  
9 skipped lines
16 16 SO_SUFFIX = @SO_SUFFIX@
17 17 DLLIMP_SUFFIX = @DLLIMP_SUFFIX@
18 18 LN_S = @LN_S@
19 RESCOMP = @RESCOMP@ 19 WINDRES = @WINDRES@
20 20 PIC_FLAG = @PIC_FLAG@
21 21 SONAME_FLAG = @SONAME_FLAG@
22 22 STRIP = @STRIP@
18 skipped lines
41 41 TOOLKIT = @TOOLKIT@
42 42 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
43 43 TOOLKIT_VERSION = @TOOLKIT_VERSION@
  44 TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
44 45 EXTRALIBS = @EXTRALIBS@
45 46 EXTRALIBS_GUI = @EXTRALIBS_GUI@
46 47 HOST_SUFFIX = @HOST_SUFFIX@
59 skipped lines
106 107 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
107 108 @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
108 109 @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
109 @COND_PLATFORM_MACOSX_1@-compatibility_version 2.0 -current_version 2.0 110 @COND_PLATFORM_MACOSX_1@-compatibility_version 3.0 -current_version 3.1
110 111 @COND_USE_GUI_0@PORTNAME = base
111 112 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
112 113 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
31 skipped lines
144 145     -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
145 146 @COND_WINDOWS_IMPLIB_1@__mmediadll___importlib = $(COND_WINDOWS_IMPLIB_1___mmediadll___importlib)
146 147 @COND_GCC_PCH_1@__mmediadll_PCH_INC = -I.pch/wxprec_mmediadll
  148 @COND_ICC_PCH_1@__mmediadll_PCH_INC = -use_pch \
  149 @COND_ICC_PCH_1@.pch/wxprec_mmediadll/wx/wxprec.h.gch
147 @COND_GCC_PCH_1@___pch_wxprec_mmediadll_wx_wxprec_h_gch___depname \ 150 @COND_USE_PCH_1@___pch_wxprec_mmediadll_wx_wxprec_h_gch___depname \
148 @COND_GCC_PCH_1@= .pch/wxprec_mmediadll/wx/wxprec.h.gch 151 @COND_USE_PCH_1@= .pch/wxprec_mmediadll/wx/wxprec.h.gch
149 152 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__mmediadll___targetsuf2 \
150 153 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@= .$(SO_SUFFIX).0
151 154 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__mmediadll___targetsuf2 \
1 skipped line
153 156 @COND_USE_SOVERSION_0@__mmediadll___targetsuf2 = .$(SO_SUFFIX)
154 157 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__mmediadll___targetsuf3 \
155 158 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  = \
156 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  .$(SO_SUFFIX).0.2.0 159 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  .$(SO_SUFFIX).0.3.1
157 160 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__mmediadll___targetsuf3 \
158 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@= .0.2.0.$(SO_SUFFIX) 161 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@= .0.3.1.$(SO_SUFFIX)
159 162 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__mmediadll___targetsuf3 \
160 163 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@= -0.$(SO_SUFFIX)
161 164 @COND_USE_SOVERSION_0@__mmediadll___targetsuf3 = .$(SO_SUFFIX)
23 skipped lines
185 188     $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) \
186 189     $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
187 190 @COND_USE_SOSYMLINKS_1@__mmediadll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_inst_cmd)
  191 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  192 @COND_TOOLKIT_MSW@  $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
188 193 @COND_PLATFORM_WIN32_1@__mmediadll___win32rc = mmediadll_version_rc.o
189 194 COND_MONOLITHIC_1___WXLIB_MONO_p = \
190 195     -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
36 skipped lines
227 232 @COND_SHARED_0@__mmedialib___depname = $(COND_SHARED_0___mmedialib___depname)
228 233 @COND_SHARED_0@__install_mmedialib___depname = install_mmedialib
229 234 @COND_GCC_PCH_1@__mmedialib_PCH_INC = -I.pch/wxprec_mmedialib
  235 @COND_ICC_PCH_1@__mmedialib_PCH_INC = -use_pch \
  236 @COND_ICC_PCH_1@.pch/wxprec_mmedialib/wx/wxprec.h.gch
230 @COND_GCC_PCH_1@___pch_wxprec_mmedialib_wx_wxprec_h_gch___depname \ 237 @COND_USE_PCH_1@___pch_wxprec_mmedialib_wx_wxprec_h_gch___depname \
231 @COND_GCC_PCH_1@= .pch/wxprec_mmedialib/wx/wxprec.h.gch 238 @COND_USE_PCH_1@= .pch/wxprec_mmedialib/wx/wxprec.h.gch
232 239 COND_PLATFORM_UNIX_1___MMEDIA_PLATFORM_SRC_OBJECTS_1 =  \
233 240     mmedialib_cdunix.o \
234 241     mmedialib_sndesd.o \
48 skipped lines
283 290 @COND_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) $(DESTDIR)$(libdir)
284 291 @COND_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__mmediadll___so_symlinks_inst_cmd))
285 292  
286 @COND_GCC_PCH_1@.pch/wxprec_mmediadll/wx/wxprec.h.gch:  293 @COND_USE_PCH_1@.pch/wxprec_mmediadll/wx/wxprec.h.gch: 
287 @COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_mmediadll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MMEDIADLL_CXXFLAGS) 294 @COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_mmediadll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MMEDIADLL_CXXFLAGS)
288 295  
289 296 @COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(MMEDIALIB_OBJECTS)
290 297 @COND_SHARED_0@   rm -f $@
4 skipped lines
295 302 @COND_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
296 303 @COND_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
297 304  
298 @COND_GCC_PCH_1@.pch/wxprec_mmedialib/wx/wxprec.h.gch:  305 @COND_USE_PCH_1@.pch/wxprec_mmedialib/wx/wxprec.h.gch: 
299 @COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_mmedialib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MMEDIALIB_CXXFLAGS) 306 @COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_mmedialib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MMEDIALIB_CXXFLAGS)
300 307  
301 308 mmediadll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(MMEDIADLL_ODEP)
302     $(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 309     $(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
303 310  
304 311 mmediadll_cdunix.o: $(srcdir)/cdunix.cpp $(MMEDIADLL_ODEP)
305 312     $(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  

Unchanged lineExample of unchanged line
Modified lineExample of modified line
Added lineExample of added line
Removed lineExample of removed line
Ignored lineExample of ignored line

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