Update to allow new wxNativeFontInfo stuff to compile

[wxWidgets.git] / wxBase.dsp

diff --git a/wxBase.dsp b/wxBase.dsp
index 9cea60da62f6f4064e5238c5bbe3c5221ed8c88d..d1819fe8f068fc91e7128dc5cb5e71d52b8618cd 100644 (file)
--- a/wxBase.dsp
+++ b/wxBase.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "BaseRelease"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c
 # PROP Intermediate_Dir "BaseRelease"
 # PROP Target_Dir ""
 # 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 "$(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__" /D "_MT" /Yu"wx/wxprec.h" /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


@@ -64,7 +64,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "BaseDebug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c
 # PROP Intermediate_Dir "BaseDebug"
 # PROP Target_Dir ""
 # 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 "$(wx)\include" /I "$(wx)\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 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


@@ -80,13 +80,6 @@ LIB32=link.exe -lib
 
 # Name "wxBase - Win32 Release"
 # Name "wxBase - Win32 Debug"
 
 # Name "wxBase - Win32 Release"
 # Name "wxBase - Win32 Debug"

-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\src\msw\dummy.cpp
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File

 # Begin Source File
 
 SOURCE=.\src\common\appcmn.cpp
 # Begin Source File
 
 SOURCE=.\src\common\appcmn.cpp


@@ -109,6 +102,19 @@ SOURCE=.\src\common\datstrm.cpp
 # End Source File
 # Begin Source File
 
 # 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\dummy.cpp
+# ADD CPP /Yc"wx/wxprec.h"
+# End Source File
+# Begin Source File
+

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


@@ -125,6 +131,11 @@ SOURCE=.\src\common\event.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -165,6 +176,16 @@ SOURCE=.\src\common\ftp.cpp
 # End Source File
 # Begin Source File
 
 # 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


@@ -173,6 +194,10 @@ SOURCE=.\src\common\http.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -193,10 +218,18 @@ SOURCE=.\src\common\longlong.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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

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

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


@@ -221,6 +254,14 @@ SOURCE=.\src\common\protocol.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -261,124 +302,65 @@ SOURCE=.\src\common\textfile.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\src\common\timercmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\common\tokenzr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\common\txtstrm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\common\url.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\common\utilscmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\common\variant.cpp
-# 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\zipstrm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\common\zstream.cpp
+SOURCE=.\src\msw\thread.cpp

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

-SOURCE=.\src\common\init.cpp
-# End Source File
-
-# Begin Source File
-
-SOURCE=.\src\msw\dde.cpp
+SOURCE=.\src\common\timercmn.cpp

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

-SOURCE=.\src\msw\dir.cpp
+SOURCE=.\src\common\tokenzr.cpp

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

-SOURCE=.\src\msw\main.cpp
+SOURCE=.\src\common\txtstrm.cpp

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

-SOURCE=.\src\msw\mimetype.cpp
+SOURCE=.\src\common\unzip.c
+# SUBTRACT CPP /YX /Yc /Yu

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

-SOURCE=.\src\msw\regconf.cpp
+SOURCE=.\src\common\url.cpp

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

-SOURCE=.\src\msw\registry.cpp
+SOURCE=.\src\msw\utils.cpp

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

-SOURCE=.\src\msw\thread.cpp
+SOURCE=.\src\common\utilscmn.cpp

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

-SOURCE=.\src\msw\utils.cpp
+SOURCE=.\src\msw\utilsexc.cpp

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

-SOURCE=.\src\msw\utilsexc.cpp
+SOURCE=.\src\common\variant.cpp

 # End Source File
 # End Source File

-

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=.\src\common\extended.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\src\common\wfstream.cpp

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

-SOURCE=.\src\common\unzip.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\src\common\wxchar.cpp

 # End Source File
 # End Source File

-

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=.\src\msw\gsocket.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\src\common\y_tab.c
+# PROP Exclude_From_Build 1

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

-SOURCE=.\src\msw\gsockmsw.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\src\common\zipstrm.cpp

 # End Source File
 # End Source File

-
-

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=.\src\common\y_tab.c
-
-!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\zstream.cpp

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