Removed ambiguity between deprecated and new constructor.

[wxWidgets.git] / contrib / src / ogl / Makefile.in

diff --git a/contrib/src/ogl/Makefile.in b/contrib/src/ogl/Makefile.in
index ede02ecc3c90a1fd42f0a51103f2c059ec097cba..978871bc510ecfcad9915626c0684e502053ff80 100644 (file)
--- a/contrib/src/ogl/Makefile.in
+++ b/contrib/src/ogl/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.7 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -49,8 +49,8 @@ HOST_SUFFIX = @HOST_SUFFIX@
 DESTDIR = 
 WX_RELEASE = 2.5
 WX_RELEASE_NODOT = 25
-WX_VERSION = $(WX_RELEASE).2
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
+WX_VERSION = $(WX_RELEASE).4
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4
 LIBDIRNAME = $(top_builddir)lib
 OGLDLL_CXXFLAGS = $(__ogldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_OGL $(PIC_FLAG) \
@@ -105,6 +105,10 @@ OGLLIB_ODEP =  $(___pch_wxprec_ogllib_wx_wxprec_h_gch___depname)
 @COND_PLATFORM_WIN32_1@        wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
 @COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
 @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
 COND_SHARED_1___ogldll___depname = \
        $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
 @COND_SHARED_1@__ogldll___depname = $(COND_SHARED_1___ogldll___depname)
@@ -122,14 +126,14 @@ COND_PLATFORM_WIN32_1___ogldll___importlib = \
 @COND_GCC_PCH_1@___pch_wxprec_ogldll_wx_wxprec_h_gch___depname \
 @COND_GCC_PCH_1@       = .pch/wxprec_ogldll/wx/wxprec.h.gch
 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__ogldll___targetsuf2 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@       = .$(SO_SUFFIX).2
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@       = .$(SO_SUFFIX).4
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__ogldll___targetsuf2 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@       = .2.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@       = .4.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@__ogldll___targetsuf2 = .$(SO_SUFFIX)
 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__ogldll___targetsuf3 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@       = .$(SO_SUFFIX).2.0.0
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@       = .$(SO_SUFFIX).4.0.0
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__ogldll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@       = .2.0.0.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@       = .4.0.0.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@__ogldll___targetsuf3 = .$(SO_SUFFIX)
 COND_USE_SOVERLINUX_1___ogldll___soname_flags = \
        $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2)
@@ -175,7 +179,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
 @COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@      -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_ODBC_BUILTIN@      -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
        -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
@@ -223,10 +227,10 @@ clean:
        rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
 
 distclean: clean
-       rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+       rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 @COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3): $(OGLDLL_OBJECTS)
-@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) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+@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)
 @COND_SHARED_1@        
 @COND_SHARED_1@        $(__ogldll___so_symlinks_cmd)
 
@@ -252,76 +256,76 @@ distclean: clean
 @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_ogllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(OGLLIB_CXXFLAGS)
 
 ogldll_basic2.o: $(srcdir)/basic2.cpp $(OGLDLL_ODEP)
-       $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/basic2.cpp
 
 ogldll_canvas.o: $(srcdir)/canvas.cpp $(OGLDLL_ODEP)
-       $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/canvas.cpp
 
 ogldll_divided.o: $(srcdir)/divided.cpp $(OGLDLL_ODEP)
-       $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/divided.cpp
 
 ogldll_mfutils.o: $(srcdir)/mfutils.cpp $(OGLDLL_ODEP)
-       $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/mfutils.cpp
 
 ogldll_oglmisc.o: $(srcdir)/oglmisc.cpp $(OGLDLL_ODEP)
-       $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/oglmisc.cpp
 
 ogldll_basic.o: $(srcdir)/basic.cpp $(OGLDLL_ODEP)
-       $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/basic.cpp
 
 ogldll_composit.o: $(srcdir)/composit.cpp $(OGLDLL_ODEP)
-       $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/composit.cpp
 
 ogldll_drawn.o: $(srcdir)/drawn.cpp $(OGLDLL_ODEP)
-       $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/drawn.cpp
 
 ogldll_bmpshape.o: $(srcdir)/bmpshape.cpp $(OGLDLL_ODEP)
-       $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/bmpshape.cpp
 
 ogldll_constrnt.o: $(srcdir)/constrnt.cpp $(OGLDLL_ODEP)
-       $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/constrnt.cpp
 
 ogldll_lines.o: $(srcdir)/lines.cpp $(OGLDLL_ODEP)
-       $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/lines.cpp
 
 ogldll_ogldiag.o: $(srcdir)/ogldiag.cpp $(OGLDLL_ODEP)
-       $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $(srcdir)/ogldiag.cpp
 
 ogllib_basic2.o: $(srcdir)/basic2.cpp $(OGLLIB_ODEP)
-       $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/basic2.cpp
 
 ogllib_canvas.o: $(srcdir)/canvas.cpp $(OGLLIB_ODEP)
-       $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/canvas.cpp
 
 ogllib_divided.o: $(srcdir)/divided.cpp $(OGLLIB_ODEP)
-       $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/divided.cpp
 
 ogllib_mfutils.o: $(srcdir)/mfutils.cpp $(OGLLIB_ODEP)
-       $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/mfutils.cpp
 
 ogllib_oglmisc.o: $(srcdir)/oglmisc.cpp $(OGLLIB_ODEP)
-       $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/oglmisc.cpp
 
 ogllib_basic.o: $(srcdir)/basic.cpp $(OGLLIB_ODEP)
-       $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/basic.cpp
 
 ogllib_composit.o: $(srcdir)/composit.cpp $(OGLLIB_ODEP)
-       $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/composit.cpp
 
 ogllib_drawn.o: $(srcdir)/drawn.cpp $(OGLLIB_ODEP)
-       $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/drawn.cpp
 
 ogllib_bmpshape.o: $(srcdir)/bmpshape.cpp $(OGLLIB_ODEP)
-       $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/bmpshape.cpp
 
 ogllib_constrnt.o: $(srcdir)/constrnt.cpp $(OGLLIB_ODEP)
-       $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/constrnt.cpp
 
 ogllib_lines.o: $(srcdir)/lines.cpp $(OGLLIB_ODEP)
-       $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/lines.cpp
 
 ogllib_ogldiag.o: $(srcdir)/ogldiag.cpp $(OGLLIB_ODEP)
-       $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $(srcdir)/ogldiag.cpp
 
 
 # Include dependency info, if present: