]>
Commit | Line | Data |
---|---|---|
922afac4 JK |
1 | diff -uNr wxWidgets-2.8.0-rc1.orig/contrib/build/ogl/ogl.bkl wxWidgets-2.8.0-rc1/contrib/build/ogl/ogl.bkl |
2 | --- wxWidgets-2.8.0-rc1.orig/contrib/build/ogl/ogl.bkl 2006-11-13 11:53:15.000000000 +0100 | |
3 | +++ wxWidgets-2.8.0-rc1/contrib/build/ogl/ogl.bkl 2006-11-27 09:20:26.000000000 +0100 | |
6bbc7a99 | 4 | @@ -44,6 +44,7 @@ |
cf9d44f0 AF |
5 | <define>WXUSINGDLL</define> |
6 | <define>WXMAKINGDLL_OGL</define> | |
6bbc7a99 MC |
7 | <sources>$(OGL_SRC)</sources> |
8 | + <wx-lib>deprecated</wx-lib> | |
cf9d44f0 AF |
9 | <wx-lib>core</wx-lib> |
10 | <wx-lib>base</wx-lib> | |
11 | </dll> | |
922afac4 JK |
12 | diff -uNr wxWidgets-2.8.0-rc1.orig/contrib/src/ogl/Makefile.in wxWidgets-2.8.0-rc1/contrib/src/ogl/Makefile.in |
13 | --- wxWidgets-2.8.0-rc1.orig/contrib/src/ogl/Makefile.in 2006-11-13 11:53:18.000000000 +0100 | |
14 | +++ wxWidgets-2.8.0-rc1/contrib/src/ogl/Makefile.in 2006-11-27 09:56:09.000000000 +0100 | |
15 | @@ -214,6 +214,9 @@ | |
372b4cae KK |
16 | COND_MONOLITHIC_0___WXLIB_BASE_p = \ |
17 | -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) | |
18 | @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) | |
19 | +COND_MONOLITHIC_0___WXLIB_DEPRECATED_p = \ | |
20 | + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX) | |
21 | +@COND_MONOLITHIC_0@__WXLIB_DEPRECATED_p = $(COND_MONOLITHIC_0___WXLIB_DEPRECATED_p) | |
22 | COND_SHARED_0___ogllib___depname = \ | |
23 | $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) | |
24 | @COND_SHARED_0@__ogllib___depname = $(COND_SHARED_0___ogllib___depname) | |
922afac4 | 25 | @@ -262,7 +265,7 @@ |
6bbc7a99 | 26 | rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile |
372b4cae | 27 | |
dacb4cbf | 28 | @COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3): $(OGLDLL_OBJECTS) $(__ogldll___win32rc) |
922afac4 JK |
29 | -@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(OGLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) |
30 | +@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(OGLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__EXLIB_DEPRECATED_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) | |
372b4cae KK |
31 | @COND_SHARED_1@ |
32 | @COND_SHARED_1@ $(__ogldll___so_symlinks_cmd) | |
6bbc7a99 | 33 |