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  

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@
56 skipped lines
103U104U@COND_DEPS_TRACKING_0@CXXC = $(CXX)
104U105U@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
105U106U@COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
106C@COND_PLATFORM_MACOSX_1@-compatibility_version 2.0 -current_version 2.0 107C@COND_PLATFORM_MACOSX_1@-compatibility_version 3.0 -current_version 3.1
107U108U@COND_USE_GUI_0@PORTNAME = base
108U109U@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
109U110U@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
31 skipped lines
141U142U    -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
142U143U@COND_WINDOWS_IMPLIB_1@__fldll___importlib = $(COND_WINDOWS_IMPLIB_1___fldll___importlib)
143U144U@COND_GCC_PCH_1@__fldll_PCH_INC = -I.pch/wxprec_fldll
  145C@COND_ICC_PCH_1@__fldll_PCH_INC = -use_pch \
  146C@COND_ICC_PCH_1@.pch/wxprec_fldll/wx/wxprec.h.gch
144C@COND_GCC_PCH_1@___pch_wxprec_fldll_wx_wxprec_h_gch___depname \ 147C@COND_USE_PCH_1@___pch_wxprec_fldll_wx_wxprec_h_gch___depname \
145C@COND_GCC_PCH_1@= .pch/wxprec_fldll/wx/wxprec.h.gch 148C@COND_USE_PCH_1@= .pch/wxprec_fldll/wx/wxprec.h.gch
146U149U@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__fldll___targetsuf2 \
147U150U@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@= .$(SO_SUFFIX).0
148U151U@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__fldll___targetsuf2 \
1 skipped line
150U153U@COND_USE_SOVERSION_0@__fldll___targetsuf2 = .$(SO_SUFFIX)
151U154U@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__fldll___targetsuf3 \
152U155U@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  = \
153C@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  .$(SO_SUFFIX).0.2.0 156C@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  .$(SO_SUFFIX).0.3.1
154U157U@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__fldll___targetsuf3 \
155C@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@= .0.2.0.$(SO_SUFFIX) 158C@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@= .0.3.1.$(SO_SUFFIX)
156U159U@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__fldll___targetsuf3 \
157U160U@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@= -0.$(SO_SUFFIX)
158U161U@COND_USE_SOVERSION_0@__fldll___targetsuf3 = .$(SO_SUFFIX)
23 skipped lines
182U185U    $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) \
183U186U    $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
184U187U@COND_USE_SOSYMLINKS_1@__fldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___fldll___so_symlinks_inst_cmd)
  188A@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  189A@COND_TOOLKIT_MSW@  $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
185U190U@COND_PLATFORM_WIN32_1@__fldll___win32rc = fldll_version_rc.o
186U191UCOND_MONOLITHIC_1___WXLIB_MONO_p = \
187U192U    -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
27 skipped lines
215U220U@COND_SHARED_0@__fllib___depname = $(COND_SHARED_0___fllib___depname)
216U221U@COND_SHARED_0@__install_fllib___depname = install_fllib
217U222U@COND_GCC_PCH_1@__fllib_PCH_INC = -I.pch/wxprec_fllib
  223C@COND_ICC_PCH_1@__fllib_PCH_INC = -use_pch \
  224C@COND_ICC_PCH_1@.pch/wxprec_fllib/wx/wxprec.h.gch
218C@COND_GCC_PCH_1@___pch_wxprec_fllib_wx_wxprec_h_gch___depname \ 225C@COND_USE_PCH_1@___pch_wxprec_fllib_wx_wxprec_h_gch___depname \
219C@COND_GCC_PCH_1@= .pch/wxprec_fllib/wx/wxprec.h.gch 226C@COND_USE_PCH_1@= .pch/wxprec_fllib/wx/wxprec.h.gch
220U227U@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
221U228U@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
222U229U@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
39 skipped lines
262U269U@COND_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) $(DESTDIR)$(libdir)
263U270U@COND_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__fldll___so_symlinks_inst_cmd))
264U271U 
265C@COND_GCC_PCH_1@.pch/wxprec_fldll/wx/wxprec.h.gch:  272C@COND_USE_PCH_1@.pch/wxprec_fldll/wx/wxprec.h.gch: 
266C@COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_fldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FLDLL_CXXFLAGS) 273C@COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_fldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FLDLL_CXXFLAGS)
267U274U 
268U275U@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(FLLIB_OBJECTS)
269U276U@COND_SHARED_0@   rm -f $@
4 skipped lines
274U281U@COND_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
275U282U@COND_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
276U283U 
277C@COND_GCC_PCH_1@.pch/wxprec_fllib/wx/wxprec.h.gch:  284C@COND_USE_PCH_1@.pch/wxprec_fllib/wx/wxprec.h.gch: 
278C@COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_fllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FLLIB_CXXFLAGS) 285C@COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_fllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FLLIB_CXXFLAGS)
279U286U 
280U287Ufldll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(FLDLL_ODEP)
281C    $(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 288C    $(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
282U289U 
283U290Ufldll_antiflickpl.o: $(srcdir)/antiflickpl.cpp $(FLDLL_ODEP)
284U291U    $(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  

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