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  

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@
24 skipped lines
71 72 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
72 73 @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
73 74 @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
74 @COND_PLATFORM_MACOSX_1@-compatibility_version 2.0 -current_version 2.0 75 @COND_PLATFORM_MACOSX_1@-compatibility_version 3.0 -current_version 3.1
75 76 @COND_USE_GUI_0@PORTNAME = base
76 77 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
77 78 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
31 skipped lines
109 110     -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
110 111 @COND_WINDOWS_IMPLIB_1@__animatedll___importlib = $(COND_WINDOWS_IMPLIB_1___animatedll___importlib)
111 112 @COND_GCC_PCH_1@__animatedll_PCH_INC = -I.pch/wxprec_animatedll
  113 @COND_ICC_PCH_1@__animatedll_PCH_INC = -use_pch \
  114 @COND_ICC_PCH_1@.pch/wxprec_animatedll/wx/wxprec.h.gch
112 @COND_GCC_PCH_1@___pch_wxprec_animatedll_wx_wxprec_h_gch___depname \ 115 @COND_USE_PCH_1@___pch_wxprec_animatedll_wx_wxprec_h_gch___depname \
113 @COND_GCC_PCH_1@= .pch/wxprec_animatedll/wx/wxprec.h.gch 116 @COND_USE_PCH_1@= .pch/wxprec_animatedll/wx/wxprec.h.gch
114 117 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__animatedll___targetsuf2 \
115 118 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@= .$(SO_SUFFIX).0
116 119 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__animatedll___targetsuf2 \
1 skipped line
118 121 @COND_USE_SOVERSION_0@__animatedll___targetsuf2 = .$(SO_SUFFIX)
119 122 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__animatedll___targetsuf3 \
120 123 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  = \
121 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  .$(SO_SUFFIX).0.2.0 124 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  .$(SO_SUFFIX).0.3.1
122 125 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__animatedll___targetsuf3 \
123 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@= .0.2.0.$(SO_SUFFIX) 126 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@= .0.3.1.$(SO_SUFFIX)
124 127 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__animatedll___targetsuf3 \
125 128 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@= -0.$(SO_SUFFIX)
126 129 @COND_USE_SOVERSION_0@__animatedll___targetsuf3 = .$(SO_SUFFIX)
24 skipped lines
151 154     $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) \
152 155     $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
153 156 @COND_USE_SOSYMLINKS_1@__animatedll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___animatedll___so_symlinks_inst_cmd)
  157 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  158 @COND_TOOLKIT_MSW@  $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
154 159 @COND_PLATFORM_WIN32_1@__animatedll___win32rc = animatedll_version_rc.o
155 160 COND_MONOLITHIC_1___WXLIB_MONO_p = \
156 161     -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
27 skipped lines
184 189 @COND_SHARED_0@__animatelib___depname = $(COND_SHARED_0___animatelib___depname)
185 190 @COND_SHARED_0@__install_animatelib___depname = install_animatelib
186 191 @COND_GCC_PCH_1@__animatelib_PCH_INC = -I.pch/wxprec_animatelib
  192 @COND_ICC_PCH_1@__animatelib_PCH_INC = -use_pch \
  193 @COND_ICC_PCH_1@.pch/wxprec_animatelib/wx/wxprec.h.gch
187 @COND_GCC_PCH_1@___pch_wxprec_animatelib_wx_wxprec_h_gch___depname \ 194 @COND_USE_PCH_1@___pch_wxprec_animatelib_wx_wxprec_h_gch___depname \
188 @COND_GCC_PCH_1@= .pch/wxprec_animatelib/wx/wxprec.h.gch 195 @COND_USE_PCH_1@= .pch/wxprec_animatelib/wx/wxprec.h.gch
189 196 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
190 197 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
191 198 @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
39 skipped lines
231 238 @COND_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) $(DESTDIR)$(libdir)
232 239 @COND_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__animatedll___so_symlinks_inst_cmd))
233 240  
234 @COND_GCC_PCH_1@.pch/wxprec_animatedll/wx/wxprec.h.gch:  241 @COND_USE_PCH_1@.pch/wxprec_animatedll/wx/wxprec.h.gch: 
235 @COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_animatedll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ANIMATEDLL_CXXFLAGS) 242 @COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_animatedll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ANIMATEDLL_CXXFLAGS)
236 243  
237 244 @COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(ANIMATELIB_OBJECTS)
238 245 @COND_SHARED_0@   rm -f $@
4 skipped lines
243 250 @COND_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
244 251 @COND_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
245 252  
246 @COND_GCC_PCH_1@.pch/wxprec_animatelib/wx/wxprec.h.gch:  253 @COND_USE_PCH_1@.pch/wxprec_animatelib/wx/wxprec.h.gch: 
247 @COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_animatelib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ANIMATELIB_CXXFLAGS) 254 @COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_animatelib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ANIMATELIB_CXXFLAGS)
248 255  
249 256 animatedll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(ANIMATEDLL_ODEP)
250     $(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 257     $(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
251 258  
252 259 animatedll_animate.o: $(srcdir)/animate.cpp $(ANIMATEDLL_ODEP)
253 260     $(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  

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:03.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.