TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

regularize chromium stuff

Browse Source
This commit is contained in:
David Rose 2004-02-17 19:52:13 +00:00
parent 1aa75bf0a4
commit d7bcf3f6fa
4 changed files with 5 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dtool/Config.pp
View File

@ -254,12 +254,6 @@
#define ZLIB_LIBS z
#defer HAVE_ZLIB $[libtest $[ZLIB_LPATH],$[ZLIB_LIBS]]
// Is the sox libst library installed, and where?
#define SOXST_IPATH
#define SOXST_LPATH
#define SOXST_LIBS st
#defer HAVE_SOXST $[libtest $[SOXST_LPATH],$[SOXST_LIBS]]
// Is OpenGL installed, and where? This should include libGL as well
// as libGLU, if they are in different places.
#if $[WINDOWS_PLATFORM]
@ -305,28 +299,18 @@
#defer HAVE_MESA $[libtest $[MESA_LPATH],$[MESA_LIBS]]
// Is Chromium OpenGL installed, and where? This should include libcr_opengl32.
// Is the Chromium remote-rendering library installed, and where?
// This should include libcr_opengl32.
#defer CHROMIUM_IPATH
#defer CHROMIUM_LPATH /usr/X11R6/lib
#defer GL_LIBS GL GLU
#defer CHROMIUM_LPATH
#defer CHROMIUM_LIBS
#defer HAVE_CHROMIUM $[libtest $[CHROMIUM_LPATH],$[CHROMIUM_LIBS]]
// Should we try to build the WCR interface?
#define HAVE_WCR $[and $[HAVE_CHROMIUM], $[WINDOWS_PLATFORM]]
// How about GLX?
#define GLX_IPATH
#define GLX_LPATH
#defer HAVE_GLX $[and $[HAVE_GL],$[UNIX_PLATFORM]]
// Glut?
#define GLUT_IPATH
#define GLUT_LPATH
#define GLUT_LIBS glut
//#defer HAVE_GLUT $[libtest $[GLUT_LPATH],$[GLUT_LIBS]]
// For now, glut is broken. Don't even try to build it.
#define HAVE_GLUT
// Should we try to build the WGL interface?
#defer HAVE_WGL $[and $[HAVE_GL],$[WINDOWS_PLATFORM]]
@ -339,19 +323,11 @@
#define DX_LIBS d3d8.lib d3dx8.lib dxerr8.lib
#defer HAVE_DX $[libtest $[DX_LPATH],$[DX_LIBS]]
// Do you want to build the Renderman interface?
#define HAVE_RIB
// Do you want to build the DirectD tools for starting Panda clients
// remotely? This only affects the direct tree. Enabling this may
// cause libdirect.dll to fail to load on Win98 clients.
#define HAVE_DIRECTD
// Is Mikmod installed? How should we run the libmikmod-config program?
#define MIKMOD_CONFIG libmikmod-config
#defer HAVE_MIKMOD $[bintest $[MIKMOD_CONFIG]]
// Do you want to build in support for threading (multiprocessing)?
// Building in support for threading will enable Panda to take
// advantage of multiple CPU's if you have them (and if the OS

17
dtool/LocalSetup.pp
View File

@ -80,27 +80,12 @@ $[cdefine HAVE_GLX]
/* Define if we have Windows-GL installed and want to build for Wgl. */
$[cdefine HAVE_WGL]
/* Define if we have Glut installed and want to build for Glut. */
$[cdefine HAVE_GLUT]
/* Define if we have DirectX installed and want to build for DX. */
$[cdefine HAVE_DX]
/* Define if we have Chromium OpenGL installed and want to build for GL. */
/* Define if we have Chromium installed and want to use it. */
$[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 the Renderman interface. */
$[cdefine HAVE_RIB]
/* Define if we have sox libst installed. */
$[cdefine HAVE_SOXST]
/* Define if we want to use mikmod for audio. */
$[cdefine HAVE_MIKMOD]
/* Define if we want to compile the threading code. */
$[cdefine HAVE_THREADS]

25
dtool/Package.pp
View File

@ -130,11 +130,6 @@
#set ZLIB_LIBS $[ZLIB_LIBS]
#set HAVE_ZLIB $[HAVE_ZLIB]
#set SOXST_IPATH $[unixfilename $[SOXST_IPATH]]
#set SOXST_LPATH $[unixfilename $[SOXST_LPATH]]
#set SOXST_LIBS $[SOXST_LIBS]
#set HAVE_SOXST $[HAVE_SOXST]
#set GL_IPATH $[unixfilename $[GL_IPATH]]
#set GL_LPATH $[unixfilename $[GL_LPATH]]
#set GL_LIBS $[GL_LIBS]
@ -149,11 +144,6 @@
#set GLX_LPATH $[unixfilename $[GLX_LPATH]]
#set HAVE_GLX $[HAVE_GLX]
#set GLUT_IPATH $[unixfilename $[GLUT_IPATH]]
#set GLUT_LPATH $[unixfilename $[GLUT_LPATH]]
#set GLUT_LIBS $[GLUT_LIBS]
#set HAVE_GLUT $[HAVE_GLUT]
#set HAVE_WGL $[HAVE_WGL]
#set HAVE_SGIGL $[HAVE_SGIGL]
@ -163,11 +153,6 @@
#set DX_LIBS $[DX_LIBS]
#set HAVE_DX $[HAVE_DX]
#set HAVE_RIB $[HAVE_RIB]
#set MIKMOD_CONFIG $[MIKMOD_CONFIG]
#set HAVE_MIKMOD $[HAVE_MIKMOD]
#set HAVE_THREADS $[HAVE_THREADS]
#set NET_IPATH $[unixfilename $[NET_IPATH]]
@ -211,16 +196,6 @@
// Now infer a few more variables based on what was defined.
#if $[and $[HAVE_MIKMOD],$[MIKMOD_CONFIG]]
#define cflags $[shell $[MIKMOD_CONFIG] --cflags]
#define libs $[shell $[MIKMOD_CONFIG] --libs]
#define MIKMOD_CFLAGS $[filter-out -I%,$[cflags]]
#define MIKMOD_IPATH $[unique $[patsubst -I%,%,$[filter -I%,$[cflags]]]]
#define MIKMOD_LPATH $[unique $[patsubst -L%,%,$[filter -L%,$[libs]]]]
#define MIKMOD_LIBS $[patsubst -l%,%,$[filter -l%,$[libs]]]
#endif
#if $[and $[HAVE_GTKMM],$[GTKMM_CONFIG]]
#define cflags $[shell $[GTKMM_CONFIG] --cflags]
#define libs $[shell $[GTKMM_CONFIG] --libs]

7
dtool/pptempl/Global.pp
View File

@ -111,13 +111,6 @@
#define zlib_libs $[ZLIB_LIBS]
#endif
#if $[HAVE_SOXST]
#define soxst_ipath $[wildcard $[SOXST_IPATH]]
#define soxst_lpath $[wildcard $[SOXST_LPATH]]
#define soxst_cflags $[SOXST_CFLAGS]
#define soxst_libs $[SOXST_LIBS]
#endif
#if $[HAVE_GL]
#define gl_ipath $[wildcard $[GL_IPATH]]
#define gl_lpath $[wildcard $[GL_LPATH]]