compilation fix for recent event changes

[wxWidgets.git] / wxBase.dsp

diff --git a/wxBase.dsp b/wxBase.dsp
index e32e9a8b1f544e9e578fb2d0b6c4d9a56c8e2ccc..d1819fe8f068fc91e7128dc5cb5e71d52b8618cd 100644 (file)
--- a/wxBase.dsp
+++ b/wxBase.dsp
@@ -32,16 +32,16 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "BaseRelease"
+# PROP BASE Intermediate_Dir "BaseRelease"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "BaseRelease"
+# PROP Intermediate_Dir "BaseRelease"

 # PROP Target_Dir ""
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /W3 /Zi /O2 /I "$(wx)\include" /I "$(wx)\src\zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D WIN95=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /Yu"wx/wxprec.h" /FD /c
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /Zi /O2 /I "include" /I "src\zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D WIN95=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /D "_MT" /Yu"wx/wxprec.h" /FD /c

 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe


@@ -55,16 +55,16 @@ LIB32=link.exe -lib
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Output_Dir "BaseDebug"
+# PROP BASE Intermediate_Dir "BaseDebug"

 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "BaseDebug"
 # PROP Intermediate_Dir "BaseDebug"
 # PROP Target_Dir ""
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "BaseDebug"
 # PROP Intermediate_Dir "BaseDebug"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MTd /W4 /Zi /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /D DEBUG=1 /D "_DEBUG" /D WXDEBUG=1 /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /D "_MT" /Fr /Yu"wx/wxprec.h" /FD /c
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "include" /I "src\zlib" /D "_DEBUG" /D DEBUG=1 /D WXDEBUG=1 /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /D "_MT" /Fr /Yu"wx/wxprec.h" /FD /c

 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe


@@ -86,6 +86,10 @@ SOURCE=.\src\common\appcmn.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\src\common\cmdline.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\src\common\config.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\src\common\config.cpp
 # End Source File
 # Begin Source File


@@ -94,6 +98,14 @@ SOURCE=.\src\common\datetime.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\src\common\datstrm.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\msw\dde.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\src\msw\dir.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\src\msw\dir.cpp
 # End Source File
 # Begin Source File


@@ -111,6 +123,10 @@ SOURCE=.\src\common\dynlib.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\src\common\encconv.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\src\common\event.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\src\common\event.cpp
 # End Source File
 # Begin Source File


@@ -140,10 +156,44 @@ SOURCE=.\src\common\filesys.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\src\common\fontmap.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\fs_inet.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\fs_mem.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\fs_zip.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\ftp.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\msw\gsocket.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\msw\gsockmsw.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+

 SOURCE=.\src\common\hash.cpp
 # End Source File
 # Begin Source File
 
 SOURCE=.\src\common\hash.cpp
 # End Source File
 # Begin Source File
 

+SOURCE=.\src\common\http.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\src\common\init.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\src\common\init.cpp
 # End Source File
 # Begin Source File


@@ -152,6 +202,10 @@ SOURCE=.\src\common\intl.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\src\common\ipcbase.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\src\common\list.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\src\common\list.cpp
 # End Source File
 # Begin Source File


@@ -168,7 +222,11 @@ SOURCE=.\src\msw\main.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\src\common\mimetype.cpp
+SOURCE=.\src\common\mimecmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\msw\mimetype.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -176,14 +234,26 @@ SOURCE=.\src\common\module.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\src\common\mstream.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\src\common\object.cpp
 # End Source File
 # Begin Source File
 
 SOURCE=.\src\common\object.cpp
 # End Source File
 # Begin Source File
 

+SOURCE=.\src\common\objstrm.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\src\common\process.cpp
 # End Source File
 # Begin Source File
 
 SOURCE=.\src\common\process.cpp
 # End Source File
 # Begin Source File
 

+SOURCE=.\src\common\protocol.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\src\msw\regconf.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\src\msw\regconf.cpp
 # End Source File
 # Begin Source File


@@ -192,6 +262,30 @@ SOURCE=.\src\msw\registry.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\src\common\sckaddr.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\sckfile.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\sckipc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\sckstrm.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\serbase.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\socket.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\src\common\strconv.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\src\common\strconv.cpp
 # End Source File
 # Begin Source File


@@ -224,6 +318,15 @@ SOURCE=.\src\common\txtstrm.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\src\common\unzip.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\common\url.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\src\msw\utils.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\src\msw\utils.cpp
 # End Source File
 # Begin Source File


@@ -240,23 +343,24 @@ SOURCE=.\src\common\variant.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\src\common\wfstream.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\src\common\wxchar.cpp
 # End Source File
 # Begin Source File
 
 SOURCE=.\src\common\y_tab.c
 SOURCE=.\src\common\wxchar.cpp
 # End Source File
 # Begin Source File
 
 SOURCE=.\src\common\y_tab.c

+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "wxBase - Win32 Release"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxBase - Win32 Debug"
-
-# ADD CPP /W1
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
+SOURCE=.\src\common\zipstrm.cpp
+# End Source File
+# Begin Source File

 
 

+SOURCE=.\src\common\zstream.cpp

 # End Source File
 # End Target
 # End Project
 # End Source File
 # End Target
 # End Project