From 7dd1ae1114f8aa98a70c47d05f997d2a79040077 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 9 Apr 2007 20:33:57 +0000 Subject: [PATCH] added wxgl pseudotarget git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 6 +++++- autoconf_inc.m4 | 6 ++++++ build/bakefiles/opengl.bkl | 2 ++ build/msw/makefile.bcc | 10 ++++++++++ build/msw/makefile.gcc | 14 +++++++++++++- build/msw/makefile.vc | 14 ++++++++++++-- build/msw/makefile.wat | 14 ++++++++++++++ configure | 7 +++++++ 8 files changed, 69 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index 809536fdb8..ffac1767f1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -11325,6 +11325,8 @@ COND_SHARED_0_USE_GUI_1_USE_OPENGL_1___gllib___depname = \ @COND_TOOLKIT_PM@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o @COND_TOOLKIT_WINCE@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o @COND_TOOLKIT_X11@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o +@COND_SHARED_1@____wxgl_namedll_DEP = $(__gldll___depname) +@COND_SHARED_0@____wxgl_namelib_DEP = $(__gllib___depname) COND_WITH_PLUGIN_SDL_1___sound_sdl___depname = \ $(DLLPREFIX_MODULE)sound_sdl$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE) @COND_WITH_PLUGIN_SDL_1@__sound_sdl___depname = $(COND_WITH_PLUGIN_SDL_1___sound_sdl___depname) @@ -12462,6 +12464,8 @@ distclean: clean @COND_USE_PCH_1@.pch/wxprec_gllib/wx/wxprec.h.gch: @COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_gllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GLLIB_CXXFLAGS) +@COND_USE_GUI_1_USE_OPENGL_1@wxgl: $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP) + @COND_WITH_PLUGIN_SDL_1@$(DLLPREFIX_MODULE)sound_sdl$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE): $(SOUND_SDL_OBJECTS) @COND_WITH_PLUGIN_SDL_1@ $(SHARED_LD_MODULE_CXX) $@ $(SOUND_SDL_OBJECTS) $(LDFLAGS) $(LIBS) $(EXTRALIBS_SDL) @@ -30919,4 +30923,4 @@ rpm: bzip-dist # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all install uninstall clean distclean install_wxregex uninstall_wxregex install_wxzlib uninstall_wxzlib install_wxpng uninstall_wxpng install_wxjpeg uninstall_wxjpeg install_wxtiff uninstall_wxtiff install_wxodbc uninstall_wxodbc install_wxexpat uninstall_wxexpat install_wxscintilla uninstall_wxscintilla install_monodll uninstall_monodll install_monolib uninstall_monolib install_basedll uninstall_basedll install_baselib uninstall_baselib wxbase install_netdll uninstall_netdll install_netlib uninstall_netlib wxnet install_coredll uninstall_coredll install_corelib uninstall_corelib wxcore install_advdll uninstall_advdll install_advlib uninstall_advlib wxadv install_mediadll uninstall_mediadll install_medialib uninstall_medialib wxmedia install_odbcdll uninstall_odbcdll install_odbclib uninstall_odbclib install_dbgriddll uninstall_dbgriddll install_dbgridlib uninstall_dbgridlib wxdbgrid install_htmldll uninstall_htmldll install_htmllib uninstall_htmllib wxhtml install_qadll uninstall_qadll install_qalib uninstall_qalib wxqa install_xmldll uninstall_xmldll install_xmllib uninstall_xmllib wxxml install_xrcdll uninstall_xrcdll install_xrclib uninstall_xrclib wxxrc install_auidll uninstall_auidll install_auilib uninstall_auilib wxaui install_richtextdll uninstall_richtextdll install_richtextlib uninstall_richtextlib wxrichtext install_stcdll uninstall_stcdll install_stclib uninstall_stclib wxstc install_gldll uninstall_gldll install_gllib uninstall_gllib install_sound_sdl uninstall_sound_sdl samples +.PHONY: all install uninstall clean distclean install_wxregex uninstall_wxregex install_wxzlib uninstall_wxzlib install_wxpng uninstall_wxpng install_wxjpeg uninstall_wxjpeg install_wxtiff uninstall_wxtiff install_wxodbc uninstall_wxodbc install_wxexpat uninstall_wxexpat install_wxscintilla uninstall_wxscintilla install_monodll uninstall_monodll install_monolib uninstall_monolib install_basedll uninstall_basedll install_baselib uninstall_baselib wxbase install_netdll uninstall_netdll install_netlib uninstall_netlib wxnet install_coredll uninstall_coredll install_corelib uninstall_corelib wxcore install_advdll uninstall_advdll install_advlib uninstall_advlib wxadv install_mediadll uninstall_mediadll install_medialib uninstall_medialib wxmedia install_odbcdll uninstall_odbcdll install_odbclib uninstall_odbclib install_dbgriddll uninstall_dbgriddll install_dbgridlib uninstall_dbgridlib wxdbgrid install_htmldll uninstall_htmldll install_htmllib uninstall_htmllib wxhtml install_qadll uninstall_qadll install_qalib uninstall_qalib wxqa install_xmldll uninstall_xmldll install_xmllib uninstall_xmllib wxxml install_xrcdll uninstall_xrcdll install_xrclib uninstall_xrclib wxxrc install_auidll uninstall_auidll install_auilib uninstall_auilib wxaui install_richtextdll uninstall_richtextdll install_richtextlib uninstall_richtextlib wxrichtext install_stcdll uninstall_stcdll install_stclib uninstall_stclib wxstc install_gldll uninstall_gldll install_gllib uninstall_gllib wxgl install_sound_sdl uninstall_sound_sdl samples diff --git a/autoconf_inc.m4 b/autoconf_inc.m4 index d102eeefde..8929bded87 100644 --- a/autoconf_inc.m4 +++ b/autoconf_inc.m4 @@ -830,6 +830,12 @@ dnl ### begin block 20_COND_USE_GUI_1[../../contrib/build/animate/animate.bkl,.. COND_USE_GUI_1="" fi AC_SUBST(COND_USE_GUI_1) +dnl ### begin block 20_COND_USE_GUI_1_USE_OPENGL_1[wx.bkl] ### + COND_USE_GUI_1_USE_OPENGL_1="#" + if test "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then + COND_USE_GUI_1_USE_OPENGL_1="" + fi + AC_SUBST(COND_USE_GUI_1_USE_OPENGL_1) dnl ### begin block 20_COND_USE_GUI_1_WXUNIV_0[wx.bkl] ### COND_USE_GUI_1_WXUNIV_0="#" if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then diff --git a/build/bakefiles/opengl.bkl b/build/bakefiles/opengl.bkl index d3bc51c5be..38950a92cd 100644 --- a/build/bakefiles/opengl.bkl +++ b/build/bakefiles/opengl.bkl @@ -38,4 +38,6 @@ $(OPENGL_HDR) + + diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 4bc9e9bae9..0ac11e1532 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -3852,6 +3852,12 @@ __WXLIB_MONO_p = \ __gllib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib !endif +!if "$(SHARED)" == "1" +____wxgl_namedll_DEP = $(__gldll___depname) +!endif +!if "$(SHARED)" == "0" +____wxgl_namelib_DEP = $(__gllib___depname) +!endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1" __htmldll_library_link_DEP = $(__htmldll___depname) !endif @@ -4490,6 +4496,10 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD | !endif +!if "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" +wxgl: $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP) +!endif + samples: @echo cd ..\..\samples >$(OBJS)\samples.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>$(OBJS)\samples.bat diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index a3ccf69819..d0a5857217 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -4003,6 +4003,12 @@ __gllib___depname = \ endif endif endif +ifeq ($(SHARED),1) +____wxgl_namedll_DEP = $(__gldll___depname) +endif +ifeq ($(SHARED),0) +____wxgl_namelib_DEP = $(__gllib___depname) +endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) @@ -4652,6 +4658,12 @@ endif endif endif +ifeq ($(USE_GUI),1) +ifeq ($(USE_OPENGL),1) +wxgl: $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP) +endif +endif + samples: $(MAKE) -C ..\..\samples -f makefile.gcc $(MAKEARGS) all @@ -13983,7 +13995,7 @@ $(OBJS)\gllib_dummy.o: ../../src/common/dummy.cpp $(OBJS)\gllib_glcanvas.o: ../../src/msw/glcanvas.cpp $(CXX) -c -o $@ $(GLLIB_CXXFLAGS) $(CPPDEPS) $< -.PHONY: all clean setup_h wxbase wxnet wxcore wxadv wxmedia wxdbgrid wxhtml wxqa wxxml wxxrc wxaui wxrichtext wxstc samples build_cfg_file +.PHONY: all clean setup_h wxbase wxnet wxcore wxadv wxmedia wxdbgrid wxhtml wxqa wxxml wxxrc wxaui wxrichtext wxstc wxgl samples build_cfg_file # Dependencies tracking: diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 3ac1b68da0..823b4a85b6 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -4216,6 +4216,12 @@ __RUNTIME_LIBS_518 = D !if "$(RUNTIME_LIBS)" == "static" __RUNTIME_LIBS_518 = $(__THREADSFLAG) !endif +!if "$(SHARED)" == "1" +____wxgl_namedll_DEP = $(__gldll___depname) +!endif +!if "$(SHARED)" == "0" +____wxgl_namelib_DEP = $(__gllib___depname) +!endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1" __htmldll_library_link_DEP = $(__htmldll___depname) !endif @@ -4497,7 +4503,7 @@ clean: -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib cd ..\..\samples $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" + cd $(MAKEDIR) setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h $(SETUPHDIR)\wx\msw\rcdefs.h @@ -4843,10 +4849,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD << !endif +!if "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" +wxgl: $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP) +!endif + sub_samples: cd ..\..\samples $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" + cd $(MAKEDIR) $(LIBDIRNAME): if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME) diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index ed9ae0b105..41b89c1b00 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -2811,6 +2811,14 @@ __gllib___depname = & !endif !endif !endif +____wxgl_namedll_DEP = +!ifeq SHARED 1 +____wxgl_namedll_DEP = $(__gldll___depname) +!endif +____wxgl_namelib_DEP = +!ifeq SHARED 0 +____wxgl_namelib_DEP = $(__gllib___depname) +!endif __htmldll_library_link_DEP = !ifeq MONOLITHIC 0 !ifeq SHARED 1 @@ -4919,6 +4927,12 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !endif !endif +!ifeq USE_GUI 1 +!ifeq USE_OPENGL 1 +wxgl : .SYMBOLIC $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP) +!endif +!endif + samples : .SYMBOLIC cd ..\..\samples wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all diff --git a/configure b/configure index bf461cc66d..c5f0d10d47 100755 --- a/configure +++ b/configure @@ -940,6 +940,7 @@ COND_USE_EXCEPTIONS_0 COND_USE_EXCEPTIONS_1 COND_USE_GUI_0 COND_USE_GUI_1 +COND_USE_GUI_1_USE_OPENGL_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN @@ -48485,6 +48486,11 @@ EOF COND_USE_GUI_1="" fi + COND_USE_GUI_1_USE_OPENGL_1="#" + if test "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then + COND_USE_GUI_1_USE_OPENGL_1="" + fi + COND_USE_GUI_1_WXUNIV_0="#" if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then COND_USE_GUI_1_WXUNIV_0="" @@ -50104,6 +50110,7 @@ COND_USE_EXCEPTIONS_0!$COND_USE_EXCEPTIONS_0$ac_delim COND_USE_EXCEPTIONS_1!$COND_USE_EXCEPTIONS_1$ac_delim COND_USE_GUI_0!$COND_USE_GUI_0$ac_delim COND_USE_GUI_1!$COND_USE_GUI_1$ac_delim +COND_USE_GUI_1_USE_OPENGL_1!$COND_USE_GUI_1_USE_OPENGL_1$ac_delim COND_USE_GUI_1_WXUNIV_0!$COND_USE_GUI_1_WXUNIV_0$ac_delim COND_USE_GUI_1_WXUNIV_1!$COND_USE_GUI_1_WXUNIV_1$ac_delim COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim -- 2.45.2