From 38caf46fe0b1158e792a2b96eef43e80bd4b6df1 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Thu, 25 Feb 2010 08:20:21 +0000
Subject: [PATCH] Apply patch from koeikim
 https://bugs.launchpad.net/panda3d/+bug/527567

---
 makepanda/makepandacore.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py
index 05385f9f54..0e887dae63 100644
--- a/makepanda/makepandacore.py
+++ b/makepanda/makepandacore.py
@@ -779,7 +779,7 @@ def GetThirdpartyDir():
 ########################################################################
 
 VC90CRTVERSIONRE=re.compile("name=['\"]Microsoft.VC90.CRT['\"]\\s+version=['\"]([0-9.]+)['\"]")
-VC80CRTASSEMBLYRE=re.compile("<dependency>[\t \n]*<dependentAssembly>[\t \n]*<assemblyIdentity[\t \na-zA-Z0-9.'\"=]*name=['\"]Microsoft[.]VC80[.]CRT['\"][\t \na-zA-Z0-9.'\"=/]*>[\t \n]*(</assemblyIdentity>)?[\t \n]*</dependentAssembly>[\t \n]*</dependency>[\t \n]*")
+VC80CRTASSEMBLYRE=re.compile("<dependency>[\t \r\n]*<dependentAssembly>[\t \r\n]*<assemblyIdentity[\t \r\na-zA-Z0-9.'\"=]*name=['\"]Microsoft[.]VC80[.]CRT['\"][\t \r\na-zA-Z0-9.'\"=/]*>[\t \r\n]*(</assemblyIdentity>)?[\t \r\n]*</dependentAssembly>[\t \r\n]*</dependency>[\t \r\n]*")
 VC90CRTVERSION=None
 
 def GetVC90CRTVersion(fn = None):