New Cg stubs added

dtool/Config.Win32.pp

@@ -7,7 +7,7 @@
 //
 
 // What additional flags should we pass to interrogate?
-#define SYSTEM_IGATE_FLAGS -longlong __int64 -D_X86_ -DWIN32_VC -D"_declspec(param)=" -D_near  -D_far -D__near  -D__far
+#define SYSTEM_IGATE_FLAGS -longlong __int64 -D_X86_ -DWIN32_VC -D"_declspec(param)=" -D_near  -D_far -D__near  -D__far -D_WIN32 -D__stdcall
 
 // Is the platform big-endian (like an SGI workstation) or
 // little-endian (like a PC)?  Define this to the empty string to

dtool/Config.pp

@@ -287,6 +287,17 @@
 #define NURBSPP_LIBS nurbsf matrixN matrixI matrix
 #defer HAVE_NURBSPP $[libtest $[NURBSPP_LPATH],$[NURBSPP_LIBS]]
 
+// Is Cg installed, and where?
+#define CG_IPATH /c/Progra~1/Micros~1.NET/Vc7/include
+#define CG_LPATH /c/Progra~1/Micros~1.NET/Vc7/lib
+#define CG_LIBS cg.lib
+#defer HAVE_CG $[libtest $[CG_LPATH],$[CG_LIBS]]
+
+// Is CgGL installed, and where?
+#define CGGL_IPATH $[CG_IPATH]
+#define CGGL_LPATH $[CG_LPATH]
+#define CGGL_LIBS cgGL.lib
+#defer HAVE_CGGL $[and $[HAVE_CG],$[libtest $[CGGL_LPATH],$[CGGL_LIBS]]]
 
 // Is VRPN installed, and where?
 #define VRPN_IPATH

dtool/LocalSetup.pp

@@ -29,6 +29,12 @@
 #if $[HAVE_FFTW]
 #print - fftw
 #endif
+#if $[HAVE_CG]
+#print - Nvidia Cg High Level Shading Language
+#endif
+#if $[HAVE_CGGL]
+#print - Cg OpenGL API
+#endif
 #if $[HAVE_VRPN]
 #print - VRPN
 #endif
@@ -117,6 +123,12 @@ $[cdefine HAVE_NURBSPP]
 /* Define if we have VRPN installed.  */
 $[cdefine HAVE_VRPN]
 
+/* Define if we have CG installed.  */
+$[cdefine HAVE_CG]
+
+/* Define if we have CGGL installed.  */
+$[cdefine HAVE_CGGL]
+
 /* Define if we have zlib installed.  */
 $[cdefine HAVE_ZLIB]
 

dtool/Package.pp

@@ -131,6 +131,16 @@
 #set FFTW_LIBS $[FFTW_LIBS]
 #set HAVE_FFTW $[HAVE_FFTW]
 
+#set CG_IPATH $[unixfilename $[CG_IPATH]]
+#set CG_LPATH $[unixfilename $[CG_LPATH]]
+#set CG_LIBS $[CG_LIBS]
+#set HAVE_CG $[HAVE_CG]
+
+#set CGGL_IPATH $[unixfilename $[CGGL_IPATH]]
+#set CGGL_LPATH $[unixfilename $[CGGL_LPATH]]
+#set CGGL_LIBS $[CGGL_LIBS]
+#set HAVE_CGGL $[HAVE_CGGL]
+
 #set VRPN_IPATH $[unixfilename $[VRPN_IPATH]]
 #set VRPN_LPATH $[unixfilename $[VRPN_LPATH]]
 #set VRPN_LIBS $[VRPN_LIBS]

dtool/pptempl/Global.pp

@@ -195,6 +195,20 @@
   #define nurbspp_libs $[NURBSPP_LIBS]
 #endif
 
+#if $[HAVE_CG]
+  #define cg_ipath $[wildcard $[CG_IPATH]]
+  #define cg_lpath $[wildcard $[CG_LPATH]]
+  #define cg_cflags $[CG_CFLAGS]
+  #define cg_libs $[CG_LIBS]
+#endif
+
+#if $[HAVE_CGGL]
+  #define cggl_ipath $[wildcard $[CGGL_IPATH]]
+  #define cggl_lpath $[wildcard $[CGGL_LPATH]]
+  #define cggl_cflags $[CGGL_CFLAGS]
+  #define cggl_libs $[CGGL_LIBS]
+#endif
+
 #if $[HAVE_VRPN]
   #define vrpn_ipath $[wildcard $[VRPN_IPATH]]
   #define vrpn_lpath $[wildcard $[VRPN_LPATH]]

dtool/pptempl/Template.gmsvc.pp

@@ -859,10 +859,18 @@ $[TAB] cp -f $[local] $[dest]/
 #end file
 
 #foreach file $[install_parser_inc]
+#if $[ne $[dir $[file]], ./]
+$[install_parser_inc_dir]/$[file] : $[notdir $[file]]
+  #define local $[notdir $[file]]
+  #define dest $[install_parser_inc_dir]/$[dir $[file]]
+$[TAB] mkdir -p $[install_parser_inc_dir]/$[dir $[file]] || echo
+$[TAB] cp -f $[local] $[dest]
+#else
 $[install_parser_inc_dir]/$[file] : $[file]
-#define local $[file]
-#define dest $[install_parser_inc_dir]
+  #define local $[file]
+  #define dest $[install_parser_inc_dir]
 $[TAB] cp -f $[local] $[dest]/
+#endif
 #end file
 
 #foreach file $[install_data]

dtool/pptempl/Template.unix.pp

@@ -699,10 +699,18 @@ $[TAB] $[INSTALL]
 #end file
 
 #foreach file $[install_parser_inc]
+#if $[ne $[dir $[file]], ./]
+$[install_parser_inc_dir]/$[file] : $[notdir $[file]]
+  #define local $[notdir $[file]]
+  #define dest $[install_parser_inc_dir]/$[dir $[file]]
+$[TAB] mkdir -p $[install_parser_inc_dir]/$[dir $[file]] || echo
+$[TAB] $[INSTALL]
+#else
 $[install_parser_inc_dir]/$[file] : $[file]
-#define local $[file]
-#define dest $[install_parser_inc_dir]
+  #define local $[file]
+  #define dest $[install_parser_inc_dir]
 $[TAB] $[INSTALL]
+#endif
 #end file
 
 #foreach file $[install_data]