Compared files  

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\animate\Makefile.in
Last modified2005-08-13 02:23:42.000 +0200
Size16 Kb (263 Lines)
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\src\animate\Makefile.in
Last modified2006-03-16 14:01:12.001 +0100
Size16.4 Kb (270 Lines)
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged13249
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@
24 skipped lines
71U72U@COND_DEPS_TRACKING_0@CXXC = $(CXX)
72U73U@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
73U74U@COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
74C@COND_PLATFORM_MACOSX_1@-compatibility_version 2.0 -current_version 2.0 75C@COND_PLATFORM_MACOSX_1@-compatibility_version 3.0 -current_version 3.1
75U76U@COND_USE_GUI_0@PORTNAME = base
76U77U@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
77U78U@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
31 skipped lines
109U110U    -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
110U111U@COND_WINDOWS_IMPLIB_1@__animatedll___importlib = $(COND_WINDOWS_IMPLIB_1___animatedll___importlib)
111U112U@COND_GCC_PCH_1@__animatedll_PCH_INC = -I.pch/wxprec_animatedll
  113C@COND_ICC_PCH_1@__animatedll_PCH_INC = -use_pch \
  114C@COND_ICC_PCH_1@.pch/wxprec_animatedll/wx/wxprec.h.gch
112C@COND_GCC_PCH_1@___pch_wxprec_animatedll_wx_wxprec_h_gch___depname \ 115C@COND_USE_PCH_1@___pch_wxprec_animatedll_wx_wxprec_h_gch___depname \
113C@COND_GCC_PCH_1@= .pch/wxprec_animatedll/wx/wxprec.h.gch 116C@COND_USE_PCH_1@= .pch/wxprec_animatedll/wx/wxprec.h.gch
114U117U@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__animatedll___targetsuf2 \
115U118U@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@= .$(SO_SUFFIX).0
116U119U@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__animatedll___targetsuf2 \
1 skipped line
118U121U@COND_USE_SOVERSION_0@__animatedll___targetsuf2 = .$(SO_SUFFIX)
119U122U@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__animatedll___targetsuf3 \
120U123U@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  = \
121C@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  .$(SO_SUFFIX).0.2.0 124C@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  .$(SO_SUFFIX).0.3.1
122U125U@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__animatedll___targetsuf3 \
123C@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@= .0.2.0.$(SO_SUFFIX) 126C@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@= .0.3.1.$(SO_SUFFIX)
124U127U@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__animatedll___targetsuf3 \
125U128U@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@= -0.$(SO_SUFFIX)
126U129U@COND_USE_SOVERSION_0@__animatedll___targetsuf3 = .$(SO_SUFFIX)
24 skipped lines
151U154U    $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) \
152U155U    $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
153U156U@COND_USE_SOSYMLINKS_1@__animatedll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___animatedll___so_symlinks_inst_cmd)
  157A@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  158A@COND_TOOLKIT_MSW@  $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
154U159U@COND_PLATFORM_WIN32_1@__animatedll___win32rc = animatedll_version_rc.o
155U160UCOND_MONOLITHIC_1___WXLIB_MONO_p = \
156U161U    -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
27 skipped lines
184U189U@COND_SHARED_0@__animatelib___depname = $(COND_SHARED_0___animatelib___depname)
185U190U@COND_SHARED_0@__install_animatelib___depname = install_animatelib
186U191U@COND_GCC_PCH_1@__animatelib_PCH_INC = -I.pch/wxprec_animatelib
  192C@COND_ICC_PCH_1@__animatelib_PCH_INC = -use_pch \
  193C@COND_ICC_PCH_1@.pch/wxprec_animatelib/wx/wxprec.h.gch
187C@COND_GCC_PCH_1@___pch_wxprec_animatelib_wx_wxprec_h_gch___depname \ 194C@COND_USE_PCH_1@___pch_wxprec_animatelib_wx_wxprec_h_gch___depname \
188C@COND_GCC_PCH_1@= .pch/wxprec_animatelib/wx/wxprec.h.gch 195C@COND_USE_PCH_1@= .pch/wxprec_animatelib/wx/wxprec.h.gch
189U196U@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
190U197U@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
191U198U@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
39 skipped lines
231U238U@COND_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) $(DESTDIR)$(libdir)
232U239U@COND_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__animatedll___so_symlinks_inst_cmd))
233U240U 
234C@COND_GCC_PCH_1@.pch/wxprec_animatedll/wx/wxprec.h.gch:  241C@COND_USE_PCH_1@.pch/wxprec_animatedll/wx/wxprec.h.gch: 
235C@COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_animatedll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ANIMATEDLL_CXXFLAGS) 242C@COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_animatedll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ANIMATEDLL_CXXFLAGS)
236U243U 
237U244U@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(ANIMATELIB_OBJECTS)
238U245U@COND_SHARED_0@   rm -f $@
4 skipped lines
243U250U@COND_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
244U251U@COND_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
245U252U 
246C@COND_GCC_PCH_1@.pch/wxprec_animatelib/wx/wxprec.h.gch:  253C@COND_USE_PCH_1@.pch/wxprec_animatelib/wx/wxprec.h.gch: 
247C@COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_animatelib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ANIMATELIB_CXXFLAGS) 254C@COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_animatelib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ANIMATELIB_CXXFLAGS)
248U255U 
249U256Uanimatedll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(ANIMATEDLL_ODEP)
250C    $(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)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include 257C    $(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)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
251U258U 
252U259Uanimatedll_animate.o: $(srcdir)/animate.cpp $(ANIMATEDLL_ODEP)
253U260U    $(CXXC) -c -o $@ $(ANIMATEDLL_CXXFLAGS) $(srcdir)/animate.cpp
10 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:22.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.