So far, makepanda runs nicely (apart from the occasional warning that certain functions are considered deprecated by MS latest compiler because they don’t check for buffer overruns).
Just in case here are the two patches for the changes I made.
- makepanda.py:
Enable use of Visual Studio 2005:
Index: makepanda/makepanda.py
===================================================================
RCS file: /cvsroot/panda3d/doc/makepanda/makepanda.py,v
retrieving revision 1.144
diff -u -r1.144 makepanda.py
--- makepanda/makepanda.py 7 Jun 2006 17:38:33 -0000 1.144
+++ makepanda/makepanda.py 28 Aug 2006 23:39:08 -0000
@@ -574,25 +574,29 @@
def LocateVisualStudio():
# Try to use Visual Studio
- vcdir = GetRegistryKey("SOFTWARE\\Microsoft\\VisualStudio\\7.1", "InstallDir")
+ vcdir = GetRegistryKey("SOFTWARE\\Microsoft\\VisualStudio\\8.0", "InstallDir")
+ vcSub= "vc"
+ if (vcdir == 0):
+ vcSub= "vc7"
+ vcdir = GetRegistryKey("SOFTWARE\\Microsoft\\VisualStudio\\7.1", "InstallDir")
if (vcdir == 0):
vcdir = GetRegistryKey("SOFTWARE\\Microsoft\\VisualStudio\\7.0", "InstallDir")
if (vcdir != 0) and (vcdir[-13:] == "\\Common7\\IDE\\"):
vcdir = vcdir[:-12]
WARNINGS.append("Using visual studio: "+vcdir)
- AddToVisualStudioPath("PATH", vcdir + "vc7\\bin")
+ AddToVisualStudioPath("PATH", vcdir + vcSub + "\\bin")
AddToVisualStudioPath("PATH", vcdir + "Common7\\IDE")
AddToVisualStudioPath("PATH", vcdir + "Common7\\Tools")
AddToVisualStudioPath("PATH", vcdir + "Common7\\Tools\\bin\\prerelease")
AddToVisualStudioPath("PATH", vcdir + "Common7\\Tools\\bin")
- AddToVisualStudioPath("INCLUDE", vcdir + "vc7\\ATLMFC\\INCLUDE")
- AddToVisualStudioPath("INCLUDE", vcdir + "vc7\\include")
- AddToVisualStudioPath("INCLUDE", vcdir + "vc7\\PlatformSDK\\include\\prerelease")
- AddToVisualStudioPath("INCLUDE", vcdir + "vc7\\PlatformSDK\\include")
- AddToVisualStudioPath("LIB", vcdir + "vc7\\ATLMFC\\LIB")
- AddToVisualStudioPath("LIB", vcdir + "vc7\\LIB")
- AddToVisualStudioPath("LIB", vcdir + "vc7\\PlatformSDK\\lib\\prerelease")
- AddToVisualStudioPath("LIB", vcdir + "vc7\\PlatformSDK\\lib")
+ AddToVisualStudioPath("INCLUDE", vcdir + vcSub + "\\ATLMFC\\INCLUDE")
+ AddToVisualStudioPath("INCLUDE", vcdir + vcSub + "\\include")
+ AddToVisualStudioPath("INCLUDE", vcdir + vcSub + "\\PlatformSDK\\include\\prerelease")
+ AddToVisualStudioPath("INCLUDE", vcdir + vcSub + "\\PlatformSDK\\include")
+ AddToVisualStudioPath("LIB", vcdir + vcSub + "\\ATLMFC\\LIB")
+ AddToVisualStudioPath("LIB", vcdir + vcSub + "\\LIB")
+ AddToVisualStudioPath("LIB", vcdir + vcSub + "\\PlatformSDK\\lib\\prerelease")
+ AddToVisualStudioPath("LIB", vcdir + vcSub + "\\PlatformSDK\\lib")
return
# Try to use the Visual Toolkit 2003
@@ -613,7 +617,7 @@
return
# Give up
- exit("Cannot locate Microsoft Visual Studio 7.0, 7.1, or the Visual Toolkit 2003")
+ exit("Cannot locate Microsoft Visual Studio 8.0, 7.0, 7.1, or the Visual Toolkit 2003")
if (COMPILER == "MSVC7"):
- interrogate.cxx:
Bugfix (hopefully I didn’t change the semantics):
– Oops, I had the wrong patch pasted here. Corrected to contain the right patch (for the file panda3d/dtool/src/prc/globpattern.cxx:
21d20
< #include <iterator>
188c187
< if ((ci == cend) && (1==std::distance(pi, pend)) && (*pi) == '*') {
---
> if ((ci == cend) && (pi + 1 == pend) && (*pi) == '*') {
If I come up with further problems (which then might just as well be a result of my patches
, I’ll post again in this thread. Otherwise, good night and good luck to everyone.
Cheers,
Max Hajek