Compared files  

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\ogl\Makefile.in
Last modified2005-08-13 02:23:42.000 +0200
Size18.5 Kb (350 Lines)
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\src\ogl\Makefile.in
Last modified2006-03-16 14:01:16.000 +0100
Size18.9 Kb (357 Lines)
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged13336
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@
46 skipped lines
93U94U@COND_DEPS_TRACKING_0@CXXC = $(CXX)
94U95U@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
95U96U@COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
96C@COND_PLATFORM_MACOSX_1@-compatibility_version 2.0 -current_version 2.0 97C@COND_PLATFORM_MACOSX_1@-compatibility_version 3.0 -current_version 3.1
97U98U@COND_USE_GUI_0@PORTNAME = base
98U99U@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
99U100U@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
31 skipped lines
131U132U    -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
132U133U@COND_WINDOWS_IMPLIB_1@__ogldll___importlib = $(COND_WINDOWS_IMPLIB_1___ogldll___importlib)
133U134U@COND_GCC_PCH_1@__ogldll_PCH_INC = -I.pch/wxprec_ogldll
  135C@COND_ICC_PCH_1@__ogldll_PCH_INC = -use_pch \
  136C@COND_ICC_PCH_1@.pch/wxprec_ogldll/wx/wxprec.h.gch
134C@COND_GCC_PCH_1@___pch_wxprec_ogldll_wx_wxprec_h_gch___depname \ 137C@COND_USE_PCH_1@___pch_wxprec_ogldll_wx_wxprec_h_gch___depname \
135C@COND_GCC_PCH_1@= .pch/wxprec_ogldll/wx/wxprec.h.gch 138C@COND_USE_PCH_1@= .pch/wxprec_ogldll/wx/wxprec.h.gch
136U139U@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__ogldll___targetsuf2 \
137U140U@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@= .$(SO_SUFFIX).0
138U141U@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__ogldll___targetsuf2 \
1 skipped line
140U143U@COND_USE_SOVERSION_0@__ogldll___targetsuf2 = .$(SO_SUFFIX)
141U144U@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__ogldll___targetsuf3 \
142U145U@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  = \
143C@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  .$(SO_SUFFIX).0.2.0 146C@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  .$(SO_SUFFIX).0.3.1
144U147U@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__ogldll___targetsuf3 \
145C@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@= .0.2.0.$(SO_SUFFIX) 148C@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@= .0.3.1.$(SO_SUFFIX)
146U149U@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__ogldll___targetsuf3 \
147U150U@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@= -0.$(SO_SUFFIX)
148U151U@COND_USE_SOVERSION_0@__ogldll___targetsuf3 = .$(SO_SUFFIX)
23 skipped lines
172U175U    $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) \
173U176U    $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
174U177U@COND_USE_SOSYMLINKS_1@__ogldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_inst_cmd)
  178A@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  179A@COND_TOOLKIT_MSW@  $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
175U180U@COND_PLATFORM_WIN32_1@__ogldll___win32rc = ogldll_version_rc.o
176U181UCOND_MONOLITHIC_1___WXLIB_MONO_p = \
177U182U    -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
27 skipped lines
205U210U@COND_SHARED_0@__ogllib___depname = $(COND_SHARED_0___ogllib___depname)
206U211U@COND_SHARED_0@__install_ogllib___depname = install_ogllib
207U212U@COND_GCC_PCH_1@__ogllib_PCH_INC = -I.pch/wxprec_ogllib
  213C@COND_ICC_PCH_1@__ogllib_PCH_INC = -use_pch \
  214C@COND_ICC_PCH_1@.pch/wxprec_ogllib/wx/wxprec.h.gch
208C@COND_GCC_PCH_1@___pch_wxprec_ogllib_wx_wxprec_h_gch___depname \ 215C@COND_USE_PCH_1@___pch_wxprec_ogllib_wx_wxprec_h_gch___depname \
209C@COND_GCC_PCH_1@= .pch/wxprec_ogllib/wx/wxprec.h.gch 216C@COND_USE_PCH_1@= .pch/wxprec_ogllib/wx/wxprec.h.gch
210U217U@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
211U218U@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
212U219U@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
39 skipped lines
252U259U@COND_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) $(DESTDIR)$(libdir)
253U260U@COND_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__ogldll___so_symlinks_inst_cmd))
254U261U 
255C@COND_GCC_PCH_1@.pch/wxprec_ogldll/wx/wxprec.h.gch:  262C@COND_USE_PCH_1@.pch/wxprec_ogldll/wx/wxprec.h.gch: 
256C@COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_ogldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(OGLDLL_CXXFLAGS) 263C@COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_ogldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(OGLDLL_CXXFLAGS)
257U264U 
258U265U@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(OGLLIB_OBJECTS)
259U266U@COND_SHARED_0@   rm -f $@
4 skipped lines
264U271U@COND_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
265U272U@COND_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
266U273U 
267C@COND_GCC_PCH_1@.pch/wxprec_ogllib/wx/wxprec.h.gch:  274C@COND_USE_PCH_1@.pch/wxprec_ogllib/wx/wxprec.h.gch: 
268C@COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_ogllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(OGLLIB_CXXFLAGS) 275C@COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_ogllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(OGLLIB_CXXFLAGS)
269U276U 
270U277Uogldll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(OGLDLL_ODEP)
271C    $(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)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include 278C    $(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)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
272U279U 
273U280Uogldll_basic2.o: $(srcdir)/basic2.cpp $(OGLDLL_ODEP)
274U281U    $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/basic2.cpp
76 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:26.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.