diff --git a/dtool/Config.pp b/dtool/Config.pp index 6bf53cebd0..a6e2c24683 100644 --- a/dtool/Config.pp +++ b/dtool/Config.pp @@ -439,6 +439,24 @@ #define CGGL_LIBS $[if $[WINDOWS_PLATFORM],cgGL.lib,CgGL] #defer HAVE_CGGL $[and $[HAVE_CG],$[libtest $[CGGL_LPATH],$[CGGL_LIBS]]] +// Is CgDX8 installed, and where? +#defer CGDX8_IPATH $[CG_IPATH] +#defer CGDX8_LPATH $[CG_LPATH] +#define CGDX8_LIBS $[if $[WINDOWS_PLATFORM],cgD3D8.lib,CgDX8] +#defer HAVE_CGDX8 $[and $[HAVE_CG],$[libtest $[CGDX8_LPATH],$[CGDX8_LIBS]]] + +// Is CgDX9 installed, and where? +#defer CGDX9_IPATH $[CG_IPATH] +#defer CGDX9_LPATH $[CG_LPATH] +#define CGDX9_LIBS $[if $[WINDOWS_PLATFORM],cgD3D9.lib,CgDX9] +#defer HAVE_CGDX9 $[and $[HAVE_CG],$[libtest $[CGDX9_LPATH],$[CGDX9_LIBS]]] + +// Is CgDX10 installed, and where? +#defer CGDX10_IPATH $[CG_IPATH] +#defer CGDX10_LPATH $[CG_LPATH] +#define CGDX10_LIBS $[if $[WINDOWS_PLATFORM],cgD3D10.lib,CgDX10] +#defer HAVE_CGDX10 $[and $[HAVE_CG],$[libtest $[CGDX10_LPATH],$[CGDX10_LIBS]]] + // Is VRPN installed, and where? #define VRPN_IPATH #define VRPN_LPATH diff --git a/dtool/LocalSetup.pp b/dtool/LocalSetup.pp index 56eae70fc2..44072cac85 100644 --- a/dtool/LocalSetup.pp +++ b/dtool/LocalSetup.pp @@ -51,6 +51,21 @@ #else #print - Did not find Cg OpenGL API #endif +#if $[HAVE_CGDX8] +#print + Cg DX8 API +#else +#print - Did not find Cg DX8 API +#endif +#if $[HAVE_CGDX9] +#print + Cg DX9 API +#else +#print - Did not find Cg DX9 API +#endif +#if $[HAVE_CGDX10] +#print + Cg DX10 API +#else +#print - Did not find Cg DX10 API +#endif #if $[HAVE_VRPN] #print + VRPN #else @@ -176,6 +191,15 @@ $[cdefine HAVE_CG] /* Define if we have CGGL installed. */ $[cdefine HAVE_CGGL] +/* Define if we have CGDX8 installed. */ +$[cdefine HAVE_CGDX8] + +/* Define if we have CGDX9 installed. */ +$[cdefine HAVE_CGDX9] + +/* Define if we have CGDX10 installed. */ +$[cdefine HAVE_CGDX10] + /* Define if we have zlib installed. */ $[cdefine HAVE_ZLIB] diff --git a/dtool/Package.pp b/dtool/Package.pp index 5a20ae5271..e914e931c4 100644 --- a/dtool/Package.pp +++ b/dtool/Package.pp @@ -148,6 +148,21 @@ #set CGGL_LIBS $[CGGL_LIBS] #set HAVE_CGGL $[HAVE_CGGL] +#set CGDX8_IPATH $[unixfilename $[CGDX8_IPATH]] +#set CGDX8_LPATH $[unixfilename $[CGDX8_LPATH]] +#set CGDX8_LIBS $[CGDX8_LIBS] +#set HAVE_CGDX8 $[HAVE_CGDX8] + +#set CGDX9_IPATH $[unixfilename $[CGDX9_IPATH]] +#set CGDX9_LPATH $[unixfilename $[CGDX9_LPATH]] +#set CGDX9_LIBS $[CGDX9_LIBS] +#set HAVE_CGDX9 $[HAVE_CGDX9] + +#set CGDX10_IPATH $[unixfilename $[CGDX10_IPATH]] +#set CGDX10_LPATH $[unixfilename $[CGDX10_LPATH]] +#set CGDX10_LIBS $[CGDX10_LIBS] +#set HAVE_CGDX10 $[HAVE_CGDX10] + #set VRPN_IPATH $[unixfilename $[VRPN_IPATH]] #set VRPN_LPATH $[unixfilename $[VRPN_LPATH]] #set VRPN_LIBS $[VRPN_LIBS] diff --git a/dtool/pptempl/Global.pp b/dtool/pptempl/Global.pp index fc48d7bd2b..f1533a107b 100644 --- a/dtool/pptempl/Global.pp +++ b/dtool/pptempl/Global.pp @@ -216,6 +216,27 @@ #define cggl_libs $[CGGL_LIBS] #endif +#if $[HAVE_CGDX8] + #define cgdx8_ipath $[wildcard $[CGDX8_IPATH]] + #define cgdx8_lpath $[wildcard $[CGDX8_LPATH]] + #define cgdx8_cflags $[CGDX8_CFLAGS] + #define cgdx8_libs $[CGDX8_LIBS] +#endif + +#if $[HAVE_CGDX9] + #define cgdx9_ipath $[wildcard $[CGDX9_IPATH]] + #define cgdx9_lpath $[wildcard $[CGDX9_LPATH]] + #define cgdx9_cflags $[CGDX9_CFLAGS] + #define cgdx9_libs $[CGDX9_LIBS] +#endif + +#if $[HAVE_CGDX10] + #define cgdx10_ipath $[wildcard $[CGDX10_IPATH]] + #define cgdx10_lpath $[wildcard $[CGDX10_LPATH]] + #define cgdx10_cflags $[CGDX10_CFLAGS] + #define cgdx10_libs $[CGDX10_LIBS] +#endif + #if $[HAVE_VRPN] #define vrpn_ipath $[wildcard $[VRPN_IPATH]] #define vrpn_lpath $[wildcard $[VRPN_LPATH]]