Updated Lasso workspace.

3 files changed, 12 insertions, 9 deletions

diff --git a/win32/msvc/lasso.dsp b/win32/msvc/lasso.dsp
index 3a83ea91..24a72be8 100644
--- a/win32/msvc/lasso.dsp
+++ b/win32/msvc/lasso.dsp
@@ -1031,7 +1031,7 @@ SOURCE=..\..\lasso\extract_types.py
 !IF  "$(CFG)" == "lasso - Win32 Release"
 
 # Begin Custom Build
-InputDir=\lasso\lasso-0.6.1rc1\lasso
+InputDir=\lasso\lasso-0.6.1rc2\lasso
 InputPath=..\..\lasso\extract_types.py
 
 "$(InputDir)\types.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -1043,7 +1043,7 @@ InputPath=..\..\lasso\extract_types.py
 !ELSEIF  "$(CFG)" == "lasso - Win32 Debug"
 
 # Begin Custom Build
-InputDir=\lasso\lasso-0.6.1rc1\lasso
+InputDir=\lasso\lasso-0.6.1rc2\lasso
 InputPath=..\..\lasso\extract_types.py
 
 "$(InputDir)\types.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
diff --git a/win32/msvc/lasso.dsw b/win32/msvc/lasso.dsw
index 9d3287cd..6fc8b0c0 100644
--- a/win32/msvc/lasso.dsw
+++ b/win32/msvc/lasso.dsw
@@ -11,9 +11,6 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name python
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -26,6 +23,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name lasso
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -38,6 +38,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name lasso
+    End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/win32/msvc/python/python.dsp b/win32/msvc/python/python.dsp
index 29949606..ebc7ea58 100644
--- a/win32/msvc/python/python.dsp
+++ b/win32/msvc/python/python.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PYTHON_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "h:\lasso-deps\include" /I "h:\lasso-deps\include\glib-2.0" /I "h:\lasso-deps\lib\glib-2.0\include" /I "I:\Python23\include" /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PYTHON_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "h:\lasso-deps\include" /I "h:\lasso-deps\include\glib-2.0" /I "h:\lasso-deps\lib\glib-2.0\include" /I "I:\Python24\include" /I "..\..\.." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x40c /d "NDEBUG"
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib lasso-3.lib libxml2.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /machine:I386 /out:"Release\_lasso.dll" /libpath:"..\Release" /libpath:"I:\Python23\libs" /libpath:"h:\lasso-deps\lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib lasso-3.lib libxml2.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /machine:I386 /out:"Release\_lasso.dll" /libpath:"..\Release" /libpath:"I:\Python24\libs" /libpath:"h:\lasso-deps\lib"
 
 !ELSEIF  "$(CFG)" == "python - Win32 Debug"
 
@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PYTHON_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "h:\lasso-deps\include" /I "h:\lasso-deps\include\glib-2.0" /I "h:\lasso-deps\lib\glib-2.0\include" /I "I:\Python23\include" /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PYTHON_EXPORTS" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "h:\lasso-deps\include" /I "h:\lasso-deps\include\glib-2.0" /I "h:\lasso-deps\lib\glib-2.0\include" /I "I:\Python24\include" /I "..\..\.." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x40c /d "_DEBUG"
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib lasso-3.lib libxml2.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /debug /machine:I386 /out:"Debug\_lasso.dll" /pdbtype:sept /libpath:"..\Debug" /libpath:"I:\Python23\libs" /libpath:"h:\lasso-deps\lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib lasso-3.lib libxml2.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /debug /machine:I386 /out:"Debug\_lasso_d.dll" /pdbtype:sept /libpath:"..\Debug" /libpath:"I:\Python24\libs" /libpath:"h:\lasso-deps\lib"
 
 !ENDIF