X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e3165d72520d7d642640ed57c58c620884848fc..3285ee538be44537a0d4e43252db18f5e7362782:/contrib/src/ogl/Makefile.in?ds=inline diff --git a/contrib/src/ogl/Makefile.in b/contrib/src/ogl/Makefile.in index 5396cc718b..459a6c43de 100644 --- 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.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,6 +16,7 @@ LIBPREFIX = @LIBPREFIX@ SO_SUFFIX = @SO_SUFFIX@ DLLIMP_SUFFIX = @DLLIMP_SUFFIX@ LN_S = @LN_S@ +RESCOMP = @RESCOMP@ PIC_FLAG = @PIC_FLAG@ SONAME_FLAG = @SONAME_FLAG@ STRIP = @STRIP@ @@ -47,15 +48,16 @@ HOST_SUFFIX = @HOST_SUFFIX@ ### Variables: ### DESTDIR = -WX_RELEASE = 2.5 -WX_RELEASE_NODOT = 25 -WX_VERSION = $(WX_RELEASE).3 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 +WX_RELEASE = 2.6 +WX_RELEASE_NODOT = 26 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(top_builddir)lib OGLDLL_CXXFLAGS = $(__ogldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_OGL $(PIC_FLAG) \ $(CPPFLAGS) $(CXXFLAGS) OGLDLL_OBJECTS = \ + $(__ogldll___win32rc) \ ogldll_basic2.o \ ogldll_canvas.o \ ogldll_divided.o \ @@ -70,6 +72,7 @@ OGLDLL_OBJECTS = \ ogldll_ogldiag.o OGLDLL_ODEP = $(___pch_wxprec_ogldll_wx_wxprec_h_gch___depname) OGLLIB_CXXFLAGS = $(__ogllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS) OGLLIB_OBJECTS = \ ogllib_basic2.o \ @@ -102,7 +105,7 @@ OGLLIB_ODEP = $(___pch_wxprec_ogllib_wx_wxprec_h_gch___depname) @COND_WXUNIV_1@WXUNIVNAME = univ @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \ -@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT) +@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT) @COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE) @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS) @@ -112,6 +115,10 @@ OGLLIB_ODEP = $(___pch_wxprec_ogllib_wx_wxprec_h_gch___depname) 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) +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__install_ogldll___depname = install_ogldll COND_PLATFORM_MACOSX_1___ogldll___macinstnamecmd = -install_name \ $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) @@ -126,14 +133,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).3 +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__ogldll___targetsuf2 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .3.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.$(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).3.0.0 +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0.0.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__ogldll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .3.0.0.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.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) @@ -164,6 +171,7 @@ COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_inst_cmd = rm -f \ @COND_PLATFORM_MACOSX_1@__ogldll___macver = \ @COND_PLATFORM_MACOSX_1@ -compatibility_version $(WX_VERSION) \ @COND_PLATFORM_MACOSX_1@ -current_version $(WX_VERSION) +@COND_PLATFORM_WIN32_1@__ogldll___win32rc = ogldll_version_rc.o COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @@ -199,6 +207,9 @@ COND_SHARED_0___ogllib___depname = \ @COND_GCC_PCH_1@___pch_wxprec_ogllib_wx_wxprec_h_gch___depname \ @COND_GCC_PCH_1@ = .pch/wxprec_ogllib/wx/wxprec.h.gch @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS +@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI +@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS ### Targets: ### @@ -227,9 +238,9 @@ 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@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3): $(OGLDLL_OBJECTS) $(__ogldll___win32rc) @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) @@ -255,77 +266,80 @@ distclean: clean @COND_GCC_PCH_1@.pch/wxprec_ogllib/wx/wxprec.h.gch: @COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_ogllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(OGLLIB_CXXFLAGS) +ogldll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(OGLDLL_ODEP) + $(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 + 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: