1 --- wxWidgets-2.5.4.orig/contrib/build/ogl/ogl.bkl~ 2003-08-25 23:00:52.000000000 +0200
2 +++ wxWidgets-2.5.4.orig/contrib/build/ogl/ogl.bkl 2005-02-28 16:00:48.226148600 +0100
4 <define>WXUSINGDLL</define>
5 <define>WXMAKINGDLL_OGL</define>
6 <sources>$(OGL_SRC)</sources>
7 + <wx-lib>deprecated</wx-lib>
11 --- wxWidgets-2.5.4.orig/contrib/src/ogl/Makefile.in~ 2005-02-20 10:51:37.000000000 +0100
12 +++ wxWidgets-2.5.4.orig/contrib/src/ogl/Makefile.in 2005-02-28 16:07:54.659320904 +0100
14 COND_MONOLITHIC_0___WXLIB_BASE_p = \
15 -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
16 @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
17 +COND_MONOLITHIC_0___WXLIB_DEPRECATED_p = \
18 + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)
19 +@COND_MONOLITHIC_0@__WXLIB_DEPRECATED_p = $(COND_MONOLITHIC_0___WXLIB_DEPRECATED_p)
20 COND_SHARED_0___ogllib___depname = \
21 $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
22 @COND_SHARED_0@__ogllib___depname = $(COND_SHARED_0___ogllib___depname)
24 rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
26 @COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3): $(OGLDLL_OBJECTS)
27 -@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(OGLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(__ogldll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
28 +@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(OGLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(__ogldll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIB_DEPRECATED_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
30 @COND_SHARED_1@ $(__ogldll___so_symlinks_cmd)