Replaced HAVE_DX with HAVE_DX8 and HAVE_DX9

direct/src/directscripts/packpanda.nsi

@@ -87,7 +87,7 @@ Section "${SMDIRECTORY}" SecCore
         SetOutPath $INSTDIR
         File "${PANDA}\LICENSE"
         SetOutPath $INSTDIR\bin
-        File /r /x CVS /x *.pyc /x *.map /x *.pdb /x *.exe "${PANDA}\bin\*"
+        File /r /x CVS /x *.pyc /x *.map /x *.pdb /x *.exe /x *.manifest "${PANDA}\bin\*"
         SetOutPath $INSTDIR\etc
         File /r "${PANDA}\etc\*"
         SetOutPath $INSTDIR\direct\src\directscripts

direct/src/ffi/jGenPyCode.py

@@ -78,7 +78,7 @@ DoGenPyCode.outputHTMLDir = os.path.join(PANDAC,"..","doc")
 DoGenPyCode.directDir = DIRECT
 DoGenPyCode.extensionsDir = EXTENSIONS
 DoGenPyCode.interrogateLib = r'libdtoolconfig'
-DoGenPyCode.codeLibs = ['libpandaexpress','libpanda','libpandaphysics','libpandafx','libdirect','libpandaegg']
+DoGenPyCode.codeLibs = ['libpandaexpress','libpanda','libpandaphysics','libpandafx','libp3direct','libpandaegg']
 DoGenPyCode.etcPath = [os.path.join(PANDAC,"input")]
 DoGenPyCode.pythonSourcePath = [DIRECT]
 DoGenPyCode.native = 1

doc/doc/Config.pp.sample

@@ -32,11 +32,13 @@
 
 // Note the use of the Panda filename convention, with forward slashes
 // instead of backslashes, and /c/ instead of c:/ .
-#define DX_IPATH /c/DXSDK/include
-#define DX_LPATH /c/DXSDK/lib
+#define DX8_IPATH /c/DXSDK-OCT2004/include
+#define DX8_LPATH /c/DXSDK-OCT2004/lib
+#define DX9_IPATH /c/DXSDK-DEC2006/include
+#define DX9_LPATH /c/DXSDK-DEC2006/lib
 
-// If you have some early version of the DirectX8 SDK installed, but
-// not the most recent one, you may need to turn off the DirectX build
-// altogether by uncommenting the following line.  (Defining a
+// If for any reason you need to turn off either the DX8 or DX9 builds,
+// you can uncomment one of the following lines.  (Defining a
 // variable to an empty string means setting it false.)
-//#define HAVE_DX
+//#define HAVE_DX8
+//#define HAVE_DX9

doc/doc/INSTALL-PP

@@ -251,13 +251,13 @@ indicate a variable is true by defining it to some nonempty string
 (e.g. "yes" or "1"), and false by defining it to nothing.  For
 example:
 
-  #define HAVE_DX 1
+  #define HAVE_DX8 1
 
 Indicates you have the DirectX SDK installed, while
 
-  #define HAVE_DX
+  #define HAVE_DX8
 
-Indicates you do not.  Do not be tempted to define HAVE_DX to no or 0;
+Indicates you do not.  Do not be tempted to define HAVE_DX8 to no or 0;
 since these are both nonempty strings, they are considered to
 represent true!  Also, don't try to use a pair of quotation marks to
 represent the empty string, since the quotation marks become part of
@@ -312,10 +312,15 @@ find useful are:
     header and library files, and the name of the VRPN libraries, if
     VRPN is installed on your system.
 
