Compared files  

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\svg\Makefile.in
Last modified2005-08-13 02:23:42.000 +0200
Size15.4 Kb (262 Lines)
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\src\svg\Makefile.in
Last modified2006-03-16 14:01:18.000 +0100
Size15.8 Kb (269 Lines)
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged13248
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)_svg-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
110 111 @COND_WINDOWS_IMPLIB_1@__svgdll___importlib = $(COND_WINDOWS_IMPLIB_1___svgdll___importlib)
111 112 @COND_GCC_PCH_1@__svgdll_PCH_INC = -I.pch/wxprec_svgdll
  113 @COND_ICC_PCH_1@__svgdll_PCH_INC = -use_pch \
  114 @COND_ICC_PCH_1@.pch/wxprec_svgdll/wx/wxprec.h.gch
112 @COND_GCC_PCH_1@___pch_wxprec_svgdll_wx_wxprec_h_gch___depname \ 115 @COND_USE_PCH_1@___pch_wxprec_svgdll_wx_wxprec_h_gch___depname \
113 @COND_GCC_PCH_1@= .pch/wxprec_svgdll/wx/wxprec.h.gch 116 @COND_USE_PCH_1@= .pch/wxprec_svgdll/wx/wxprec.h.gch
114 117 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__svgdll___targetsuf2 \
115 118 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@= .$(SO_SUFFIX).0
116 119 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__svgdll___targetsuf2 \
1 skipped line
118 121 @COND_USE_SOVERSION_0@__svgdll___targetsuf2 = .$(SO_SUFFIX)
119 122 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__svgdll___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@__svgdll___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@__svgdll___targetsuf3 \
125 128 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@= -0.$(SO_SUFFIX)
126 129 @COND_USE_SOVERSION_0@__svgdll___targetsuf3 = .$(SO_SUFFIX)
23 skipped lines
150 153     $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2) \
151 154     $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
152 155 @COND_USE_SOSYMLINKS_1@__svgdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___svgdll___so_symlinks_inst_cmd)
  156 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  157 @COND_TOOLKIT_MSW@  $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
153 158 @COND_PLATFORM_WIN32_1@__svgdll___win32rc = svgdll_version_rc.o
154 159 COND_MONOLITHIC_1___WXLIB_MONO_p = \
155 160     -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
27 skipped lines
183 188 @COND_SHARED_0@__svglib___depname = $(COND_SHARED_0___svglib___depname)
184 189 @COND_SHARED_0@__install_svglib___depname = install_svglib
185 190 @COND_GCC_PCH_1@__svglib_PCH_INC = -I.pch/wxprec_svglib
  191 @COND_ICC_PCH_1@__svglib_PCH_INC = -use_pch \
  192 @COND_ICC_PCH_1@.pch/wxprec_svglib/wx/wxprec.h.gch
186 @COND_GCC_PCH_1@___pch_wxprec_svglib_wx_wxprec_h_gch___depname \ 193 @COND_USE_PCH_1@___pch_wxprec_svglib_wx_wxprec_h_gch___depname \
187 @COND_GCC_PCH_1@= .pch/wxprec_svglib/wx/wxprec.h.gch 194 @COND_USE_PCH_1@= .pch/wxprec_svglib/wx/wxprec.h.gch
188 195 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
189 196 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
190 197 @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
39 skipped lines
230 237 @COND_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3) $(DESTDIR)$(libdir)
231 238 @COND_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__svgdll___so_symlinks_inst_cmd))
232 239  
233 @COND_GCC_PCH_1@.pch/wxprec_svgdll/wx/wxprec.h.gch:  240 @COND_USE_PCH_1@.pch/wxprec_svgdll/wx/wxprec.h.gch: 
234 @COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_svgdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(SVGDLL_CXXFLAGS) 241 @COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_svgdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(SVGDLL_CXXFLAGS)
235 242  
236 243 @COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(SVGLIB_OBJECTS)
237 244 @COND_SHARED_0@   rm -f $@
4 skipped lines
242 249 @COND_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
243 250 @COND_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
244 251  
245 @COND_GCC_PCH_1@.pch/wxprec_svglib/wx/wxprec.h.gch:  252 @COND_USE_PCH_1@.pch/wxprec_svglib/wx/wxprec.h.gch: 
246 @COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_svglib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(SVGLIB_CXXFLAGS) 253 @COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_svglib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(SVGLIB_CXXFLAGS)
247 254  
248 255 svgdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(SVGDLL_ODEP)
249     $(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)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include 256     $(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)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
250 257  
251 258 svgdll_dcsvg.o: $(srcdir)/dcsvg.cpp $(SVGDLL_ODEP)
252 259     $(CXXC) -c -o $@ $(SVGDLL_CXXFLAGS) $(srcdir)/dcsvg.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:38.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.