basic-programmer-python
diff --git a/‎direct/src/directscripts/packpanda.nsi‎
Lines changed: 1 addition & 1 deletion b/‎direct/src/directscripts/packpanda.nsi‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎direct/src/ffi/jGenPyCode.py‎
Lines changed: 1 addition & 1 deletion b/‎direct/src/ffi/jGenPyCode.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎doc/doc/Config.pp.sample‎
Lines changed: 8 additions & 6 deletions b/‎doc/doc/Config.pp.sample‎
Lines changed: 8 additions & 6 deletions
diff --git a/‎doc/doc/INSTALL-PP‎
Lines changed: 12 additions & 7 deletions b/‎doc/doc/INSTALL-PP‎
Lines changed: 12 additions & 7 deletions
@@ -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
 
@@ -78,7 +78,7 @@
 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
 
@@ -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
@@ -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