X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/13ff9344d600ab38ad5ad4088d4a4797184405d2..88594d02eb59a55ac85d3210a49d02918124617b:/src/wxWindows.dsp diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index 8d6853f657..e2ae91032a 100644 --- a/src/wxWindows.dsp +++ b/src/wxWindows.dsp @@ -2,8 +2,8 @@ # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 # TARGTYPE "Win32 (x86) Static Library" 0x0104 +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 CFG=wxWindows - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, @@ -32,6 +32,8 @@ CFG=wxWindows - Win32 Debug # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe !IF "$(CFG)" == "wxWindows - Win32 Release Unicode DLL" @@ -46,13 +48,10 @@ CFG=wxWindows - Win32 Debug # PROP Intermediate_Dir "../ReleaseUnicodeDll" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -CPP=cl.exe # ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c # ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdllu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c -MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -RSC=rc.exe # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /i "../include" /d "NDEBUG" BSC32=bscmake.exe @@ -75,21 +74,18 @@ LINK32=link.exe # PROP Intermediate_Dir "../DebugUnicodeDll" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -CPP=cl.exe # ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c # ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdllud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c -MTL=midl.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -RSC=rc.exe # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /i "../include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw232ud.dll" /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.3 /dll /debug /machine:I386 /out:"../lib/wxmsw232ud.dll" /pdbtype:sept +# 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 winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw232ud.dll" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.3 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw232ud.dll" !ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode" @@ -103,10 +99,8 @@ LINK32=link.exe # PROP Output_Dir "../lib" # PROP Intermediate_Dir "../ReleaseUnicode" # PROP Target_Dir "" -CPP=cl.exe # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c -RSC=rc.exe # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -128,10 +122,8 @@ LIB32=link.exe -lib # PROP Output_Dir "../lib" # PROP Intermediate_Dir "../DebugUnicode" # PROP Target_Dir "" -CPP=cl.exe # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "_DEBUG" /D "__WXDEBUG__" /D WINVER=0x0400 /D "STRICT" /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c -RSC=rc.exe # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -154,13 +146,10 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "../ReleaseDll" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -CPP=cl.exe # ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c # ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdll" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c -MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -RSC=rc.exe # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /i "../include" /d "NDEBUG" BSC32=bscmake.exe @@ -183,21 +172,18 @@ LINK32=link.exe # PROP Intermediate_Dir "../DebugDll" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -CPP=cl.exe # ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c # ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdlld" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c -MTL=midl.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -RSC=rc.exe # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /i "../include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw232d.dll" /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.3 /dll /debug /machine:I386 /out:"../lib/wxmsw232d.dll" /pdbtype:sept +# 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 winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw232d.dll" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.3 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw232d.dll" !ELSEIF "$(CFG)" == "wxWindows - Win32 Release" @@ -211,10 +197,8 @@ LINK32=link.exe # PROP Output_Dir "../lib" # PROP Intermediate_Dir "../Release" # PROP Target_Dir "" -CPP=cl.exe # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c -RSC=rc.exe # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -236,10 +220,8 @@ LIB32=link.exe -lib # PROP Output_Dir "../lib" # PROP Intermediate_Dir "../Debug" # PROP Target_Dir "" -CPP=cl.exe # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswd" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "_DEBUG" /D "__WXDEBUG__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c -RSC=rc.exe # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -362,12 +344,6 @@ SOURCE=.\common\docview.cpp # End Source File # Begin Source File -SOURCE=.\common\dosyacc.c -# ADD CPP /W1 /D "USE_DEFINE" /D "IDE_INVOKED" -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - SOURCE=.\common\dseldlg.cpp # End Source File # Begin Source File @@ -380,20 +356,19 @@ SOURCE=.\common\dynlib.cpp # End Source File # Begin Source File -SOURCE=.\common\effects.cpp +SOURCE=.\common\dynload.cpp # End Source File # Begin Source File -SOURCE=.\common\encconv.cpp +SOURCE=.\common\effects.cpp # End Source File # Begin Source File -SOURCE=.\common\event.cpp +SOURCE=.\common\encconv.cpp # End Source File # Begin Source File -SOURCE=.\common\extended.c -# SUBTRACT CPP /YX /Yc /Yu +SOURCE=.\common\event.cpp # End Source File # Begin Source File @@ -581,10 +556,6 @@ SOURCE=.\common\object.cpp # End Source File # Begin Source File -SOURCE=.\common\objstrm.cpp -# End Source File -# Begin Source File - SOURCE=.\common\odbc.cpp # End Source File # Begin Source File @@ -641,10 +612,6 @@ SOURCE=.\common\sckstrm.cpp # End Source File # Begin Source File -SOURCE=.\common\serbase.cpp -# End Source File -# Begin Source File - SOURCE=.\common\sizer.cpp # End Source File # Begin Source File @@ -709,11 +676,6 @@ SOURCE=.\common\txtstrm.cpp # End Source File # Begin Source File -SOURCE=.\common\unzip.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - SOURCE=.\common\url.cpp # End Source File # Begin Source File @@ -764,6 +726,24 @@ SOURCE=.\common\zipstrm.cpp SOURCE=.\common\zstream.cpp # End Source File + +# Begin Source File + +SOURCE=.\common\extended.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=.\common\unzip.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File + +# Begin Source File + +SOURCE=.\common\dosyacc.c +# ADD CPP /W1 /D "USE_DEFINE" /D "IDE_INVOKED" +# SUBTRACT CPP /YX /Yc /Yu +# End Source File # End Group # Begin Group "Generic Files" @@ -888,6 +868,7 @@ SOURCE=.\generic\treelay.cpp SOURCE=.\generic\wizard.cpp # End Source File + # End Group # Begin Group "wxHTML Files" @@ -972,12 +953,18 @@ SOURCE=.\html\m_tables.cpp SOURCE=.\html\winpars.cpp # End Source File + # End Group # Begin Group "MSW Files" # PROP Default_Filter "" # Begin Source File +SOURCE=.\msw\dummy.cpp +# ADD CPP /Yc"wx/wxprec.h" +# End Source File +# Begin Source File + SOURCE=.\msw\accel.cpp # End Source File # Begin Source File @@ -1102,11 +1089,6 @@ SOURCE=.\msw\dragimag.cpp # End Source File # Begin Source File -SOURCE=.\msw\dummy.cpp -# ADD CPP /Yc"wx/wxprec.h" -# End Source File -# Begin Source File - SOURCE=.\msw\enhmeta.cpp # End Source File # Begin Source File @@ -1159,16 +1141,6 @@ SOURCE=.\msw\glcanvas.cpp # End Source File # Begin Source File -SOURCE=.\msw\gsocket.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\msw\gsockmsw.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - SOURCE=.\msw\helpbest.cpp # End Source File # Begin Source File @@ -1189,10 +1161,6 @@ SOURCE=.\msw\imaglist.cpp # End Source File # Begin Source File -SOURCE=.\msw\iniconf.cpp -# End Source File -# Begin Source File - SOURCE=.\msw\joystick.cpp # End Source File # Begin Source File @@ -1387,6 +1355,18 @@ SOURCE=.\msw\wave.cpp SOURCE=.\msw\window.cpp # End Source File + +# Begin Source File + +SOURCE=.\msw\gsocket.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=.\msw\gsockmsw.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File + # End Group # Begin Group "OLE Files" @@ -1415,6 +1395,7 @@ SOURCE=.\msw\ole\oleutils.cpp SOURCE=.\msw\ole\uuid.cpp # End Source File + # End Group # Begin Group "Headers" @@ -1425,9 +1406,7 @@ SOURCE=.\msw\ole\uuid.cpp # Begin Source File SOURCE=..\include\wx\msw\setup.h - !IF "$(CFG)" == "wxWindows - Win32 Release Unicode DLL" - # Begin Custom Build - Creating $(TargetPath) from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1435,9 +1414,7 @@ InputPath=..\include\wx\msw\setup.h copy $(InputPath) ..\lib\mswdllu\wx\setup.h # End Custom Build - !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL" - # Begin Custom Build - Creating $(TargetPath) from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1445,9 +1422,7 @@ InputPath=..\include\wx\msw\setup.h copy $(InputPath) ..\lib\mswdllud\wx\setup.h # End Custom Build - !ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode" - # Begin Custom Build - Creating $(TargetPath) from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1455,9 +1430,7 @@ InputPath=..\include\wx\msw\setup.h copy $(InputPath) ..\lib\mswu\wx\setup.h # End Custom Build - !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode" - # Begin Custom Build - Creating $(TargetPath) from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1465,9 +1438,7 @@ InputPath=..\include\wx\msw\setup.h copy $(InputPath) ..\lib\mswud\wx\setup.h # End Custom Build - !ELSEIF "$(CFG)" == "wxWindows - Win32 Release DLL" - # Begin Custom Build - Creating $(TargetPath) from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1475,9 +1446,7 @@ InputPath=..\include\wx\msw\setup.h copy $(InputPath) ..\lib\mswdll\wx\setup.h # End Custom Build - !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug DLL" - # Begin Custom Build - Creating $(TargetPath) from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1485,9 +1454,7 @@ InputPath=..\include\wx\msw\setup.h copy $(InputPath) ..\lib\mswdlld\wx\setup.h # End Custom Build - !ELSEIF "$(CFG)" == "wxWindows - Win32 Release" - # Begin Custom Build - Creating $(TargetPath) from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1495,9 +1462,7 @@ InputPath=..\include\wx\msw\setup.h copy $(InputPath) ..\lib\msw\wx\setup.h # End Custom Build - !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug" - # Begin Custom Build - Creating $(TargetPath) from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1505,9 +1470,7 @@ InputPath=..\include\wx\msw\setup.h copy $(InputPath) ..\lib\mswd\wx\setup.h # End Custom Build - !ENDIF - # End Source File # End Group # Begin Group "Common" @@ -1747,6 +1710,10 @@ SOURCE=..\include\wx\dynlib.h # End Source File # Begin Source File +SOURCE=..\include\wx\dynload.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\encconv.h # End Source File # Begin Source File @@ -2039,10 +2006,6 @@ SOURCE=..\include\wx\object.h # End Source File # Begin Source File -SOURCE=..\include\wx\objstrm.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\odbc.h # End Source File # Begin Source File @@ -2151,10 +2114,6 @@ SOURCE=..\include\wx\scrolwin.h # End Source File # Begin Source File -SOURCE=..\include\wx\serbase.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\settings.h # End Source File # Begin Source File @@ -2413,6 +2372,7 @@ SOURCE=..\include\wx\zipstrm.h SOURCE=..\include\wx\zstream.h # End Source File + # End Group # Begin Group "MSW" @@ -2789,6 +2749,7 @@ SOURCE=..\include\wx\msw\window.h SOURCE=..\include\wx\msw\winundef.h # End Source File + # End Group # Begin Group "Generic" @@ -2945,6 +2906,7 @@ SOURCE=..\include\wx\generic\treectlg.h SOURCE=..\include\wx\generic\wizard.h # End Source File + # End Group # Begin Group "HTML" @@ -3001,6 +2963,7 @@ SOURCE=..\include\wx\html\m_templ.h SOURCE=..\include\wx\html\winpars.h # End Source File + # End Group # End Group # End Target