-  DX_IPATH / DX_LPATH / DX_LIBS - the full pathname to the DirectX 8.1
-    SDK header and library files, if you have installed this SDK.
-    (You must currently install this SDK in order to build DirectX
-    support for Panda.)
+  DX8_IPATH / DX8_LPATH / DX8_LIBS - the full pathname to the
+    DirectX 8.1 SDK header and library files, if you have installed
+    this SDK. (You must currently install this SDK in order to
+    build DirectX8 support for Panda.)
+
+  DX9_IPATH / DX9_LPATH / DX9_LIBS - the full pathname to the
+    DirectX 9 SDK header and library files, if you have installed
+    this SDK. (You must currently install this SDK in order to
+    build DirectX9 support for Panda.)
 
   GL_IPATH / GL_LPATH / GL_LIBS - You get the idea.  (Normally, OpenGL
     is installed in the standard system directories, so you can leave

dtool/Config.pp

@@ -622,11 +622,17 @@
 // Should we try to build the SGI-specific glxdisplay?
 #define HAVE_SGIGL $[eq $[PLATFORM],Irix]
 
-// Is DirectX available, and should we try to build with it?
-#define DX_IPATH
-#define DX_LPATH
-#define DX_LIBS d3d8.lib d3dx8.lib dxerr8.lib
-#defer HAVE_DX $[libtest $[DX_LPATH],$[DX_LIBS]]
+// Is DirectX8 available, and should we try to build with it?
+#define DX8_IPATH
+#define DX8_LPATH
+#define DX8_LIBS d3d8.lib d3dx8.lib dxerr8.lib
+#defer HAVE_DX8 $[libtest $[DX8_LPATH],$[DX8_LIBS]]
+
+// Is DirectX9 available, and should we try to build with it?
+#define DX9_IPATH
+#define DX9_LPATH
+#define DX9_LIBS d3d8.lib d3dx8.lib dxerr8.lib
+#defer HAVE_DX9 $[libtest $[DX9_LPATH],$[DX9_LIBS]]
 
 // Is OpenCV installed, and where?
 #define OPENCV_IPATH /usr/local/include/opencv

dtool/LocalSetup.pp

@@ -101,10 +101,15 @@
 #else
 #print - Did not find OpenGL
 #endif
-#if $[HAVE_DX]
-#print + DirectX
+#if $[HAVE_DX8]
+#print + DirectX8
 #else
-#print - Did not find DirectX
+#print - Did not find DirectX8
+#endif
+#if $[HAVE_DX9]
+#print + DirectX9
+#else
+#print - Did not find DirectX9
 #endif
 #if $[HAVE_OPENCV]
 #print + OpenCV
@@ -245,7 +250,10 @@ $[cdefine HAVE_GLX]
 $[cdefine HAVE_WGL]
 
 /* Define if we have DirectX installed and want to build for DX.  */
-$[cdefine HAVE_DX]
+$[cdefine HAVE_DX8]
+
+/* Define if we have DirectX installed and want to build for DX.  */
+$[cdefine HAVE_DX9]
 
 /* Define if we have Chromium installed and want to use it.  */
 $[cdefine HAVE_CHROMIUM]

dtool/Package.pp

@@ -209,10 +209,15 @@
 
 #set HAVE_SGIGL $[HAVE_SGIGL]
 
-#set DX_IPATH $[unixfilename $[DX_IPATH]]
-#set DX_LPATH $[unixfilename $[DX_LPATH]]
-#set DX_LIBS $[DX_LIBS]
-#set HAVE_DX $[HAVE_DX]
+#set DX8_IPATH $[unixfilename $[DX8_IPATH]]
+#set DX8_LPATH $[unixfilename $[DX8_LPATH]]
+#set DX8_LIBS $[DX8_LIBS]
+#set HAVE_DX8 $[HAVE_DX8]
+
+#set DX9_IPATH $[unixfilename $[DX9_IPATH]]
+#set DX9_LPATH $[unixfilename $[DX9_LPATH]]
+#set DX9_LIBS $[DX9_LIBS]
+#set HAVE_DX9 $[HAVE_DX9]
 
 #set OPENCV_IPATH $[unixfilename $[OPENCV_IPATH]]
 #set OPENCV_LPATH $[unixfilename $[OPENCV_LPATH]]

dtool/pptempl/Global.pp

@@ -155,11 +155,18 @@
   #define glut_libs $[GLUT_LIBS]
 #endif
 
-#if $[HAVE_DX]
-  #define dx_ipath $[wildcard $[DX_IPATH]]
-  #define dx_lpath $[wildcard $[DX_LPATH]]
-  #define dx_cflags $[DX_CFLAGS]
-  #define dx_libs $[DX_LIBS]
+#if $[HAVE_DX8]
+  #define dx8_ipath $[wildcard $[DX8_IPATH]]
+  #define dx8_lpath $[wildcard $[DX8_LPATH]]
+  #define dx8_cflags $[DX8_CFLAGS]
+  #define dx8_libs $[DX8_LIBS]
+#endif
+
+#if $[HAVE_DX9]
+  #define dx9_ipath $[wildcard $[DX9_IPATH]]
+  #define dx9_lpath $[wildcard $[DX9_LPATH]]
+  #define dx9_cflags $[DX9_CFLAGS]
+  #define dx9_libs $[DX9_LIBS]
 #endif
 
 #if $[HAVE_OPENCV]

panda/metalibs/pandadx8/Sources.pp

@@ -1,4 +1,4 @@
-#define BUILD_DIRECTORY $[HAVE_DX]
+#define BUILD_DIRECTORY $[HAVE_DX8]
 
 // DIR_TYPE "metalib" indicates we are building a shared library that
 // consists mostly of references to other shared libraries.  Under

panda/metalibs/pandadx9/Sources.pp

@@ -1,4 +1,4 @@
-#define BUILD_DIRECTORY $[HAVE_DX]
+#define BUILD_DIRECTORY $[HAVE_DX9]
 
 // DIR_TYPE "metalib" indicates we are building a shared library that
 // consists mostly of references to other shared libraries.  Under

panda/src/configfiles/panda.prc.pp

@@ -19,13 +19,13 @@ win-size 800 600
 # is found that works, unless the user specifically requests a
 # particular display type with the load-display directive.
 
-#if $[HAVE_DX]
+#if $[HAVE_DX9]
 aux-display pandadx9
 #endif
 #if $[HAVE_GL]
 aux-display pandagl
 #endif
-#if $[HAVE_DX]
+#if $[HAVE_DX8]
 aux-display pandadx8
 #endif
 

panda/src/pandabase/pandasymbols.h

@@ -156,6 +156,14 @@
   #define EXPTP_PANDARIB extern
 #endif
 
+#ifdef BUILDING_PANDASKEL
+  #define EXPCL_PANDASKEL __declspec(dllexport)
+  #define EXPTP_PANDASKEL
+#else
+  #define EXPCL_PANDASKEL __declspec(dllimport)
+  #define EXPTP_PANDASKEL extern
+#endif
+
 #ifdef BUILDING_PANDAWIN
   #define EXPCL_PANDAWIN __declspec(dllexport)
   #define EXPTP_PANDAWIN
@@ -222,6 +230,9 @@
 #define EXPCL_PANDARIB
 #define EXPTP_PANDARIB
 
+#define EXPCL_PANDASKEL
+#define EXPTP_PANDASKEL
+
 #define EXPCL_PANDAWIN
 #define EXPTP_PANDAWIN
 

pandatool/src/scripts/builder.cshrc

@@ -38,7 +38,8 @@ alias setbrowseinfo1 setenv CL_MAKE_BROWSE_INFO 1
 alias setbrowseinfo0 setenv CL_MAKE_BROWSE_INFO 0
 
 setenv HAVE_GL yes
-setenv HAVE_DX yes
+setenv HAVE_DX8 yes
+setenv HAVE_DX9 yes
 setenv USE_NSPR t
 
 if (! $?USER ) then