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  

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@
46 skipped lines
93 94 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
94 95 @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
95 96 @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
96 @COND_PLATFORM_MACOSX_1@-compatibility_version 2.0 -current_version 2.0 97 @COND_PLATFORM_MACOSX_1@-compatibility_version 3.0 -current_version 3.1
97 98 @COND_USE_GUI_0@PORTNAME = base
98 99 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
99 100 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
31 skipped lines
131 132     -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
132 133 @COND_WINDOWS_IMPLIB_1@__ogldll___importlib = $(COND_WINDOWS_IMPLIB_1___ogldll___importlib)
133 134 @COND_GCC_PCH_1@__ogldll_PCH_INC = -I.pch/wxprec_ogldll
  135 @COND_ICC_PCH_1@__ogldll_PCH_INC = -use_pch \
  136 @COND_ICC_PCH_1@.pch/wxprec_ogldll/wx/wxprec.h.gch
134 @COND_GCC_PCH_1@___pch_wxprec_ogldll_wx_wxprec_h_gch___depname \ 137 @COND_USE_PCH_1@___pch_wxprec_ogldll_wx_wxprec_h_gch___depname \
135 @COND_GCC_PCH_1@= .pch/wxprec_ogldll/wx/wxprec.h.gch 138 @COND_USE_PCH_1@= .pch/wxprec_ogldll/wx/wxprec.h.gch
136 139 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__ogldll___targetsuf2 \
137 140 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@= .$(SO_SUFFIX).0
138 141 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__ogldll___targetsuf2 \
1 skipped line
140 143 @COND_USE_SOVERSION_0@__ogldll___targetsuf2 = .$(SO_SUFFIX)
141 144 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__ogldll___targetsuf3 \
142 145 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  = \
143 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  .$(SO_SUFFIX).0.2.0 146 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@  .$(SO_SUFFIX).0.3.1
144 147 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__ogldll___targetsuf3 \
145 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@= .0.2.0.$(SO_SUFFIX) 148 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@= .0.3.1.$(SO_SUFFIX)
146 149 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__ogldll___targetsuf3 \
147 150 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@= -0.$(SO_SUFFIX)
148 151 @COND_USE_SOVERSION_0@__ogldll___targetsuf3 = .$(SO_SUFFIX)
23 skipped lines
172 175     $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) \
173 176     $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
174 177 @COND_USE_SOSYMLINKS_1@__ogldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_inst_cmd)
  178 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  179 @COND_TOOLKIT_MSW@  $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
175 180 @COND_PLATFORM_WIN32_1@__ogldll___win32rc = ogldll_version_rc.o
176 181 COND_MONOLITHIC_1___WXLIB_MONO_p = \
177 182     -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
27 skipped lines
205 210 @COND_SHARED_0@__ogllib___depname = $(COND_SHARED_0___ogllib___depname)
206 211 @COND_SHARED_0@__install_ogllib___depname = install_ogllib
207 212 @COND_GCC_PCH_1@__ogllib_PCH_INC = -I.pch/wxprec_ogllib
  213 @COND_ICC_PCH_1@__ogllib_PCH_INC = -use_pch \
  214 @COND_ICC_PCH_1@.pch/wxprec_ogllib/wx/wxprec.h.gch
208 @COND_GCC_PCH_1@___pch_wxprec_ogllib_wx_wxprec_h_gch___depname \ 215 @COND_USE_PCH_1@___pch_wxprec_ogllib_wx_wxprec_h_gch___depname \
209 @COND_GCC_PCH_1@= .pch/wxprec_ogllib/wx/wxprec.h.gch 216 @COND_USE_PCH_1@= .pch/wxprec_ogllib/wx/wxprec.h.gch
210 217 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
211 218 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
212 219 @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
39 skipped lines
252 259 @COND_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) $(DESTDIR)$(libdir)
253 260 @COND_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__ogldll___so_symlinks_inst_cmd))
254 261  
255 @COND_GCC_PCH_1@.pch/wxprec_ogldll/wx/wxprec.h.gch:  262 @COND_USE_PCH_1@.pch/wxprec_ogldll/wx/wxprec.h.gch: 
256 @COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_ogldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(OGLDLL_CXXFLAGS) 263 @COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_ogldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(OGLDLL_CXXFLAGS)
257 264  
258 265 @COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(OGLLIB_OBJECTS)
259 266 @COND_SHARED_0@   rm -f $@
4 skipped lines
264 271 @COND_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
265 272 @COND_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
266 273  
267 @COND_GCC_PCH_1@.pch/wxprec_ogllib/wx/wxprec.h.gch:  274 @COND_USE_PCH_1@.pch/wxprec_ogllib/wx/wxprec.h.gch: 
268 @COND_GCC_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_ogllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(OGLLIB_CXXFLAGS) 275 @COND_USE_PCH_1@$(top_builddir)./bk-make-pch .pch/wxprec_ogllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(OGLLIB_CXXFLAGS)
269 276  
270 277 ogldll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(OGLDLL_ODEP)
271     $(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 278     $(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
272 279  
273 280 ogldll_basic2.o: $(srcdir)/basic2.cpp $(OGLDLL_ODEP)
274 281     $(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  

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