Compared files  

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


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged13376
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@
56 skipped lines
103 104 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
104 105 @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
105 106 @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
106 @COND_PLATFORM_MACOSX_1@-compatibility_version 2.0 -current_version 2.0 107 @COND_PLATFORM_MACOSX_1@-compatibility_version 3.0 -current_version 3.1
107 108 @COND_USE_GUI_0@PORTNAME = base
108 109 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
109 110 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
31 skipped lines
141 142     -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
142 143 @COND_WINDOWS_IMPLIB_1@__fldll___importlib = $(COND_WINDOWS_IMPLIB_1___fldll___importlib)
143 144 @COND_GCC_PCH_1@__fldll_PCH_INC = -I.pch/wxprec_fldll
  145 @COND_ICC_PCH_1@__fldll_PCH_INC = -use_pch \
  146 @COND_ICC_PCH_1@.pch/wxprec_fldll/wx/wxprec.h.gch
144 @COND_GCC_PCH_1@___pch_wxprec_fldll_wx_wxprec_h_gch___depname \ 147 @COND_USE_PCH_1@___pch_wxprec_fldll_wx_wxprec_h_gch___depname \
145 @COND_GCC_PCH_1@= .pch/wxprec_fldll/wx/wxprec.h.gch 148 @COND_USE_PCH_1@= .pch/wxprec_fldll/wx/wxprec.h.gch
146 149 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__fldll___targetsuf2 \
147 150 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@= .$(SO_SUFFIX).0
148 151 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__fldll___targetsuf2 \
1 skipped line
150 153 @COND_USE_SOVERSION_0@__fldll___targetsuf2 = .$(SO_SUFFIX)
151 154 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__fldll___targetsuf3 \
152 155 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  = \
153 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  .$(SO_SUFFIX).0.2.0 156 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  .$(SO_SUFFIX).0.3.1
154 157 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__fldll___targetsuf3 \
155 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@= .0.2.0.$(SO_SUFFIX) 158 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@= .0.3.1.$(SO_SUFFIX)
156 159 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__fldll___targetsuf3 \
157 160 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@= -0.$(SO_SUFFIX)
158 161 @COND_USE_SOVERSION_0@__fldll___targetsuf3 = .$(SO_SUFFIX)
23 skipped lines
182 185     $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) \
183 186     $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
184 187 @COND_USE_SOSYMLINKS_1@__fldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___fldll___so_symlinks_inst_cmd)
  188 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  189 @COND_TOOLKIT_MSW@  $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
185 190 @COND_PLATFORM_WIN32_1@__fldll___win32rc = fldll_version_rc.o
186 191 COND_MONOLITHIC_1___WXLIB_MONO_p = \
187 192     -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
27 skipped lines
215 220 @COND_SHARED_0@__fllib___depname = $(COND_SHARED_0___fllib___depname)
216 221 @COND_SHARED_0@__install_fllib___depname = install_fllib
217 222 @COND_GCC_PCH_1@__fllib_PCH_INC = -I.pch/wxprec_fllib
  223 @COND_ICC_PCH_1@__fllib_PCH_INC = -use_pch \
  224 @COND_ICC_PCH_1@.pch/wxprec_fllib/wx/wxprec.h.gch
218 @COND_GCC_PCH_1@___pch_wxprec_fllib_wx_wxprec_h_gch___depname \ 225 @COND_USE_PCH_1@___pch_wxprec_fllib_wx_wxprec_h_gch___depname \
219 @COND_GCC_PCH_1@= .pch/wxprec_fllib/wx/wxprec.h.gch 226 @COND_USE_PCH_1@= .pch/wxprec_fllib/wx/wxprec.h.gch
220 227 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
221 228 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
222 229 @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
39 skipped lines
262 269 @COND_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) $(DESTDIR)$(libdir)
263 270 @COND_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__fldll___so_symlinks_inst_cmd))
264 271  
265 @COND_GCC_PCH_1@.pch/wxprec_fldll/wx/wxprec.h.gch:  272 @COND_USE_PCH_1@.pch/wxprec_fldll/wx/wxprec.h.gch: 
266 @COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_fldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FLDLL_CXXFLAGS) 273 @COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_fldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FLDLL_CXXFLAGS)
267 274  
268 275 @COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(FLLIB_OBJECTS)
269 276 @COND_SHARED_0@   rm -f $@
4 skipped lines
274 281 @COND_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
275 282 @COND_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
276 283  
277 @COND_GCC_PCH_1@.pch/wxprec_fllib/wx/wxprec.h.gch:  284 @COND_USE_PCH_1@.pch/wxprec_fllib/wx/wxprec.h.gch: 
278 @COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_fllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FLLIB_CXXFLAGS) 285 @COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_fllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FLLIB_CXXFLAGS)
279 286  
280 287 fldll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(FLDLL_ODEP)
281     $(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)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include 288     $(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)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
282 289  
283 290 fldll_antiflickpl.o: $(srcdir)/antiflickpl.cpp $(FLDLL_ODEP)
284 291     $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/antiflickpl.cpp
106 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:05.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.