From 87fe850e420d58f072238af4c9f578adb92306fa Mon Sep 17 00:00:00 2001 From: Dave Schuyler Date: Sat, 16 Mar 2002 02:07:07 +0000 Subject: [PATCH] chromium changes --- dtool/Config.pp | 17 ++++++++++++++++- dtool/LocalSetup.pp | 8 ++++++++ dtool/Package.pp | 10 ++++++++++ dtool/pptempl/Global.pp | 27 +++++++++++++++++++++++++++ dtool/pptempl/Template.autoconf.pp | 3 +++ 5 files changed, 64 insertions(+), 1 deletion(-) diff --git a/dtool/Config.pp b/dtool/Config.pp index 5beb020d26..53ec9e05a1 100644 --- a/dtool/Config.pp +++ b/dtool/Config.pp @@ -240,12 +240,20 @@ // Is OpenGL installed, and where? This should include libGL as well // as libGLU, if they are in different places. - #defer GL_IPATH #defer GL_LPATH /usr/X11R6/lib #defer GL_LIBS GL GLU #defer HAVE_GL $[libtest $[GL_LPATH],$[GL_LIBS]] +// Is Chromium OpenGL installed, and where? This should include libcr_opengl32. +#defer CHROMIUM_IPATH +#defer CHROMIUM_LPATH /usr/X11R6/lib +#defer GL_LIBS GL GLU +#defer HAVE_CHROMIUM $[libtest $[CHROMIUM_LPATH],$[CHROMIUM_LIBS]] + +// Should we try to build the WCR interface? +#define HAVE_WCR $[eq $[PLATFORM],Win32] + // How about GLX? #define GLX_IPATH #define GLX_LPATH @@ -317,6 +325,13 @@ #define RAD_MSS_LIBS Mss32 #defer HAVE_RAD_MSS $[libtest $[RAD_MSS_LPATH],$[RAD_MSS_LIBS]] +// Info for http://www.sourceforge.net/projects/chromium +// note this may be overwritten in wintools Config.pp +#define CHROMIUM_IPATH /usr/include/chromium/include +#define CHROMIUM_LPATH /usr/lib/chromium/bin/WINT_NT +#define CHROMIUM_LIBS spuload +#defer HAVE_CHROMIUM $[libtest $[CHROMIUM_LPATH],$[CHROMIUM_LIBS]] + // Is Gtk-- installed? How should we run the gtkmm-config program? // This matters only to programs in PANDATOOL. #define GTKMM_CONFIG gtkmm-config diff --git a/dtool/LocalSetup.pp b/dtool/LocalSetup.pp index 7443269909..aeddbfff7c 100644 --- a/dtool/LocalSetup.pp +++ b/dtool/LocalSetup.pp @@ -65,6 +65,7 @@ $[cdefine HAVE_NURBSPP] $[cdefine HAVE_VRPN] /* Define if we have zlib installed. */ +/* $[ZLIB_LPATH] */ $[cdefine HAVE_ZLIB] /* Define if we have sox libst installed. */ @@ -73,6 +74,13 @@ $[cdefine HAVE_SOXST] /* Define if we have OpenGL installed and want to build for GL. */ $[cdefine HAVE_GL] +/* Define if we have Chromium OpenGL installed and want to build for GL. */ +/* $[CHROMIUM_LPATH] */ +$[cdefine HAVE_CHROMIUM] + +/* Define if we have Chromium installed and want to run it in Windows. */ +$[cdefine HAVE_WCR] + /* Define if we want to build with SGI OpenGL extensions. */ $[cdefine HAVE_SGIGL] diff --git a/dtool/Package.pp b/dtool/Package.pp index 18e0e61d67..3c8806b582 100644 --- a/dtool/Package.pp +++ b/dtool/Package.pp @@ -118,6 +118,11 @@ #set GL_LIBS $[GL_LIBS] #set HAVE_GL $[HAVE_GL] +#set CHROMIUM_IPATH $[CHROMIUM_IPATH] +#set CHROMIUM_LPATH $[CHROMIUM_LPATH] +#set CHROMIUM_LIBS $[CHROMIUM_LIBS] +#set HAVE_CHROMIUM $[HAVE_CHROMIUM] + #set GLX_IPATH $[GLX_IPATH] #set GLX_LPATH $[GLX_LPATH] #set HAVE_GLX $[HAVE_GLX] @@ -158,6 +163,11 @@ #set RAD_MSS_LIBS $[RAD_MSS_LIBS] #set HAVE_RAD_MSS $[HAVE_RAD_MSS] +#set CHROMIUM_IPATH $[CHROMIUM_IPATH] +#set CHROMIUM_LPATH $[CHROMIUM_LPATH] +#set CHROMIUM_LIBS $[CHROMIUM_LIBS] +#set HAVE_CHROMIUM $[HAVE_CHROMIUM] + #set GTKMM_CONFIG $[GTKMM_CONFIG] #set HAVE_GTKMM $[HAVE_GTKMM] diff --git a/dtool/pptempl/Global.pp b/dtool/pptempl/Global.pp index dadd0da591..6822718d39 100644 --- a/dtool/pptempl/Global.pp +++ b/dtool/pptempl/Global.pp @@ -119,6 +119,13 @@ #define gl_libs $[GL_LIBS] #endif +#if $[HAVE_CHROMIUM] + #define chromium_ipath $[wildcard $[CHROMIUM_IPATH]] + #define chromium_lpath $[wildcard $[CHROMIUM_LPATH]] + #define chromium_cflags $[CHROMIUM_CFLAGS] + #define chromium_libs $[CHROMIUM_LIBS] +#endif + #if $[HAVE_GLX] #define glx_ipath $[wildcard $[GLX_IPATH]] #define glx_lpath $[wildcard $[GLX_LPATH]] @@ -220,6 +227,12 @@ #define rad_mss_libs $[RAD_MSS_LIBS] #endif +#if $[HAVE_CHROMIUM] + #define chromium_ipath $[wildcard $[CHROMIUM_IPATH]] + #define chromium_lpath $[wildcard $[CHROMIUM_LPATH]] + #define chromium_libs $[CHROMIUM_LIBS] +#endif + // This variable, when evaluated in the scope of a particular directory, // will indicate true (i.e. nonempty) when the directory is truly built, // or false (empty) when the directory is not to be built. @@ -231,6 +244,7 @@ $[or $[not $[DIRECTORY_IF_ZLIB]],$[HAVE_ZLIB]], \ $[or $[not $[DIRECTORY_IF_SOXST]],$[HAVE_SOXST]], \ $[or $[not $[DIRECTORY_IF_GL]],$[HAVE_GL]], \ + $[or $[not $[DIRECTORY_IF_CHROMIUM]],$[HAVE_CHROMIUM]], \ $[or $[not $[DIRECTORY_IF_DX]],$[HAVE_DX]], \ $[or $[not $[DIRECTORY_IF_GLX]],$[HAVE_GLX]], \ $[or $[not $[DIRECTORY_IF_GLUT]],$[HAVE_GLUT]], \ @@ -261,6 +275,7 @@ $[or $[not $[TARGET_IF_ZLIB]],$[HAVE_ZLIB]], \ $[or $[not $[TARGET_IF_SOXST]],$[HAVE_SOXST]], \ $[or $[not $[TARGET_IF_GL]],$[HAVE_GL]], \ + $[or $[not $[TARGET_IF_CHROMIUM]],$[HAVE_CHROMIUM]], \ $[or $[not $[TARGET_IF_DX]],$[HAVE_DX]], \ $[or $[not $[TARGET_IF_GLX]],$[HAVE_GLX]], \ $[or $[not $[TARGET_IF_GLUT]],$[HAVE_GLUT]], \ @@ -392,6 +407,9 @@ #if $[ne $[USE_GL] $[components $[USE_GL],$[active_component_libs]],] #set alt_cflags $[alt_cflags] $[gl_cflags] #endif + #if $[ne $[USE_CHROMIUM] $[components $[USE_CHROMIUM],$[active_component_libs]],] + #set alt_cflags $[alt_cflags] $[chromium_cflags] + #endif #if $[ne $[USE_GLX] $[components $[USE_GLX],$[active_component_libs]],] #set alt_cflags $[alt_cflags] $[glx_cflags] #endif @@ -460,6 +478,9 @@ #if $[ne $[USE_GL] $[components $[USE_GL],$[active_component_libs]],] #set alt_ipath $[alt_ipath] $[gl_ipath] #endif + #if $[ne $[USE_CHROMIUM] $[components $[USE_CHROMIUM],$[active_component_libs]],] + #set alt_ipath $[alt_ipath] $[chromium_ipath] + #endif #if $[ne $[USE_GLX] $[components $[USE_GLX],$[active_component_libs]],] #set alt_ipath $[alt_ipath] $[glx_ipath] #endif @@ -531,6 +552,9 @@ #if $[ne $[USE_GL] $[components $[USE_GL],$[active_component_libs] $[transitive_link]],] #set alt_lpath $[alt_lpath] $[gl_lpath] #endif + #if $[ne $[USE_CHROMIUM] $[components $[USE_CHROMIUM],$[active_component_libs] $[transitive_link]],] + #set alt_lpath $[alt_lpath] $[chromium_lpath] + #endif #if $[ne $[USE_GLX] $[components $[USE_GLX],$[active_component_libs] $[transitive_link]],] #set alt_lpath $[alt_lpath] $[glx_lpath] #endif @@ -600,6 +624,9 @@ #if $[ne $[USE_GL] $[components $[USE_GL],$[active_component_libs] $[transitive_link]],] #set alt_libs $[alt_libs] $[gl_libs] #endif + #if $[ne $[USE_CHROMIUM] $[components $[USE_CHROMIUM],$[active_component_libs] $[transitive_link]],] + #set alt_libs $[alt_libs] $[chromium_libs] + #endif #if $[ne $[USE_GLX] $[components $[USE_GLX],$[active_component_libs] $[transitive_link]],] #set alt_libs $[alt_libs] $[glx_libs] #endif diff --git a/dtool/pptempl/Template.autoconf.pp b/dtool/pptempl/Template.autoconf.pp index 7f7d61bd72..db8a04ec87 100644 --- a/dtool/pptempl/Template.autoconf.pp +++ b/dtool/pptempl/Template.autoconf.pp @@ -13,6 +13,9 @@ #if $[DIRECTORY_IF_GL] #set omit $[not $[HAVE_GL]] #endif +#if $[DIRECTORY_IF_CHROMIUM] + #set omit $[not $[HAVE_CHROMIUM]] +#endif #if $[DIRECTORY_IF_GLX] #set omit $[not $[HAVE_GLX]] #endif