re-added OpenGL canvas
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
parent
e456894d57
commit
4d2643327c
2
aclocal.m4
vendored
2
aclocal.m4
vendored
@ -1299,7 +1299,7 @@ while test \${#} -gt 0; do
|
||||
exit 1
|
||||
;;
|
||||
|
||||
*.o | *.a)
|
||||
*.o | *.a | *.dylib)
|
||||
# collect object files
|
||||
objects="\${objects} \${1}"
|
||||
;;
|
||||
|
||||
@ -394,3 +394,27 @@ dnl ### begin block COND_PLATFORM_MACOSX_1_TOOLKIT_MAC ###
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_MAC=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_MAC)
|
||||
dnl ### begin block COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 ###
|
||||
COND_MONOLITHIC_0_SHARED_0_USE_HTML_1="#"
|
||||
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_HTML" = "x1" ; then
|
||||
COND_MONOLITHIC_0_SHARED_0_USE_HTML_1=""
|
||||
fi
|
||||
AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_HTML_1)
|
||||
dnl ### begin block COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 ###
|
||||
COND_MONOLITHIC_0_SHARED_1_USE_HTML_1="#"
|
||||
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_HTML" = "x1" ; then
|
||||
COND_MONOLITHIC_0_SHARED_1_USE_HTML_1=""
|
||||
fi
|
||||
AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_HTML_1)
|
||||
dnl ### begin block COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 ###
|
||||
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#"
|
||||
if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
|
||||
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1=""
|
||||
fi
|
||||
AC_SUBST(COND_SHARED_0_USE_GUI_1_USE_OPENGL_1)
|
||||
dnl ### begin block COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 ###
|
||||
COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="#"
|
||||
if test "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
|
||||
COND_SHARED_1_USE_GUI_1_USE_OPENGL_1=""
|
||||
fi
|
||||
AC_SUBST(COND_SHARED_1_USE_GUI_1_USE_OPENGL_1)
|
||||
|
||||
@ -37,6 +37,22 @@
|
||||
Build GUI libraries?
|
||||
</description>
|
||||
</option>
|
||||
|
||||
<option name="USE_HTML">
|
||||
<values>0 1</values>
|
||||
<default-value>1</default-value>
|
||||
<description>
|
||||
Build wxHTML library (USE_GUI must be 1)?
|
||||
</description>
|
||||
</option>
|
||||
|
||||
<option name="USE_OPENGL">
|
||||
<values>0 1</values>
|
||||
<default-value>1</default-value>
|
||||
<description>
|
||||
Build OpenGL canvas library (USE_GUI must be 1)?
|
||||
</description>
|
||||
</option>
|
||||
|
||||
<option name="WXUNIV">
|
||||
<values>0 1</values>
|
||||
@ -84,6 +100,7 @@
|
||||
<option name="TOOLCHAIN_NAME"/>
|
||||
<option name="EXTRALIBS"/>
|
||||
<option name="EXTRALIBS_GUI"/>
|
||||
<option name="OPENGL_LIBS"/>
|
||||
<option name="SAMPLES_RPATH_FLAG"/>
|
||||
|
||||
<set var="TOP_SRCDIR">$(top_srcdir)/</set>
|
||||
|
||||
@ -1929,6 +1929,26 @@
|
||||
</set>
|
||||
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- OpenGL canvas -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<set var="OPENGL_SRC">
|
||||
<if cond="TOOLKIT=='MAC'">src/mac/glcanvas.cpp</if>
|
||||
<if cond="TOOLKIT=='GTK'">src/gtk/glcanvas.cpp</if>
|
||||
<if cond="TOOLKIT=='MSW'">src/msw/glcanvas.cpp</if>
|
||||
<if cond="TOOLKIT=='MOTIF'">src/motif/glcanvas.cpp</if>
|
||||
<if cond="TOOLKIT=='X11'">src/x11/glcanvas.cpp</if>
|
||||
</set>
|
||||
|
||||
<set var="OPENGL_HDR">
|
||||
<if cond="TOOLKIT=='MAC'">wx/mac/glcanvas.h</if>
|
||||
<if cond="TOOLKIT=='GTK'">wx/gtk/glcanvas.h</if>
|
||||
<if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if>
|
||||
<if cond="TOOLKIT=='MOTIF'">wx/motif/glcanvas.h</if>
|
||||
<if cond="TOOLKIT=='X11'">wx/x11/glcanvas.h</if>
|
||||
</set>
|
||||
|
||||
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
@ -2014,9 +2034,19 @@
|
||||
</if>
|
||||
</set>
|
||||
|
||||
|
||||
<set var="ALL_GUI_HEADERS">
|
||||
<if cond="USE_GUI=='1' and WXUNIV=='0'">
|
||||
$(GUI_CMN_HDR) $(LOWLEVEL_HDR) $(GUI_HDR)
|
||||
</if>
|
||||
<if cond="USE_GUI=='1' and WXUNIV=='1'">
|
||||
$(GUI_CMN_HDR) $(LOWLEVEL_HDR) $(UNIV_HDR)
|
||||
</if>
|
||||
</set>
|
||||
|
||||
<set var="ALL_HEADERS">
|
||||
$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
|
||||
$(GUI_CMN_HDR) $(GUI_HDR) $(LOWLEVEL_HDR)
|
||||
$(ALL_GUI_HEADERS)
|
||||
$(HTML_HDR)
|
||||
</set>
|
||||
|
||||
|
||||
@ -47,7 +47,7 @@
|
||||
<!-- ================================================================ -->
|
||||
|
||||
<dll id="htmldll" template="wx_dll"
|
||||
cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
|
||||
cond="SHARED=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
|
||||
<define>WXUSINGDLL</define>
|
||||
<define>WXMAKINGDLL_HTML</define>
|
||||
<sources>$(HTML_SRC)</sources>
|
||||
@ -56,8 +56,14 @@
|
||||
</dll>
|
||||
|
||||
<lib id="htmllib" template="wx_lib"
|
||||
cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
|
||||
cond="SHARED=='0' and USE_HTML=='1' and MONOLITHIC=='0'">
|
||||
<sources>$(HTML_SRC)</sources>
|
||||
</lib>
|
||||
|
||||
<!-- ================================================================ -->
|
||||
<!-- OpenGL -->
|
||||
<!-- ================================================================ -->
|
||||
|
||||
<!-- included by wx.bkl from opengl.bkl -->
|
||||
|
||||
</makefile>
|
||||
|
||||
@ -18,6 +18,8 @@
|
||||
<include file="monolithic.bkl"/>
|
||||
<!-- ...and when there are multiple libraries: -->
|
||||
<include file="multilib.bkl"/>
|
||||
<!-- OpenGL canvas is built as separate library in both cases: -->
|
||||
<include file="opengl.bkl"/>
|
||||
|
||||
|
||||
<!-- Samples target (not dependency of 'all'): -->
|
||||
|
||||
32
configure
vendored
32
configure
vendored
@ -311,7 +311,7 @@ ac_includes_default="\
|
||||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV wxUSE_ZLIB wxUSE_REGEX wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS EXTRALIBS_GUI UNICODE BUILD SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX DLLPREFIX AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING COND_BUILD_DEBUG COND_BUILD_RELEASE COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_UNIX_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_OS2 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_UNICODE_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WXUNIV_1 COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN COND_PLATFORM_MAC_1 COND_SHARED_1 COND_SHARED_0 COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WX_LARGEFILE_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY ESD_LINK LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV wxUSE_ZLIB wxUSE_REGEX wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS EXTRALIBS_GUI UNICODE BUILD SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX DLLPREFIX AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING COND_BUILD_DEBUG COND_BUILD_RELEASE COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_UNIX_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_OS2 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_UNICODE_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WXUNIV_1 COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN COND_PLATFORM_MAC_1 COND_SHARED_1 COND_SHARED_0 COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WX_LARGEFILE_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY ESD_LINK LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
@ -24246,6 +24246,7 @@ if test "$wxUSE_ZLIB" = "builtin" ; then
|
||||
fi
|
||||
|
||||
|
||||
USE_OPENGL=0
|
||||
if test "$wxUSE_OPENGL" = "yes"; then
|
||||
if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
|
||||
OPENGL_LIBS="-framework OpenGL -framework AGL"
|
||||
@ -24528,6 +24529,7 @@ echo "$as_me: error: OpenGL libraries not available" >&2;}
|
||||
fi
|
||||
|
||||
if test "$wxUSE_OPENGL" = "yes"; then
|
||||
USE_OPENGL=1
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_OPENGL 1
|
||||
_ACEOF
|
||||
@ -32550,11 +32552,13 @@ _ACEOF
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram"
|
||||
fi
|
||||
|
||||
USE_HTML=0
|
||||
if test "$wxUSE_HTML" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_HTML 1
|
||||
_ACEOF
|
||||
|
||||
USE_HTML=1
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox"
|
||||
fi
|
||||
|
||||
@ -33734,7 +33738,7 @@ while test \${#} -gt 0; do
|
||||
exit 1
|
||||
;;
|
||||
|
||||
*.o | *.a)
|
||||
*.o | *.a | *.dylib)
|
||||
# collect object files
|
||||
objects="\${objects} \${1}"
|
||||
;;
|
||||
@ -34426,6 +34430,26 @@ fi
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_MAC=""
|
||||
fi
|
||||
|
||||
COND_MONOLITHIC_0_SHARED_0_USE_HTML_1="#"
|
||||
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_HTML" = "x1" ; then
|
||||
COND_MONOLITHIC_0_SHARED_0_USE_HTML_1=""
|
||||
fi
|
||||
|
||||
COND_MONOLITHIC_0_SHARED_1_USE_HTML_1="#"
|
||||
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_HTML" = "x1" ; then
|
||||
COND_MONOLITHIC_0_SHARED_1_USE_HTML_1=""
|
||||
fi
|
||||
|
||||
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#"
|
||||
if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
|
||||
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1=""
|
||||
fi
|
||||
|
||||
COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="#"
|
||||
if test "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
|
||||
COND_SHARED_1_USE_GUI_1_USE_OPENGL_1=""
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
@ -35399,6 +35423,10 @@ s,@COND_SHARED_0@,$COND_SHARED_0,;t t
|
||||
s,@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@,$COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA,;t t
|
||||
s,@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@,$COND_PLATFORM_MACOSX_1_TOOLKIT_GTK,;t t
|
||||
s,@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@,$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC,;t t
|
||||
s,@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@,$COND_MONOLITHIC_0_SHARED_0_USE_HTML_1,;t t
|
||||
s,@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@,$COND_MONOLITHIC_0_SHARED_1_USE_HTML_1,;t t
|
||||
s,@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@,$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1,;t t
|
||||
s,@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@,$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1,;t t
|
||||
s,@LEX_STEM@,$LEX_STEM,;t t
|
||||
s,@PATH_IFS@,$PATH_IFS,;t t
|
||||
s,@WX_MAJOR_VERSION_NUMBER@,$WX_MAJOR_VERSION_NUMBER,;t t
|
||||
|
||||
@ -2785,6 +2785,7 @@ dnl ---------------------------------------------------------------------------
|
||||
dnl OpenGL libraries
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
USE_OPENGL=0
|
||||
if test "$wxUSE_OPENGL" = "yes"; then
|
||||
if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
|
||||
OPENGL_LIBS="-framework OpenGL -framework AGL"
|
||||
@ -2857,6 +2858,7 @@ if test "$wxUSE_OPENGL" = "yes"; then
|
||||
fi
|
||||
|
||||
if test "$wxUSE_OPENGL" = "yes"; then
|
||||
USE_OPENGL=1
|
||||
AC_DEFINE(wxUSE_OPENGL)
|
||||
AC_DEFINE(wxUSE_GLCANVAS)
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl"
|
||||
@ -5144,8 +5146,10 @@ if test "$wxUSE_MINIFRAME" = "yes"; then
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram"
|
||||
fi
|
||||
|
||||
USE_HTML=0
|
||||
if test "$wxUSE_HTML" = "yes"; then
|
||||
AC_DEFINE(wxUSE_HTML)
|
||||
USE_HTML=1
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox"
|
||||
fi
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user