Update of /cvsroot/mahogany/M
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9434
Modified Files:
M.DSP M.dsw
Log Message:
(blind) fixes to VC6 project files after moving 3rd party libs from extra/src to lib
Index: M.DSP
===================================================================
RCS file: /cvsroot/mahogany/M/M.DSP,v
retrieving revision 1.101
retrieving revision 1.102
diff -b -u -2 -r1.101 -r1.102
--- M.DSP 14 Mar 2004 23:19:34 -0000 1.101
+++ M.DSP 3 May 2004 12:28:32 -0000 1.102
@@ -51,5 +51,5 @@
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /O2 /I "$(WXWIN)\lib\msw" /I "include" /I
"extra\src\compface" /I "extra\src\c-client" /I "$(WXWIN)\include" /I
"D:\Python\2.3.2\include" /D "NDEBUG" /D "_WINDOWS" /D WIN95=1 /D _X86_=1 /D
"__WINDOWS__" /D "USE_NEW_IOSTREAM" /D "WX_DRAG_DROP" /D "WX_OWNER_DRAWN" /D "USE_PCH"
/D "WIN32" /D WINVER=0x400 /D M_PREFIX="" /D "_MT" /Yu"Mpch.h" /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "$(WXWIN)\lib\msw" /I "include" /I "lib\compface" /I
"lib\imap\src\c-client\osdep\nt" /I "lib\imap\src\c-client" /I "$(WXWIN)\include" /I
"D:\Python\2.3.2\include" /D "NDEBUG" /D "_WINDOWS" /D WIN95=1 /D _X86_=1 /D
"__WINDOWS__" /D "USE_NEW_IOSTREAM" /D "WX_DRAG_DROP" /D "WX_OWNER_DRAWN" /D "USE_PCH"
/D "WIN32" /D WINVER=0x400 /D M_PREFIX="" /D "_MT" /Yu"Mpch.h" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -61,5 +61,5 @@
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 /subsystem:windows /machine:I386
-# ADD LINK32 extra\src\c-client\Release\cclient.lib
extra\src\compface\Release\compface.lib src\wx\vcard\release\versit.lib wxmsw.lib
regex.lib zlib.lib png.lib jpeg.lib tiff.lib rpcrt4.lib wsock32.lib kernel32.lib
user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib
oleaut32.lib uuid.lib comctl32.lib winmm.lib /nologo /subsystem:windows /machine:I386
/libpath:"e:\python20\libs" /libpath:"$(WXWIN)\lib" /fixed:no
+# ADD LINK32 lib\imap\Release\cclient.lib lib\compface\Release\compface.lib
src\wx\vcard\release\versit.lib wxmsw.lib regex.lib zlib.lib png.lib jpeg.lib tiff.lib
rpcrt4.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib winmm.lib
/nologo /subsystem:windows /machine:I386 /libpath:"e:\python20\libs"
/libpath:"$(WXWIN)\lib" /fixed:no
# SUBTRACT LINK32 /pdb:none /debug
@@ -78,5 +78,5 @@
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX
/FD /c
-# ADD CPP /nologo /MDd /W4 /Gm /ZI /Od /I "$(WXWIN)\lib\vc_lib\mswd" /I "include" /I
"extra\src\compface" /I "extra\src\c-client" /I "$(WXWIN)\include" /I
"D:\Python\2.3.2\include" /D "_DEBUG" /D "DEBUG" /D WXDEBUG=1 /D "__WXDEBUG__" /D
"__WIN95__" /D "_WIN32" /D "USE_PCH" /D "WIN32" /D WINVER=0x400 /D M_PREFIX="" /D
"_MT" /Yu"Mpch.h" /FD /c
+# ADD CPP /nologo /MDd /W4 /Gm /ZI /Od /I "$(WXWIN)\lib\vc_lib\mswd" /I "include" /I
"lib\compface" /I "lib\imap\src\c-client\osdep\nt" /I "lib\imap\src\c-client" /I
"$(WXWIN)\include" /I "D:\Python\2.3.2\include" /D "_DEBUG" /D "DEBUG" /D WXDEBUG=1 /D
"__WXDEBUG__" /D "__WIN95__" /D "_WIN32" /D "USE_PCH" /D "WIN32" /D WINVER=0x400 /D
M_PREFIX="" /D "_MT" /Yu"Mpch.h" /FD /c
# SUBTRACT CPP /Fr
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -89,5 +89,5 @@
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 /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 extra\src\c-client\Debug\cclient.lib
extra\src\compface\Debug\compface.lib src\wx\vcard\debug\versit.lib wxbase25d.lib
wxbase25d_net.lib wxmsw25d_core.lib wxmsw25d_adv.lib wxmsw25d_html.lib wxregexd.lib
wxzlibd.lib wxpngd.lib wxjpegd.lib wxtiffd.lib rpcrt4.lib wsock32.lib kernel32.lib
user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib
oleaut32.lib uuid.lib comctl32.lib winmm.lib /nologo /subsystem:windows /debug
/machine:I386 /pdbtype:sept /libpath:"e:\python20\libs" /libpath:"$(WXWIN)\lib\vc_lib"
+# ADD LINK32 lib\imap\Debug\cclient.lib lib\compface\Debug\compface.lib
src\wx\vcard\debug\versit.lib wxbase25d.lib wxbase25d_net.lib wxmsw25d_core.lib
wxmsw25d_adv.lib wxmsw25d_html.lib wxregexd.lib wxzlibd.lib wxpngd.lib wxjpegd.lib
wxtiffd.lib rpcrt4.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib
winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
/libpath:"e:\python20\libs" /libpath:"$(WXWIN)\lib\vc_lib"
!ELSEIF "$(CFG)" == "M - Win32 Release DLL"
@@ -105,6 +105,6 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /O2 /I "include" /I "extra\src\compface" /I
"extra\src\c-client" /I "$(WXWIN)\include" /I "\python\include" /D "NDEBUG" /D
"USE_PCH" /D "_WINDOWS" /D WIN95=1 /D _X86_=1 /D "__WINDOWS__" /D "USE_NEW_IOSTREAM"
/D "WX_DRAG_DROP" /D "WX_OWNER_DRAWN" /D "WIN32" /D WINVER=0x400 /D "__WXMSW__" /D
"__WIN32__" /D M_PREFIX="" /D wxUSE_GUI=1 /D "_MT" /Yu"Mpch.h" /FD /c
-# ADD CPP /nologo /MD /W4 /O1 /I "$(WXWIN)\vc_lib\mswdll" /I "include" /I
"extra\src\compface" /I "extra\src\c-client" /I "$(WXWIN)\include" /I
"D:\Python\2.3.2\include" /D "NDEBUG" /D "_WINDOWS" /D WIN95=1 /D _X86_=1 /D
"__WINDOWS__" /D "USE_NEW_IOSTREAM" /D "WX_DRAG_DROP" /D "WX_OWNER_DRAWN" /D
"WXUSINGDLL" /D "USE_PCH" /D "WIN32" /D WINVER=0x400 /D M_PREFIX="" /D "_MT"
/Yu"Mpch.h" /FD /c
+# ADD BASE CPP /nologo /MD /W3 /O2 /I "include" /I "lib\imap\compface" /D "NDEBUG" /D
"USE_PCH" /D "_WINDOWS" /D WIN95=1 /D _X86_=1 /D "__WINDOWS__" /D "USE_NEW_IOSTREAM"
/D "WX_DRAG_DROP" /D "WX_OWNER_DRAWN" /D "WIN32" /D WINVER=0x400 /D "__WXMSW__" /D
"__WIN32__" /D M_PREFIX="" /D wxUSE_GUI=1 /D "_MT" /Yu"Mpch.h" /FD /c
+# ADD CPP /nologo /MD /W4 /O1 /I "$(WXWIN)\vc_lib\mswdll" /I "include" /I
"lib\imap\src\c-client\osdep\nt" /I "lib\imap\src\c-client" /I "$(WXWIN)\include" /I
"D:\Python\2.3.2\include" /D "NDEBUG" /D "_WINDOWS" /D WIN95=1 /D _X86_=1 /D
"__WINDOWS__" /D "USE_NEW_IOSTREAM" /D "WX_DRAG_DROP" /D "WX_OWNER_DRAWN" /D
"WXUSINGDLL" /D "USE_PCH" /D "WIN32" /D WINVER=0x400 /D M_PREFIX="" /D "_MT"
/Yu"Mpch.h" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -115,7 +115,7 @@
# ADD BSC32 /nologo /o"Debug/M.bsc"
LINK32=link.exe
-# ADD BASE LINK32 extra\src\c-client\Release\cclient.lib rpcrt4.lib wsock32.lib
kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
ole32.lib oleaut32.lib uuid.lib comctl32.lib winmm.lib
extra\src\compface\Release\compface.lib /nologo /subsystem:windows /machine:I386
+# ADD BASE LINK32 lib\imap\Release\cclient.lib rpcrt4.lib wsock32.lib kernel32.lib
user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib
oleaut32.lib uuid.lib comctl32.lib winmm.lib lib\compface\Release\compface.lib /nologo
/subsystem:windows /machine:I386
# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 $(WXWIN)\lib\wxmsw240.lib extra\src\c-client\Release\cclient.lib
extra\src\compface\Release\compface.lib src\wx\vcard\release\versit.lib rpcrt4.lib
wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib winmm.lib /nologo
/subsystem:windows /machine:I386 /libpath:"e:\python20\libs" /libpath:"$(WXWIN)\lib"
+# ADD LINK32 $(WXWIN)\lib\wxmsw240.lib lib\imap\Release\cclient.lib
lib\compface\Release\compface.lib src\wx\vcard\release\versit.lib rpcrt4.lib
wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib winmm.lib /nologo
/subsystem:windows /machine:I386 /libpath:"e:\python20\libs" /libpath:"$(WXWIN)\lib"
# SUBTRACT LINK32 /debug
@@ -275,6 +275,6 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W4 /O2 /I "$(WXWIN)\lib\msw" /I "include" /I
"extra\src\compface" /I "extra\src\c-client" /I "$(WXWIN)\include" /I
"e:\python20\include" /D "NDEBUG" /D "_WINDOWS" /D WIN95=1 /D _X86_=1 /D "__WINDOWS__"
/D "USE_NEW_IOSTREAM" /D "WX_DRAG_DROP" /D "WX_OWNER_DRAWN" /D "USE_PCH" /D "WIN32" /D
WINVER=0x400 /D M_PREFIX="" /D "_MT" /Yu"Mpch.h" /FD /c
-# ADD CPP /nologo /MD /W4 /Zi /O2 /I "$(WXWIN)\vc_lib\msw" /I "include" /I
"extra\src\compface" /I "extra\src\c-client" /I "$(WXWIN)\include" /I
"D:\Python\2.3.2\include" /D "NDEBUG" /D "_WINDOWS" /D WIN95=1 /D _X86_=1 /D
"__WINDOWS__" /D "USE_NEW_IOSTREAM" /D "WX_DRAG_DROP" /D "WX_OWNER_DRAWN" /D "USE_PCH"
/D "WIN32" /D WINVER=0x400 /D M_PREFIX="" /D "_MT" /Yu"Mpch.h" /FD /c
+# ADD BASE CPP /nologo /MD /W4 /O2 /I "$(WXWIN)\lib\msw" /D "NDEBUG" /D "_WINDOWS" /D
WIN95=1 /D _X86_=1 /D "__WINDOWS__" /D "USE_NEW_IOSTREAM" /D "WX_DRAG_DROP" /D
"WX_OWNER_DRAWN" /D "USE_PCH" /D "WIN32" /D WINVER=0x400 /D M_PREFIX="" /D "_MT"
/Yu"Mpch.h" /FD /c
+# ADD CPP /nologo /MD /W4 /Zi /O2 /I "$(WXWIN)\vc_lib\msw" /I "include" /I
"lib\compface" /I "lib\imap\src\c-client\osdep\nt" /I "lib\imap\src\c-client" /I
"$(WXWIN)\include" /I "D:\Python\2.3.2\include" /D "NDEBUG" /D "_WINDOWS" /D WIN95=1
/D _X86_=1 /D "__WINDOWS__" /D "USE_NEW_IOSTREAM" /D "WX_DRAG_DROP" /D
"WX_OWNER_DRAWN" /D "USE_PCH" /D "WIN32" /D WINVER=0x400 /D M_PREFIX="" /D "_MT"
/Yu"Mpch.h" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -285,7 +285,7 @@
# ADD BSC32 /nologo /o"Debug/M.bsc"
LINK32=link.exe
-# ADD BASE LINK32 extra\src\c-client\Release\cclient.lib
extra\src\compface\Release\compface.lib src\wx\vcard\release\versit.lib wxmsw.lib
regex.lib zlib.lib png.lib jpeg.lib tiff.lib rpcrt4.lib wsock32.lib kernel32.lib
user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib
oleaut32.lib uuid.lib comctl32.lib winmm.lib /nologo /subsystem:windows /machine:I386
/libpath:"e:\python20\libs" /libpath:"$(WXWIN)\lib" /fixed:no
+# ADD BASE LINK32 src\wx\vcard\release\versit.lib wxmsw.lib regex.lib zlib.lib
png.lib jpeg.lib tiff.lib rpcrt4.lib wsock32.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
comctl32.lib winmm.lib /nologo /subsystem:windows /machine:I386
/libpath:"e:\python20\libs" /libpath:"$(WXWIN)\lib" /fixed:no
# SUBTRACT BASE LINK32 /pdb:none /debug
-# ADD LINK32 extra\src\c-client\Release\cclient.lib
extra\src\compface\Release\compface.lib src\wx\vcard\release\versit.lib wxmsw.lib
regex.lib zlib.lib png.lib jpeg.lib tiff.lib rpcrt4.lib wsock32.lib kernel32.lib
user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib
oleaut32.lib uuid.lib comctl32.lib winmm.lib /nologo /subsystem:windows /map /debug
/machine:I386 /libpath:"e:\python20\libs" /libpath:"$(WXWIN)\lib" /fixed:no
+# ADD LINK32 lib\imap\Release\cclient.lib lib\compface\Release\compface.lib
src\wx\vcard\release\versit.lib wxmsw.lib regex.lib zlib.lib png.lib jpeg.lib tiff.lib
rpcrt4.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib winmm.lib
/nologo /subsystem:windows /map /debug /machine:I386 /libpath:"e:\python20\libs"
/libpath:"$(WXWIN)\lib" /fixed:no
# SUBTRACT LINK32 /pdb:none
Index: M.dsw
===================================================================
RCS file: /cvsroot/mahogany/M/M.dsw,v
retrieving revision 1.16
retrieving revision 1.17
diff -b -u -2 -r1.16 -r1.17
--- M.dsw 3 Jan 2004 14:54:49 -0000 1.16
+++ M.dsw 3 May 2004 12:28:32 -0000 1.17
@@ -40,14 +40,50 @@
End Project Dependency
Begin Project Dependency
- Project_Dep_Name wxWindows
+ Project_Dep_Name config
End Project Dependency
Begin Project Dependency
- Project_Dep_Name config
+ Project_Dep_Name core
End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name html
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name adv
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name net
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name wxregex
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "adv"=L:\wxWindows\build\msw\wx_adv.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
}}}
###############################################################################
-Project: "cclient"=".\extra\src\c-client\cclient.dsp" - Package Owner=<4>
+Project: "base"=L:\wxWindows\build\msw\wx_base.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "cclient"=".\lib\imap\imap.dsp" - Package Owner=<4>
Package=<5>
@@ -64,5 +100,5 @@
###############################################################################
-Project: "compface"=.\extra\src\compface\compface.dsp - Package Owner=<4>
+Project: "compface"=.\lib\compface\compface.dsp - Package Owner=<4>
Package=<5>
@@ -88,4 +124,43 @@
###############################################################################
+Project: "core"=L:\wxWindows\build\msw\wx_core.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name base
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "html"=L:\wxWindows\build\msw\wx_html.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "net"=L:\wxWindows\build\msw\wx_net.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Project: "pythoncore"="D:\Python\2.3.2-src\PCbuild\pythoncore.dsp" - Package Owner=<4>
@@ -112,5 +187,5 @@
###############################################################################
-Project: "wxWindows"=L:\wxWindows\src\wxWindows.dsp - Package Owner=<4>
+Project: "wxregex"=L:\wxWindows\build\msw\wx_wxregex.dsp - Package Owner=<4>
Package=<5>
-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g.
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
