From 15e8daecf594d38a57bc750f58de0ea33b79f4ee Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 3 Aug 2003 17:11:53 +0000 Subject: [PATCH] ported rest of contrib to bakefile git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/build/deprecated/deprecated.bkl | 49 ++ contrib/build/deprecated/deprecated.dsw | 28 ++ .../deprecated/deprecated_deprecateddll.dsp | 290 ++++++++++++ .../deprecated/deprecated_deprecatedlib.dsp | 273 +++++++++++ contrib/build/deprecated/makefile.bcc | 267 +++++++++++ contrib/build/deprecated/makefile.gcc | 256 +++++++++++ contrib/build/deprecated/makefile.vc | 336 ++++++++++++++ contrib/build/deprecated/makefile.wat | 322 +++++++++++++ contrib/build/mmedia/makefile.bcc | 346 ++++++++++++++ contrib/build/mmedia/makefile.gcc | 333 ++++++++++++++ contrib/build/mmedia/makefile.vc | 409 +++++++++++++++++ contrib/build/mmedia/makefile.wat | 405 +++++++++++++++++ contrib/build/mmedia/mmedia.bkl | 89 ++++ contrib/build/mmedia/mmedia.dsw | 28 ++ contrib/build/mmedia/mmedia_mmediadll.dsp | 342 ++++++++++++++ contrib/build/mmedia/mmedia_mmedialib.dsp | 325 +++++++++++++ contrib/build/net/makefile.bcc | 208 +++++++++ contrib/build/net/makefile.gcc | 195 ++++++++ contrib/build/net/makefile.vc | 270 +++++++++++ contrib/build/net/makefile.wat | 264 +++++++++++ contrib/build/net/netutils.bkl | 35 ++ contrib/build/net/netutils.dsw | 28 ++ contrib/build/net/netutils_netutilsdll.dsp | 274 +++++++++++ contrib/build/net/netutils_netutilslib.dsp | 257 +++++++++++ contrib/build/plot/makefile.bcc | 193 ++++++++ contrib/build/plot/makefile.gcc | 180 ++++++++ contrib/build/plot/makefile.vc | 256 +++++++++++ contrib/build/plot/makefile.wat | 247 ++++++++++ contrib/build/plot/plot.bkl | 37 ++ contrib/build/plot/plot.dsw | 28 ++ contrib/build/plot/plot_plotdll.dsp | 266 +++++++++++ contrib/build/plot/plot_plotlib.dsp | 249 ++++++++++ contrib/include/wx/deprecated/prop.h | 12 +- contrib/include/wx/deprecated/propform.h | 20 +- contrib/include/wx/deprecated/proplist.h | 26 +- contrib/include/wx/deprecated/resource.h | 40 +- contrib/include/wx/deprecated/setup.h | 24 + contrib/include/wx/deprecated/treelay.h | 6 +- contrib/include/wx/deprecated/wxexpr.h | 16 +- contrib/include/wx/mmedia/cdbase.h | 5 +- contrib/include/wx/mmedia/cdunix.h | 3 +- contrib/include/wx/mmedia/cdwin.h | 3 +- contrib/include/wx/mmedia/defs.h | 15 + contrib/include/wx/mmedia/sndaiff.h | 3 +- contrib/include/wx/mmedia/sndbase.h | 7 +- contrib/include/wx/mmedia/sndcodec.h | 3 +- contrib/include/wx/mmedia/sndcpcm.h | 3 +- contrib/include/wx/mmedia/sndesd.h | 1 + contrib/include/wx/mmedia/sndfile.h | 3 +- contrib/include/wx/mmedia/sndg72x.h | 7 +- contrib/include/wx/mmedia/sndmsad.h | 7 +- contrib/include/wx/mmedia/sndoss.h | 3 +- contrib/include/wx/mmedia/sndpcm.h | 1 + contrib/include/wx/mmedia/sndulaw.h | 7 +- contrib/include/wx/mmedia/sndwav.h | 1 + contrib/include/wx/mmedia/sndwin.h | 5 +- contrib/include/wx/mmedia/vidbase.h | 6 +- contrib/include/wx/mmedia/vidwin.h | 3 +- contrib/include/wx/mmedia/vidxanm.h | 3 +- contrib/include/wx/net/email.h | 2 +- contrib/include/wx/net/msg.h | 14 +- contrib/include/wx/net/smapi.h | 4 +- contrib/include/wx/plot/plot.h | 44 +- contrib/src/deprecated/Makefile.in | 309 +++++++++++-- contrib/src/deprecated/dosyacc.c | 11 +- contrib/src/deprecated/resource.cpp | 3 + contrib/src/deprecated/wxexpr.cpp | 4 +- contrib/src/mmedia/Makefile.in | 427 +++++++++++++++++- contrib/src/mmedia/cdwin.cpp | 2 + contrib/src/mmedia/sndcpcm.cpp | 2 +- contrib/src/mmedia/sndesd.cpp | 4 + contrib/src/mmedia/sndwin.cpp | 12 +- contrib/src/mmedia/vidxanm.cpp | 5 +- contrib/src/net/Makefile.in | 247 +++++++++- contrib/src/net/smapi.cpp | 2 +- contrib/src/plot/Makefile.in | 231 +++++++++- contrib/src/xrc/Makefile.in | 5 +- src/xrc/Makefile.in | 5 +- 78 files changed, 8428 insertions(+), 223 deletions(-) create mode 100644 contrib/build/deprecated/deprecated.bkl create mode 100644 contrib/build/deprecated/deprecated.dsw create mode 100644 contrib/build/deprecated/deprecated_deprecateddll.dsp create mode 100644 contrib/build/deprecated/deprecated_deprecatedlib.dsp create mode 100644 contrib/build/deprecated/makefile.bcc create mode 100644 contrib/build/deprecated/makefile.gcc create mode 100644 contrib/build/deprecated/makefile.vc create mode 100644 contrib/build/deprecated/makefile.wat create mode 100644 contrib/build/mmedia/makefile.bcc create mode 100644 contrib/build/mmedia/makefile.gcc create mode 100644 contrib/build/mmedia/makefile.vc create mode 100644 contrib/build/mmedia/makefile.wat create mode 100644 contrib/build/mmedia/mmedia.bkl create mode 100644 contrib/build/mmedia/mmedia.dsw create mode 100644 contrib/build/mmedia/mmedia_mmediadll.dsp create mode 100644 contrib/build/mmedia/mmedia_mmedialib.dsp create mode 100644 contrib/build/net/makefile.bcc create mode 100644 contrib/build/net/makefile.gcc create mode 100644 contrib/build/net/makefile.vc create mode 100644 contrib/build/net/makefile.wat create mode 100644 contrib/build/net/netutils.bkl create mode 100644 contrib/build/net/netutils.dsw create mode 100644 contrib/build/net/netutils_netutilsdll.dsp create mode 100644 contrib/build/net/netutils_netutilslib.dsp create mode 100644 contrib/build/plot/makefile.bcc create mode 100644 contrib/build/plot/makefile.gcc create mode 100644 contrib/build/plot/makefile.vc create mode 100644 contrib/build/plot/makefile.wat create mode 100644 contrib/build/plot/plot.bkl create mode 100644 contrib/build/plot/plot.dsw create mode 100644 contrib/build/plot/plot_plotdll.dsp create mode 100644 contrib/build/plot/plot_plotlib.dsp create mode 100644 contrib/include/wx/mmedia/defs.h diff --git a/contrib/build/deprecated/deprecated.bkl b/contrib/build/deprecated/deprecated.bkl new file mode 100644 index 0000000000..82afff2921 --- /dev/null +++ b/contrib/build/deprecated/deprecated.bkl @@ -0,0 +1,49 @@ + + + + + + + + + prop.cpp + propform.cpp + proplist.cpp + resource.cpp + treelay.cpp + wxexpr.cpp + + + dosyacc.c + + + + + wx/deprecated/expr.h + wx/deprecated/prop.h + wx/deprecated/propform.h + wx/deprecated/proplist.h + wx/deprecated/resource.h + wx/deprecated/setup.h + wx/deprecated/treelay.h + wx/deprecated/wxexpr.h + + + + + WXUSINGDLL + WXMAKINGDLL_DEPRECATED + $(DEPRECATED_SRC) + core + base + + + + $(DEPRECATED_SRC) + + + + diff --git a/contrib/build/deprecated/deprecated.dsw b/contrib/build/deprecated/deprecated.dsw new file mode 100644 index 0000000000..17ad2330c4 --- /dev/null +++ b/contrib/build/deprecated/deprecated.dsw @@ -0,0 +1,28 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### +Project: "deprecateddll"=deprecated_deprecateddll.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "deprecatedlib"=deprecated_deprecatedlib.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + diff --git a/contrib/build/deprecated/deprecated_deprecateddll.dsp b/contrib/build/deprecated/deprecated_deprecateddll.dsp new file mode 100644 index 0000000000..589a9ca676 --- /dev/null +++ b/contrib/build/deprecated/deprecated_deprecateddll.dsp @@ -0,0 +1,290 @@ +# Microsoft Developer Studio Project File - Name="deprecateddll" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=deprecateddll - Win32 DLL Native Debug Unicode +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "deprecated_deprecateddll.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "deprecated_deprecateddll.mak" CFG="deprecateddll - Win32 DLL Native Debug Unicode" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "deprecateddll - Win32 DLL Native Debug Unicode" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "deprecateddll - Win32 DLL Native Release Ansi" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "deprecateddll - Win32 DLL wxUniv Debug Unicode" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "deprecateddll - Win32 DLL wxUniv Release Unicode" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "deprecateddll - Win32 DLL Native Debug Ansi" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "deprecateddll - Win32 DLL wxUniv Release Ansi" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "deprecateddll - Win32 DLL wxUniv Debug Ansi" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "deprecateddll - Win32 DLL Native Release Unicode" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "deprecateddll - Win32 DLL Native Debug Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswuddll" +# PROP BASE Intermediate_Dir "vc_mswuddll\deprecateddll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswuddll" +# PROP Intermediate_Dir "vc_mswuddll\deprecateddll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswuddll" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_mswuddll\wxmsw250ud_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswuddll" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_mswuddll\wxmsw250ud_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_mswuddll" /i "..\..\src\deprecated\..\..\..\src\tiff" /i "..\..\src\deprecated\..\..\..\src\jpeg" /i "..\..\src\deprecated\..\..\..\src\png" /i "..\..\src\deprecated\..\..\..\src\zlib" /i "..\..\src\deprecated\..\..\..\src\regex" /i "..\..\src\deprecated\..\..\..\src\expat\lib" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_mswuddll" /i "..\..\src\deprecated\..\..\..\src\tiff" /i "..\..\src\deprecated\..\..\..\src\jpeg" /i "..\..\src\deprecated\..\..\..\src\png" /i "..\..\src\deprecated\..\..\..\src\zlib" /i "..\..\src\deprecated\..\..\..\src\regex" /i "..\..\src\deprecated\..\..\..\src\expat\lib" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_mswuddll\wxmsw250ud_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_mswuddll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_mswuddll\wxmsw25ud_deprecated.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_mswuddll\wxmsw250ud_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_mswuddll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_mswuddll\wxmsw25ud_deprecated.lib" /debug + +!ELSEIF "$(CFG)" == "deprecateddll - Win32 DLL Native Release Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswdll" +# PROP BASE Intermediate_Dir "vc_mswdll\deprecateddll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswdll" +# PROP Intermediate_Dir "vc_mswdll\deprecateddll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswdll" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_mswdll\wxmsw250_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswdll" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_mswdll\wxmsw250_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_mswdll" /i "..\..\src\deprecated\..\..\..\src\tiff" /i "..\..\src\deprecated\..\..\..\src\jpeg" /i "..\..\src\deprecated\..\..\..\src\png" /i "..\..\src\deprecated\..\..\..\src\zlib" /i "..\..\src\deprecated\..\..\..\src\regex" /i "..\..\src\deprecated\..\..\..\src\expat\lib" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED +# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_mswdll" /i "..\..\src\deprecated\..\..\..\src\tiff" /i "..\..\src\deprecated\..\..\..\src\jpeg" /i "..\..\src\deprecated\..\..\..\src\png" /i "..\..\src\deprecated\..\..\..\src\zlib" /i "..\..\src\deprecated\..\..\..\src\regex" /i "..\..\src\deprecated\..\..\..\src\expat\lib" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_mswdll\wxmsw250_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_mswdll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_mswdll\wxmsw25_deprecated.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_mswdll\wxmsw250_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_mswdll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_mswdll\wxmsw25_deprecated.lib" + +!ELSEIF "$(CFG)" == "deprecateddll - Win32 DLL wxUniv Debug Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswunivuddll" +# PROP BASE Intermediate_Dir "vc_mswunivuddll\deprecateddll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswunivuddll" +# PROP Intermediate_Dir "vc_mswunivuddll\deprecateddll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswunivuddll" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswunivuddll" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_mswunivuddll" /i "..\..\src\deprecated\..\..\..\src\tiff" /i "..\..\src\deprecated\..\..\..\src\jpeg" /i "..\..\src\deprecated\..\..\..\src\png" /i "..\..\src\deprecated\..\..\..\src\zlib" /i "..\..\src\deprecated\..\..\..\src\regex" /i "..\..\src\deprecated\..\..\..\src\expat\lib" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_mswunivuddll" /i "..\..\src\deprecated\..\..\..\src\tiff" /i "..\..\src\deprecated\..\..\..\src\jpeg" /i "..\..\src\deprecated\..\..\..\src\png" /i "..\..\src\deprecated\..\..\..\src\zlib" /i "..\..\src\deprecated\..\..\..\src\regex" /i "..\..\src\deprecated\..\..\..\src\expat\lib" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_mswunivuddll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_mswunivuddll\wxmswuniv25ud_deprecated.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_mswunivuddll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_mswunivuddll\wxmswuniv25ud_deprecated.lib" /debug + +!ELSEIF "$(CFG)" == "deprecateddll - Win32 DLL wxUniv Release Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswunivudll" +# PROP BASE Intermediate_Dir "vc_mswunivudll\deprecateddll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswunivudll" +# PROP Intermediate_Dir "vc_mswunivudll\deprecateddll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswunivudll" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswunivudll" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_mswunivudll" /i "..\..\src\deprecated\..\..\..\src\tiff" /i "..\..\src\deprecated\..\..\..\src\jpeg" /i "..\..\src\deprecated\..\..\..\src\png" /i "..\..\src\deprecated\..\..\..\src\zlib" /i "..\..\src\deprecated\..\..\..\src\regex" /i "..\..\src\deprecated\..\..\..\src\expat\lib" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED +# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_mswunivudll" /i "..\..\src\deprecated\..\..\..\src\tiff" /i "..\..\src\deprecated\..\..\..\src\jpeg" /i "..\..\src\deprecated\..\..\..\src\png" /i "..\..\src\deprecated\..\..\..\src\zlib" /i "..\..\src\deprecated\..\..\..\src\regex" /i "..\..\src\deprecated\..\..\..\src\expat\lib" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_mswunivudll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_mswunivudll\wxmswuniv25u_deprecated.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_mswunivudll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_mswunivudll\wxmswuniv25u_deprecated.lib" + +!ELSEIF "$(CFG)" == "deprecateddll - Win32 DLL Native Debug Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswddll" +# PROP BASE Intermediate_Dir "vc_mswddll\deprecateddll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswddll" +# PROP Intermediate_Dir "vc_mswddll\deprecateddll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswddll" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_mswddll\wxmsw250d_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswddll" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_mswddll\wxmsw250d_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_mswddll" /i "..\..\src\deprecated\..\..\..\src\tiff" /i "..\..\src\deprecated\..\..\..\src\jpeg" /i "..\..\src\deprecated\..\..\..\src\png" /i "..\..\src\deprecated\..\..\..\src\zlib" /i "..\..\src\deprecated\..\..\..\src\regex" /i "..\..\src\deprecated\..\..\..\src\expat\lib" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_mswddll" /i "..\..\src\deprecated\..\..\..\src\tiff" /i "..\..\src\deprecated\..\..\..\src\jpeg" /i "..\..\src\deprecated\..\..\..\src\png" /i "..\..\src\deprecated\..\..\..\src\zlib" /i "..\..\src\deprecated\..\..\..\src\regex" /i "..\..\src\deprecated\..\..\..\src\expat\lib" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_mswddll\wxmsw250d_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_mswddll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_mswddll\wxmsw25d_deprecated.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_mswddll\wxmsw250d_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_mswddll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_mswddll\wxmsw25d_deprecated.lib" /debug + +!ELSEIF "$(CFG)" == "deprecateddll - Win32 DLL wxUniv Release Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswunivdll" +# PROP BASE Intermediate_Dir "vc_mswunivdll\deprecateddll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswunivdll" +# PROP Intermediate_Dir "vc_mswunivdll\deprecateddll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswunivdll" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_mswunivdll\wxmswuniv250_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswunivdll" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_mswunivdll\wxmswuniv250_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_mswunivdll" /i "..\..\src\deprecated\..\..\..\src\tiff" /i "..\..\src\deprecated\..\..\..\src\jpeg" /i "..\..\src\deprecated\..\..\..\src\png" /i "..\..\src\deprecated\..\..\..\src\zlib" /i "..\..\src\deprecated\..\..\..\src\regex" /i "..\..\src\deprecated\..\..\..\src\expat\lib" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED +# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_mswunivdll" /i "..\..\src\deprecated\..\..\..\src\tiff" /i "..\..\src\deprecated\..\..\..\src\jpeg" /i "..\..\src\deprecated\..\..\..\src\png" /i "..\..\src\deprecated\..\..\..\src\zlib" /i "..\..\src\deprecated\..\..\..\src\regex" /i "..\..\src\deprecated\..\..\..\src\expat\lib" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_mswunivdll\wxmswuniv250_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_mswunivdll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_mswunivdll\wxmswuniv25_deprecated.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_mswunivdll\wxmswuniv250_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_mswunivdll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_mswunivdll\wxmswuniv25_deprecated.lib" + +!ELSEIF "$(CFG)" == "deprecateddll - Win32 DLL wxUniv Debug Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswunivddll" +# PROP BASE Intermediate_Dir "vc_mswunivddll\deprecateddll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswunivddll" +# PROP Intermediate_Dir "vc_mswunivddll\deprecateddll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswunivddll" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswunivddll" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_mswunivddll" /i "..\..\src\deprecated\..\..\..\src\tiff" /i "..\..\src\deprecated\..\..\..\src\jpeg" /i "..\..\src\deprecated\..\..\..\src\png" /i "..\..\src\deprecated\..\..\..\src\zlib" /i "..\..\src\deprecated\..\..\..\src\regex" /i "..\..\src\deprecated\..\..\..\src\expat\lib" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_mswunivddll" /i "..\..\src\deprecated\..\..\..\src\tiff" /i "..\..\src\deprecated\..\..\..\src\jpeg" /i "..\..\src\deprecated\..\..\..\src\png" /i "..\..\src\deprecated\..\..\..\src\zlib" /i "..\..\src\deprecated\..\..\..\src\regex" /i "..\..\src\deprecated\..\..\..\src\expat\lib" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_mswunivddll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_mswunivddll\wxmswuniv25d_deprecated.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_mswunivddll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_mswunivddll\wxmswuniv25d_deprecated.lib" /debug + +!ELSEIF "$(CFG)" == "deprecateddll - Win32 DLL Native Release Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswudll" +# PROP BASE Intermediate_Dir "vc_mswudll\deprecateddll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswudll" +# PROP Intermediate_Dir "vc_mswudll\deprecateddll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswudll" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_mswudll\wxmsw250u_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswudll" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_mswudll\wxmsw250u_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_mswudll" /i "..\..\src\deprecated\..\..\..\src\tiff" /i "..\..\src\deprecated\..\..\..\src\jpeg" /i "..\..\src\deprecated\..\..\..\src\png" /i "..\..\src\deprecated\..\..\..\src\zlib" /i "..\..\src\deprecated\..\..\..\src\regex" /i "..\..\src\deprecated\..\..\..\src\expat\lib" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED +# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_mswudll" /i "..\..\src\deprecated\..\..\..\src\tiff" /i "..\..\src\deprecated\..\..\..\src\jpeg" /i "..\..\src\deprecated\..\..\..\src\png" /i "..\..\src\deprecated\..\..\..\src\zlib" /i "..\..\src\deprecated\..\..\..\src\regex" /i "..\..\src\deprecated\..\..\..\src\expat\lib" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_mswudll\wxmsw250u_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_mswudll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_mswudll\wxmsw25u_deprecated.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\deprecated\..\..\..\lib\vc_mswudll\wxmsw250u_deprecated_vc_custom.dll" /libpath:"..\..\src\deprecated\..\..\..\lib\vc_mswudll" /implib:"..\..\src\deprecated\..\..\..\lib\vc_mswudll\wxmsw25u_deprecated.lib" + +!ENDIF + +# Begin Target + +# Name "deprecateddll - Win32 DLL Native Debug Unicode" +# Name "deprecateddll - Win32 DLL Native Release Ansi" +# Name "deprecateddll - Win32 DLL wxUniv Debug Unicode" +# Name "deprecateddll - Win32 DLL wxUniv Release Unicode" +# Name "deprecateddll - Win32 DLL Native Debug Ansi" +# Name "deprecateddll - Win32 DLL wxUniv Release Ansi" +# Name "deprecateddll - Win32 DLL wxUniv Debug Ansi" +# Name "deprecateddll - Win32 DLL Native Release Unicode" +# Begin Group "Source Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=../../src/deprecated\..\..\..\src\msw\dummy.cpp +# ADD BASE CPP /Yc"wx/wxprec.h" +# ADD CPP /Yc"wx/wxprec.h" +# End Source File +# Begin Source File + +SOURCE=../../src/deprecated\dosyacc.c +# End Source File +# Begin Source File + +SOURCE=../../src/deprecated\prop.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/deprecated\propform.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/deprecated\proplist.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/deprecated\resource.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/deprecated\treelay.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/deprecated\wxexpr.cpp +# End Source File +# End Group +# End Target +# End Project + diff --git a/contrib/build/deprecated/deprecated_deprecatedlib.dsp b/contrib/build/deprecated/deprecated_deprecatedlib.dsp new file mode 100644 index 0000000000..357aead488 --- /dev/null +++ b/contrib/build/deprecated/deprecated_deprecatedlib.dsp @@ -0,0 +1,273 @@ +# Microsoft Developer Studio Project File - Name="deprecatedlib" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=deprecatedlib - Win32 LIB wxUniv Release Ansi +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "deprecated_deprecatedlib.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "deprecated_deprecatedlib.mak" CFG="deprecatedlib - Win32 LIB wxUniv Release Ansi" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "deprecatedlib - Win32 LIB wxUniv Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "deprecatedlib - Win32 LIB Native Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "deprecatedlib - Win32 LIB wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "deprecatedlib - Win32 LIB Native Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "deprecatedlib - Win32 LIB Native Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "deprecatedlib - Win32 LIB wxUniv Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "deprecatedlib - Win32 LIB wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "deprecatedlib - Win32 LIB Native Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "deprecatedlib - Win32 LIB wxUniv Release Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswuniv" +# PROP BASE Intermediate_Dir "vc_mswuniv\deprecatedlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswuniv" +# PROP Intermediate_Dir "vc_mswuniv\deprecatedlib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswuniv" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Fd..\..\src\deprecated\..\..\..\lib\vc_mswuniv\wxmswuniv25_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswuniv" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Fd..\..\src\deprecated\..\..\..\lib\vc_mswuniv\wxmswuniv25_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_mswuniv\wxmswuniv25_deprecated.lib" +# ADD LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_mswuniv\wxmswuniv25_deprecated.lib" + +!ELSEIF "$(CFG)" == "deprecatedlib - Win32 LIB Native Release Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswu" +# PROP BASE Intermediate_Dir "vc_mswu\deprecatedlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswu" +# PROP Intermediate_Dir "vc_mswu\deprecatedlib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswu" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Fd..\..\src\deprecated\..\..\..\lib\vc_mswu\wxmsw25u_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswu" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Fd..\..\src\deprecated\..\..\..\lib\vc_mswu\wxmsw25u_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_mswu\wxmsw25u_deprecated.lib" +# ADD LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_mswu\wxmsw25u_deprecated.lib" + +!ELSEIF "$(CFG)" == "deprecatedlib - Win32 LIB wxUniv Debug Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswunivd" +# PROP BASE Intermediate_Dir "vc_mswunivd\deprecatedlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswunivd" +# PROP Intermediate_Dir "vc_mswunivd\deprecatedlib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswunivd" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_mswunivd\wxmswuniv25d_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswunivd" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_mswunivd\wxmswuniv25d_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_mswunivd\wxmswuniv25d_deprecated.lib" +# ADD LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_mswunivd\wxmswuniv25d_deprecated.lib" + +!ELSEIF "$(CFG)" == "deprecatedlib - Win32 LIB Native Release Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_msw" +# PROP BASE Intermediate_Dir "vc_msw\deprecatedlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_msw" +# PROP Intermediate_Dir "vc_msw\deprecatedlib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_msw" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Fd..\..\src\deprecated\..\..\..\lib\vc_msw\wxmsw25_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_msw" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Fd..\..\src\deprecated\..\..\..\lib\vc_msw\wxmsw25_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_msw\wxmsw25_deprecated.lib" +# ADD LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_msw\wxmsw25_deprecated.lib" + +!ELSEIF "$(CFG)" == "deprecatedlib - Win32 LIB Native Debug Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswud" +# PROP BASE Intermediate_Dir "vc_mswud\deprecatedlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswud" +# PROP Intermediate_Dir "vc_mswud\deprecatedlib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswud" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_mswud\wxmsw25ud_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswud" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_mswud\wxmsw25ud_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_mswud\wxmsw25ud_deprecated.lib" +# ADD LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_mswud\wxmsw25ud_deprecated.lib" + +!ELSEIF "$(CFG)" == "deprecatedlib - Win32 LIB wxUniv Release Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswunivu" +# PROP BASE Intermediate_Dir "vc_mswunivu\deprecatedlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswunivu" +# PROP Intermediate_Dir "vc_mswunivu\deprecatedlib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswunivu" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Fd..\..\src\deprecated\..\..\..\lib\vc_mswunivu\wxmswuniv25u_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswunivu" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Fd..\..\src\deprecated\..\..\..\lib\vc_mswunivu\wxmswuniv25u_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_mswunivu\wxmswuniv25u_deprecated.lib" +# ADD LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_mswunivu\wxmswuniv25u_deprecated.lib" + +!ELSEIF "$(CFG)" == "deprecatedlib - Win32 LIB wxUniv Debug Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswunivud" +# PROP BASE Intermediate_Dir "vc_mswunivud\deprecatedlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswunivud" +# PROP Intermediate_Dir "vc_mswunivud\deprecatedlib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswunivud" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswunivud" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_deprecated.lib" +# ADD LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_deprecated.lib" + +!ELSEIF "$(CFG)" == "deprecatedlib - Win32 LIB Native Debug Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswd" +# PROP BASE Intermediate_Dir "vc_mswd\deprecatedlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_mswd" +# PROP Intermediate_Dir "vc_mswd\deprecatedlib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswd" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_mswd\wxmsw25d_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_mswd" /I "..\..\src\deprecated\..\..\..\src\tiff" /I "..\..\src\deprecated\..\..\..\src\jpeg" /I "..\..\src\deprecated\..\..\..\src\png" /I "..\..\src\deprecated\..\..\..\src\zlib" /I "..\..\src\deprecated\..\..\..\src\regex" /I "..\..\src\deprecated\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_mswd\wxmsw25d_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_mswd\wxmsw25d_deprecated.lib" +# ADD LIB32 /nologo /out:"..\..\src\deprecated\..\..\..\lib\vc_mswd\wxmsw25d_deprecated.lib" + +!ENDIF + +# Begin Target + +# Name "deprecatedlib - Win32 LIB wxUniv Release Ansi" +# Name "deprecatedlib - Win32 LIB Native Release Unicode" +# Name "deprecatedlib - Win32 LIB wxUniv Debug Ansi" +# Name "deprecatedlib - Win32 LIB Native Release Ansi" +# Name "deprecatedlib - Win32 LIB Native Debug Unicode" +# Name "deprecatedlib - Win32 LIB wxUniv Release Unicode" +# Name "deprecatedlib - Win32 LIB wxUniv Debug Unicode" +# Name "deprecatedlib - Win32 LIB Native Debug Ansi" +# Begin Group "Source Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=../../src/deprecated\..\..\..\src\msw\dummy.cpp +# ADD BASE CPP /Yc"wx/wxprec.h" +# ADD CPP /Yc"wx/wxprec.h" +# End Source File +# Begin Source File + +SOURCE=../../src/deprecated\dosyacc.c +# End Source File +# Begin Source File + +SOURCE=../../src/deprecated\prop.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/deprecated\propform.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/deprecated\proplist.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/deprecated\resource.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/deprecated\treelay.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/deprecated\wxexpr.cpp +# End Source File +# End Group +# End Target +# End Project + diff --git a/contrib/build/deprecated/makefile.bcc b/contrib/build/deprecated/makefile.bcc new file mode 100644 index 0000000000..e163d219a8 --- /dev/null +++ b/contrib/build/deprecated/makefile.bcc @@ -0,0 +1,267 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +DEPRECATEDDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \ + -I$(LIBDIRNAME) -I..\..\src\deprecated\..\..\..\src\tiff \ + -I..\..\src\deprecated\..\..\..\src\jpeg \ + -I..\..\src\deprecated\..\..\..\src\png \ + -I..\..\src\deprecated\..\..\..\src\zlib \ + -I..\..\src\deprecated\..\..\..\src\regex \ + -I..\..\src\deprecated\..\..\..\src\expat\lib \ + -I..\..\src\deprecated\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED \ + $(CFLAGS) +DEPRECATEDDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \ + -I$(LIBDIRNAME) -I..\..\src\deprecated\..\..\..\src\tiff \ + -I..\..\src\deprecated\..\..\..\src\jpeg \ + -I..\..\src\deprecated\..\..\..\src\png \ + -I..\..\src\deprecated\..\..\..\src\zlib \ + -I..\..\src\deprecated\..\..\..\src\regex \ + -I..\..\src\deprecated\..\..\..\src\expat\lib \ + -I..\..\src\deprecated\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED \ + $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_deprecateddll.csm +DEPRECATEDDLL_OBJECTS = \ + $(OBJS)\deprecateddll_dummy.obj \ + $(OBJS)\deprecateddll_prop.obj \ + $(OBJS)\deprecateddll_propform.obj \ + $(OBJS)\deprecateddll_proplist.obj \ + $(OBJS)\deprecateddll_resource.obj \ + $(OBJS)\deprecateddll_treelay.obj \ + $(OBJS)\deprecateddll_wxexpr.obj \ + $(OBJS)\deprecateddll_dosyacc.obj +DEPRECATEDLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \ + -I$(LIBDIRNAME) -I..\..\src\deprecated\..\..\..\src\tiff \ + -I..\..\src\deprecated\..\..\..\src\jpeg \ + -I..\..\src\deprecated\..\..\..\src\png \ + -I..\..\src\deprecated\..\..\..\src\zlib \ + -I..\..\src\deprecated\..\..\..\src\regex \ + -I..\..\src\deprecated\..\..\..\src\expat\lib \ + -I..\..\src\deprecated\..\..\include $(CFLAGS) +DEPRECATEDLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \ + -I$(LIBDIRNAME) -I..\..\src\deprecated\..\..\..\src\tiff \ + -I..\..\src\deprecated\..\..\..\src\jpeg \ + -I..\..\src\deprecated\..\..\..\src\png \ + -I..\..\src\deprecated\..\..\..\src\zlib \ + -I..\..\src\deprecated\..\..\..\src\regex \ + -I..\..\src\deprecated\..\..\..\src\expat\lib \ + -I..\..\src\deprecated\..\..\include $(CXXFLAGS) -Hu \ + -H=$(OBJS)\wxprec_deprecatedlib.csm +DEPRECATEDLIB_OBJECTS = \ + $(OBJS)\deprecatedlib_dummy.obj \ + $(OBJS)\deprecatedlib_prop.obj \ + $(OBJS)\deprecatedlib_propform.obj \ + $(OBJS)\deprecatedlib_proplist.obj \ + $(OBJS)\deprecatedlib_resource.obj \ + $(OBJS)\deprecatedlib_treelay.obj \ + $(OBJS)\deprecatedlib_wxexpr.obj \ + $(OBJS)\deprecatedlib_dosyacc.obj +LIBDIRNAME = \ + ..\..\src\deprecated\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(OFFICIAL_BUILD)" == "0" +VENDORTAG = _$(VENDOR) +!endif +!if "$(OFFICIAL_BUILD)" == "1" +VENDORTAG = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = -v +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(SHARED)" == "1" +__deprecateddll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).dll +!endif +!if "$(SHARED)" == "0" +__deprecatedlib___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__deprecateddll___depname) $(__deprecatedlib___depname) + +$(OBJS)\deprecateddll_dosyacc.obj: ../../src/deprecated\dosyacc.c + $(CC) -q -c -P- -o$@ $(DEPRECATEDDLL_CFLAGS) $** + +$(OBJS)\deprecateddll_dummy.obj: ../../src/deprecated\..\..\..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) -H $** + +$(OBJS)\deprecateddll_prop.obj: ../../src/deprecated\prop.cpp + $(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $** + +$(OBJS)\deprecateddll_propform.obj: ../../src/deprecated\propform.cpp + $(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $** + +$(OBJS)\deprecateddll_proplist.obj: ../../src/deprecated\proplist.cpp + $(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $** + +$(OBJS)\deprecateddll_resource.obj: ../../src/deprecated\resource.cpp + $(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $** + +$(OBJS)\deprecateddll_treelay.obj: ../../src/deprecated\treelay.cpp + $(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $** + +$(OBJS)\deprecateddll_wxexpr.obj: ../../src/deprecated\wxexpr.cpp + $(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $** + +$(OBJS)\deprecatedlib_dosyacc.obj: ../../src/deprecated\dosyacc.c + $(CC) -q -c -P- -o$@ $(DEPRECATEDLIB_CFLAGS) $** + +$(OBJS)\deprecatedlib_dummy.obj: ../../src/deprecated\..\..\..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) -H $** + +$(OBJS)\deprecatedlib_prop.obj: ../../src/deprecated\prop.cpp + $(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $** + +$(OBJS)\deprecatedlib_propform.obj: ../../src/deprecated\propform.cpp + $(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $** + +$(OBJS)\deprecatedlib_proplist.obj: ../../src/deprecated\proplist.cpp + $(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $** + +$(OBJS)\deprecatedlib_resource.obj: ../../src/deprecated\resource.cpp + $(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $** + +$(OBJS)\deprecatedlib_treelay.obj: ../../src/deprecated\treelay.cpp + $(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $** + +$(OBJS)\deprecatedlib_wxexpr.obj: ../../src/deprecated\wxexpr.cpp + $(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib + +!if "$(SHARED)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).dll: $(DEPRECATEDDLL_OBJECTS) $(OBJS)\deprecateddll_dummy.obj + ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + c0d32.obj $(DEPRECATEDDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, +| + implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated $@ +!endif + +!if "$(SHARED)" == "0" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib: $(DEPRECATEDLIB_OBJECTS) $(OBJS)\deprecatedlib_dummy.obj + if exist $@ del $@ + tlib /a /p2048 $@ @&&| + $(DEPRECATEDLIB_OBJECTS) +| +!endif diff --git a/contrib/build/deprecated/makefile.gcc b/contrib/build/deprecated/makefile.gcc new file mode 100644 index 0000000000..5478c630cc --- /dev/null +++ b/contrib/build/deprecated/makefile.gcc @@ -0,0 +1,256 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../../build/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +DEPRECATEDDLL_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \ + -I$(LIBDIRNAME) -I..\..\src\deprecated\..\..\..\src\tiff \ + -I..\..\src\deprecated\..\..\..\src\jpeg \ + -I..\..\src\deprecated\..\..\..\src\png \ + -I..\..\src\deprecated\..\..\..\src\zlib \ + -I..\..\src\deprecated\..\..\..\src\regex \ + -I..\..\src\deprecated\..\..\..\src\expat\lib \ + -I..\..\src\deprecated\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED \ + $(CFLAGS) +DEPRECATEDDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ + $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I..\..\src\deprecated\..\..\..\include -I$(LIBDIRNAME) \ + -I..\..\src\deprecated\..\..\..\src\tiff \ + -I..\..\src\deprecated\..\..\..\src\jpeg \ + -I..\..\src\deprecated\..\..\..\src\png \ + -I..\..\src\deprecated\..\..\..\src\zlib \ + -I..\..\src\deprecated\..\..\..\src\regex \ + -I..\..\src\deprecated\..\..\..\src\expat\lib \ + -I..\..\src\deprecated\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED \ + $(CXXFLAGS) +DEPRECATEDDLL_OBJECTS = \ + $(OBJS)\deprecateddll_dummy.o \ + $(OBJS)\deprecateddll_prop.o \ + $(OBJS)\deprecateddll_propform.o \ + $(OBJS)\deprecateddll_proplist.o \ + $(OBJS)\deprecateddll_resource.o \ + $(OBJS)\deprecateddll_treelay.o \ + $(OBJS)\deprecateddll_wxexpr.o \ + $(OBJS)\deprecateddll_dosyacc.o +DEPRECATEDLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \ + -I$(LIBDIRNAME) -I..\..\src\deprecated\..\..\..\src\tiff \ + -I..\..\src\deprecated\..\..\..\src\jpeg \ + -I..\..\src\deprecated\..\..\..\src\png \ + -I..\..\src\deprecated\..\..\..\src\zlib \ + -I..\..\src\deprecated\..\..\..\src\regex \ + -I..\..\src\deprecated\..\..\..\src\expat\lib \ + -I..\..\src\deprecated\..\..\include $(CFLAGS) +DEPRECATEDLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ + $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I..\..\src\deprecated\..\..\..\include -I$(LIBDIRNAME) \ + -I..\..\src\deprecated\..\..\..\src\tiff \ + -I..\..\src\deprecated\..\..\..\src\jpeg \ + -I..\..\src\deprecated\..\..\..\src\png \ + -I..\..\src\deprecated\..\..\..\src\zlib \ + -I..\..\src\deprecated\..\..\..\src\regex \ + -I..\..\src\deprecated\..\..\..\src\expat\lib \ + -I..\..\src\deprecated\..\..\include $(CXXFLAGS) +DEPRECATEDLIB_OBJECTS = \ + $(OBJS)\deprecatedlib_dummy.o \ + $(OBJS)\deprecatedlib_prop.o \ + $(OBJS)\deprecatedlib_propform.o \ + $(OBJS)\deprecatedlib_proplist.o \ + $(OBJS)\deprecatedlib_resource.o \ + $(OBJS)\deprecatedlib_treelay.o \ + $(OBJS)\deprecatedlib_wxexpr.o \ + $(OBJS)\deprecatedlib_dosyacc.o +LIBDIRNAME = \ + ..\..\src\deprecated\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(OFFICIAL_BUILD),0) +VENDORTAG = _$(VENDOR) +endif +ifeq ($(OFFICIAL_BUILD),1) +VENDORTAG = +endif +ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +WXDEBUGFLAG = d +endif +endif +ifeq ($(DEBUG_FLAG),1) +WXDEBUGFLAG = d +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(BUILD),debug) +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = -g +endif +endif +ifeq ($(BUILD),release) +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = +endif +endif +ifeq ($(DEBUG_INFO),0) +__DEBUGINFO = +endif +ifeq ($(DEBUG_INFO),1) +__DEBUGINFO = -g +endif +ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +endif +ifeq ($(DEBUG_FLAG),1) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +ifeq ($(USE_GUI),1) +__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) +endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG = -O2 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif +ifeq ($(SHARED),1) +__deprecateddll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_gcc$(VENDORTAG).dll +endif +ifeq ($(SHARED),0) +__deprecatedlib___depname = \ + $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.a +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__deprecateddll___depname) $(__deprecatedlib___depname) + +$(OBJS)\deprecateddll_dosyacc.o: ../../src/deprecated\dosyacc.c + $(CC) -c -o $@ $(DEPRECATEDDLL_CFLAGS) $< + +$(OBJS)\deprecateddll_dummy.o: ../../src/deprecated\..\..\..\src\msw\dummy.cpp + $(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< + +$(OBJS)\deprecateddll_prop.o: ../../src/deprecated\prop.cpp + $(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< + +$(OBJS)\deprecateddll_propform.o: ../../src/deprecated\propform.cpp + $(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< + +$(OBJS)\deprecateddll_proplist.o: ../../src/deprecated\proplist.cpp + $(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< + +$(OBJS)\deprecateddll_resource.o: ../../src/deprecated\resource.cpp + $(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< + +$(OBJS)\deprecateddll_treelay.o: ../../src/deprecated\treelay.cpp + $(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< + +$(OBJS)\deprecateddll_wxexpr.o: ../../src/deprecated\wxexpr.cpp + $(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< + +$(OBJS)\deprecatedlib_dosyacc.o: ../../src/deprecated\dosyacc.c + $(CC) -c -o $@ $(DEPRECATEDLIB_CFLAGS) $< + +$(OBJS)\deprecatedlib_dummy.o: ../../src/deprecated\..\..\..\src\msw\dummy.cpp + $(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< + +$(OBJS)\deprecatedlib_prop.o: ../../src/deprecated\prop.cpp + $(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< + +$(OBJS)\deprecatedlib_propform.o: ../../src/deprecated\propform.cpp + $(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< + +$(OBJS)\deprecatedlib_proplist.o: ../../src/deprecated\proplist.cpp + $(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< + +$(OBJS)\deprecatedlib_resource.o: ../../src/deprecated\resource.cpp + $(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< + +$(OBJS)\deprecatedlib_treelay.o: ../../src/deprecated\treelay.cpp + $(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< + +$(OBJS)\deprecatedlib_wxexpr.o: ../../src/deprecated\wxexpr.cpp + $(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.a + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.a + +ifeq ($(SHARED),1) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_gcc$(VENDORTAG).dll: $(DEPRECATEDDLL_OBJECTS) + $(CXX) -shared -o $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) +endif + +ifeq ($(SHARED),0) +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.a: $(DEPRECATEDLIB_OBJECTS) + if exist $@ del $@ + ar rcu $@ $(DEPRECATEDLIB_OBJECTS) + ranlib $@ +endif + +.PHONY: all clean diff --git a/contrib/build/deprecated/makefile.vc b/contrib/build/deprecated/makefile.vc new file mode 100644 index 0000000000..3bea1b8615 --- /dev/null +++ b/contrib/build/deprecated/makefile.vc @@ -0,0 +1,336 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +DEPRECATEDDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) \ + /DWIN32 $(__DEBUGINFO_2) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).pdb \ + $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + /I..\..\src\deprecated\..\..\..\include /I$(LIBDIRNAME) \ + /I..\..\src\deprecated\..\..\..\src\tiff \ + /I..\..\src\deprecated\..\..\..\src\jpeg \ + /I..\..\src\deprecated\..\..\..\src\png \ + /I..\..\src\deprecated\..\..\..\src\zlib \ + /I..\..\src\deprecated\..\..\..\src\regex \ + /I..\..\src\deprecated\..\..\..\src\expat\lib \ + /I..\..\src\deprecated\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_DEPRECATED \ + $(CFLAGS) +DEPRECATEDDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) \ + /DWIN32 $(__DEBUGINFO_2) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).pdb \ + $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + /I..\..\src\deprecated\..\..\..\include /I$(LIBDIRNAME) \ + /I..\..\src\deprecated\..\..\..\src\tiff \ + /I..\..\src\deprecated\..\..\..\src\jpeg \ + /I..\..\src\deprecated\..\..\..\src\png \ + /I..\..\src\deprecated\..\..\..\src\zlib \ + /I..\..\src\deprecated\..\..\..\src\regex \ + /I..\..\src\deprecated\..\..\..\src\expat\lib \ + /I..\..\src\deprecated\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_DEPRECATED \ + $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_deprecateddll.pch" +DEPRECATEDDLL_OBJECTS = \ + $(OBJS)\deprecateddll_dummy.obj \ + $(OBJS)\deprecateddll_prop.obj \ + $(OBJS)\deprecateddll_propform.obj \ + $(OBJS)\deprecateddll_proplist.obj \ + $(OBJS)\deprecateddll_resource.obj \ + $(OBJS)\deprecateddll_treelay.obj \ + $(OBJS)\deprecateddll_wxexpr.obj \ + $(OBJS)\deprecateddll_dosyacc.obj +DEPRECATEDLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_12) \ + /DWIN32 $(__DEBUGINFO_2) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.pdb \ + $(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + /I..\..\src\deprecated\..\..\..\include /I$(LIBDIRNAME) \ + /I..\..\src\deprecated\..\..\..\src\tiff \ + /I..\..\src\deprecated\..\..\..\src\jpeg \ + /I..\..\src\deprecated\..\..\..\src\png \ + /I..\..\src\deprecated\..\..\..\src\zlib \ + /I..\..\src\deprecated\..\..\..\src\regex \ + /I..\..\src\deprecated\..\..\..\src\expat\lib \ + /I..\..\src\deprecated\..\..\include $(CFLAGS) +DEPRECATEDLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_12) \ + /DWIN32 $(__DEBUGINFO_2) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.pdb \ + $(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + /I..\..\src\deprecated\..\..\..\include /I$(LIBDIRNAME) \ + /I..\..\src\deprecated\..\..\..\src\tiff \ + /I..\..\src\deprecated\..\..\..\src\jpeg \ + /I..\..\src\deprecated\..\..\..\src\png \ + /I..\..\src\deprecated\..\..\..\src\zlib \ + /I..\..\src\deprecated\..\..\..\src\regex \ + /I..\..\src\deprecated\..\..\..\src\expat\lib \ + /I..\..\src\deprecated\..\..\include $(CXXFLAGS) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_deprecatedlib.pch" +DEPRECATEDLIB_OBJECTS = \ + $(OBJS)\deprecatedlib_dummy.obj \ + $(OBJS)\deprecatedlib_prop.obj \ + $(OBJS)\deprecatedlib_propform.obj \ + $(OBJS)\deprecatedlib_proplist.obj \ + $(OBJS)\deprecatedlib_resource.obj \ + $(OBJS)\deprecatedlib_treelay.obj \ + $(OBJS)\deprecatedlib_wxexpr.obj \ + $(OBJS)\deprecatedlib_dosyacc.obj +LIBDIRNAME = \ + ..\..\src\deprecated\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(OFFICIAL_BUILD)" == "0" +VENDORTAG = _$(VENDOR) +!endif +!if "$(OFFICIAL_BUILD)" == "1" +VENDORTAG = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = /Zi +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_12 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_12 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_12 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_3 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_3 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_3 = $(__DEBUGINFO) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS = T +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO = +!endif +!if "$(DEBUG_INFO)" == "0" +____DEBUGINFO = +!endif +!if "$(DEBUG_INFO)" == "1" +____DEBUGINFO = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_11_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_11_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_11_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_2_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_2_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p = $(____DEBUGINFO) +!endif +!if "$(SHARED)" == "1" +__deprecateddll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).dll +!endif +!if "$(SHARED)" == "0" +__deprecatedlib___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__deprecateddll___depname) $(__deprecatedlib___depname) + +$(OBJS)\deprecateddll_dosyacc.obj: ../../src/deprecated\dosyacc.c + $(CC) /c /nologo /TC /Fo$@ $(DEPRECATEDDLL_CFLAGS) $** + +$(OBJS)\deprecateddll_dummy.obj: ../../src/deprecated\..\..\..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\deprecateddll_prop.obj: ../../src/deprecated\prop.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) $** + +$(OBJS)\deprecateddll_propform.obj: ../../src/deprecated\propform.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) $** + +$(OBJS)\deprecateddll_proplist.obj: ../../src/deprecated\proplist.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) $** + +$(OBJS)\deprecateddll_resource.obj: ../../src/deprecated\resource.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) $** + +$(OBJS)\deprecateddll_treelay.obj: ../../src/deprecated\treelay.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) $** + +$(OBJS)\deprecateddll_wxexpr.obj: ../../src/deprecated\wxexpr.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) $** + +$(OBJS)\deprecatedlib_dosyacc.obj: ../../src/deprecated\dosyacc.c + $(CC) /c /nologo /TC /Fo$@ $(DEPRECATEDLIB_CFLAGS) $** + +$(OBJS)\deprecatedlib_dummy.obj: ../../src/deprecated\..\..\..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\deprecatedlib_prop.obj: ../../src/deprecated\prop.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) $** + +$(OBJS)\deprecatedlib_propform.obj: ../../src/deprecated\propform.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) $** + +$(OBJS)\deprecatedlib_proplist.obj: ../../src/deprecated\proplist.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) $** + +$(OBJS)\deprecatedlib_resource.obj: ../../src/deprecated\resource.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) $** + +$(OBJS)\deprecatedlib_treelay.obj: ../../src/deprecated\treelay.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) $** + +$(OBJS)\deprecatedlib_wxexpr.obj: ../../src/deprecated\wxexpr.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib + +!if "$(SHARED)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).dll: $(DEPRECATEDDLL_OBJECTS) $(OBJS)\deprecateddll_dummy.obj + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) @<< + $(DEPRECATEDDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib +<< +!endif + +!if "$(SHARED)" == "0" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib: $(DEPRECATEDLIB_OBJECTS) $(OBJS)\deprecatedlib_dummy.obj + if exist $@ del $@ + lib /NOLOGO /OUT:$@ @<< + $(DEPRECATEDLIB_OBJECTS) +<< +!endif diff --git a/contrib/build/deprecated/makefile.wat b/contrib/build/deprecated/makefile.wat new file mode 100644 index 0000000000..0f0265011f --- /dev/null +++ b/contrib/build/deprecated/makefile.wat @@ -0,0 +1,322 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +VENDORTAG = +!ifeq OFFICIAL_BUILD 0 +VENDORTAG = _$(VENDOR) +!endif +!ifeq OFFICIAL_BUILD 1 +VENDORTAG = +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +!ifeq DEBUG_FLAG default +WXDEBUGFLAG = d +!endif +!endif +!ifeq DEBUG_FLAG 1 +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGINFO = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__OPTIMIZEFLAG = +!ifeq BUILD debug +__OPTIMIZEFLAG = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG = -ot -ox +!endif +__RUNTIME_LIBS = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__deprecateddll___depname = +!ifeq SHARED 1 +__deprecateddll___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_wat$(VENDORTAG).dll +!endif +__deprecatedlib___depname = +!ifeq SHARED 0 +__deprecatedlib___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib +!endif + +### Variables: ### + +DEPRECATEDDLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include & + -i=$(LIBDIRNAME) -i=..\..\src\deprecated\..\..\..\src\tiff & + -i=..\..\src\deprecated\..\..\..\src\jpeg & + -i=..\..\src\deprecated\..\..\..\src\png & + -i=..\..\src\deprecated\..\..\..\src\zlib & + -i=..\..\src\deprecated\..\..\..\src\regex & + -i=..\..\src\deprecated\..\..\..\src\expat\lib & + -i=..\..\src\deprecated\..\..\include -dWXUSINGDLL & + -dWXMAKINGDLL_DEPRECATED $(CFLAGS) +DEPRECATEDDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include & + -i=$(LIBDIRNAME) -i=..\..\src\deprecated\..\..\..\src\tiff & + -i=..\..\src\deprecated\..\..\..\src\jpeg & + -i=..\..\src\deprecated\..\..\..\src\png & + -i=..\..\src\deprecated\..\..\..\src\zlib & + -i=..\..\src\deprecated\..\..\..\src\regex & + -i=..\..\src\deprecated\..\..\..\src\expat\lib & + -i=..\..\src\deprecated\..\..\include -dWXUSINGDLL & + -dWXMAKINGDLL_DEPRECATED $(CXXFLAGS) /fh=$(OBJS)\wxprec_deprecateddll.pch +DEPRECATEDDLL_OBJECTS = & + $(OBJS)\deprecateddll_dummy.obj & + $(OBJS)\deprecateddll_prop.obj & + $(OBJS)\deprecateddll_propform.obj & + $(OBJS)\deprecateddll_proplist.obj & + $(OBJS)\deprecateddll_resource.obj & + $(OBJS)\deprecateddll_treelay.obj & + $(OBJS)\deprecateddll_wxexpr.obj & + $(OBJS)\deprecateddll_dosyacc.obj +DEPRECATEDLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include & + -i=$(LIBDIRNAME) -i=..\..\src\deprecated\..\..\..\src\tiff & + -i=..\..\src\deprecated\..\..\..\src\jpeg & + -i=..\..\src\deprecated\..\..\..\src\png & + -i=..\..\src\deprecated\..\..\..\src\zlib & + -i=..\..\src\deprecated\..\..\..\src\regex & + -i=..\..\src\deprecated\..\..\..\src\expat\lib & + -i=..\..\src\deprecated\..\..\include $(CFLAGS) +DEPRECATEDLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include & + -i=$(LIBDIRNAME) -i=..\..\src\deprecated\..\..\..\src\tiff & + -i=..\..\src\deprecated\..\..\..\src\jpeg & + -i=..\..\src\deprecated\..\..\..\src\png & + -i=..\..\src\deprecated\..\..\..\src\zlib & + -i=..\..\src\deprecated\..\..\..\src\regex & + -i=..\..\src\deprecated\..\..\..\src\expat\lib & + -i=..\..\src\deprecated\..\..\include $(CXXFLAGS) & + /fh=$(OBJS)\wxprec_deprecatedlib.pch +DEPRECATEDLIB_OBJECTS = & + $(OBJS)\deprecatedlib_dummy.obj & + $(OBJS)\deprecatedlib_prop.obj & + $(OBJS)\deprecatedlib_propform.obj & + $(OBJS)\deprecatedlib_proplist.obj & + $(OBJS)\deprecatedlib_resource.obj & + $(OBJS)\deprecatedlib_treelay.obj & + $(OBJS)\deprecatedlib_wxexpr.obj & + $(OBJS)\deprecatedlib_dosyacc.obj +LIBDIRNAME = & + ..\..\src\deprecated\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = & + wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(__deprecateddll___depname) $(__deprecatedlib___depname) + +$(OBJS)\deprecateddll_dosyacc.obj : .AUTODEPEND ../../src/deprecated\dosyacc.c + $(CC) -zq -fo=$^@ $(DEPRECATEDDLL_CFLAGS) $< + +$(OBJS)\deprecateddll_dummy.obj : .AUTODEPEND ../../src/deprecated\..\..\..\src\msw\dummy.cpp + $(CXX) -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $< + +$(OBJS)\deprecateddll_prop.obj : .AUTODEPEND ../../src/deprecated\prop.cpp + $(CXX) -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $< + +$(OBJS)\deprecateddll_propform.obj : .AUTODEPEND ../../src/deprecated\propform.cpp + $(CXX) -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $< + +$(OBJS)\deprecateddll_proplist.obj : .AUTODEPEND ../../src/deprecated\proplist.cpp + $(CXX) -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $< + +$(OBJS)\deprecateddll_resource.obj : .AUTODEPEND ../../src/deprecated\resource.cpp + $(CXX) -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $< + +$(OBJS)\deprecateddll_treelay.obj : .AUTODEPEND ../../src/deprecated\treelay.cpp + $(CXX) -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $< + +$(OBJS)\deprecateddll_wxexpr.obj : .AUTODEPEND ../../src/deprecated\wxexpr.cpp + $(CXX) -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $< + +$(OBJS)\deprecatedlib_dosyacc.obj : .AUTODEPEND ../../src/deprecated\dosyacc.c + $(CC) -zq -fo=$^@ $(DEPRECATEDLIB_CFLAGS) $< + +$(OBJS)\deprecatedlib_dummy.obj : .AUTODEPEND ../../src/deprecated\..\..\..\src\msw\dummy.cpp + $(CXX) -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $< + +$(OBJS)\deprecatedlib_prop.obj : .AUTODEPEND ../../src/deprecated\prop.cpp + $(CXX) -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $< + +$(OBJS)\deprecatedlib_propform.obj : .AUTODEPEND ../../src/deprecated\propform.cpp + $(CXX) -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $< + +$(OBJS)\deprecatedlib_proplist.obj : .AUTODEPEND ../../src/deprecated\proplist.cpp + $(CXX) -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $< + +$(OBJS)\deprecatedlib_resource.obj : .AUTODEPEND ../../src/deprecated\resource.cpp + $(CXX) -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $< + +$(OBJS)\deprecatedlib_treelay.obj : .AUTODEPEND ../../src/deprecated\treelay.cpp + $(CXX) -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $< + +$(OBJS)\deprecatedlib_wxexpr.obj : .AUTODEPEND ../../src/deprecated\wxexpr.cpp + $(CXX) -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib + +!ifeq SHARED 1 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_wat$(VENDORTAG).dll : $(DEPRECATEDDLL_OBJECTS) + @%create $(OBJS)\deprecateddll.lbc + @%append $(OBJS)\deprecateddll.lbc option quiet + @%append $(OBJS)\deprecateddll.lbc name $^@ + @%append $(OBJS)\deprecateddll.lbc option incremental + @%append $(OBJS)\deprecateddll.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) + @for %i in ($(DEPRECATEDDLL_OBJECTS)) do @%append $(OBJS)\deprecateddll.lbc file %i + @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\deprecateddll.lbc library %i + @%append $(OBJS)\deprecateddll.lbc + @%append $(OBJS)\deprecateddll.lbc system nt_dll + wlink @$(OBJS)\deprecateddll.lbc + wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib +$^@ +!endif + +!ifeq SHARED 0 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib : $(DEPRECATEDLIB_OBJECTS) + @%create $(OBJS)\deprecatedlib.lbc + @for %i in ($(DEPRECATEDLIB_OBJECTS)) do @%append $(OBJS)\deprecatedlib.lbc +%i + wlib -q -p2048 -n -b $^@ @$(OBJS)\deprecatedlib.lbc +!endif diff --git a/contrib/build/mmedia/makefile.bcc b/contrib/build/mmedia/makefile.bcc new file mode 100644 index 0000000000..c229cf402b --- /dev/null +++ b/contrib/build/mmedia/makefile.bcc @@ -0,0 +1,346 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +LIBDIRNAME = \ + ..\..\src\mmedia\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +MMEDIADLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\mmedia\..\..\..\include -I$(LIBDIRNAME) \ + -I..\..\src\mmedia\..\..\..\src\tiff -I..\..\src\mmedia\..\..\..\src\jpeg \ + -I..\..\src\mmedia\..\..\..\src\png -I..\..\src\mmedia\..\..\..\src\zlib \ + -I..\..\src\mmedia\..\..\..\src\regex \ + -I..\..\src\mmedia\..\..\..\src\expat\lib \ + -I..\..\src\mmedia\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_MMEDIA \ + $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_mmediadll.csm +MMEDIADLL_OBJECTS = \ + $(OBJS)\mmediadll_dummy.obj \ + $(OBJS)\mmediadll_cdwin.obj \ + $(OBJS)\mmediadll_sndwin.obj \ + $(OBJS)\mmediadll_vidwin.obj \ + $(OBJS)\mmediadll_cdbase.obj \ + $(OBJS)\mmediadll_g711.obj \ + $(OBJS)\mmediadll_g721.obj \ + $(OBJS)\mmediadll_g723_24.obj \ + $(OBJS)\mmediadll_g723_40.obj \ + $(OBJS)\mmediadll_g72x.obj \ + $(OBJS)\mmediadll_sndaiff.obj \ + $(OBJS)\mmediadll_sndbase.obj \ + $(OBJS)\mmediadll_sndcodec.obj \ + $(OBJS)\mmediadll_sndcpcm.obj \ + $(OBJS)\mmediadll_sndfile.obj \ + $(OBJS)\mmediadll_sndg72x.obj \ + $(OBJS)\mmediadll_sndmsad.obj \ + $(OBJS)\mmediadll_sndpcm.obj \ + $(OBJS)\mmediadll_sndulaw.obj \ + $(OBJS)\mmediadll_sndwav.obj \ + $(OBJS)\mmediadll_vidbase.obj +MMEDIALIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\mmedia\..\..\..\include -I$(LIBDIRNAME) \ + -I..\..\src\mmedia\..\..\..\src\tiff -I..\..\src\mmedia\..\..\..\src\jpeg \ + -I..\..\src\mmedia\..\..\..\src\png -I..\..\src\mmedia\..\..\..\src\zlib \ + -I..\..\src\mmedia\..\..\..\src\regex \ + -I..\..\src\mmedia\..\..\..\src\expat\lib \ + -I..\..\src\mmedia\..\..\include $(CXXFLAGS) -Hu \ + -H=$(OBJS)\wxprec_mmedialib.csm +MMEDIALIB_OBJECTS = \ + $(OBJS)\mmedialib_dummy.obj \ + $(OBJS)\mmedialib_cdwin.obj \ + $(OBJS)\mmedialib_sndwin.obj \ + $(OBJS)\mmedialib_vidwin.obj \ + $(OBJS)\mmedialib_cdbase.obj \ + $(OBJS)\mmedialib_g711.obj \ + $(OBJS)\mmedialib_g721.obj \ + $(OBJS)\mmedialib_g723_24.obj \ + $(OBJS)\mmedialib_g723_40.obj \ + $(OBJS)\mmedialib_g72x.obj \ + $(OBJS)\mmedialib_sndaiff.obj \ + $(OBJS)\mmedialib_sndbase.obj \ + $(OBJS)\mmedialib_sndcodec.obj \ + $(OBJS)\mmedialib_sndcpcm.obj \ + $(OBJS)\mmedialib_sndfile.obj \ + $(OBJS)\mmedialib_sndg72x.obj \ + $(OBJS)\mmedialib_sndmsad.obj \ + $(OBJS)\mmedialib_sndpcm.obj \ + $(OBJS)\mmedialib_sndulaw.obj \ + $(OBJS)\mmedialib_sndwav.obj \ + $(OBJS)\mmedialib_vidbase.obj +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(OFFICIAL_BUILD)" == "0" +VENDORTAG = _$(VENDOR) +!endif +!if "$(OFFICIAL_BUILD)" == "1" +VENDORTAG = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = -v +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(SHARED)" == "1" +__mmediadll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_bcc$(VENDORTAG).dll +!endif +!if "$(SHARED)" == "0" +__mmedialib___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__mmediadll___depname) $(__mmedialib___depname) + +$(OBJS)\mmediadll_cdbase.obj: ../../src/mmedia\cdbase.cpp + $(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_cdwin.obj: ../../src/mmedia\cdwin.cpp + $(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_dummy.obj: ../../src/mmedia\..\..\..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) -H $** + +$(OBJS)\mmediadll_g711.obj: ../../src/mmedia\g711.cpp + $(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_g721.obj: ../../src/mmedia\g721.cpp + $(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_g723_24.obj: ../../src/mmedia\g723_24.cpp + $(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_g723_40.obj: ../../src/mmedia\g723_40.cpp + $(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_g72x.obj: ../../src/mmedia\g72x.cpp + $(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_sndaiff.obj: ../../src/mmedia\sndaiff.cpp + $(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_sndbase.obj: ../../src/mmedia\sndbase.cpp + $(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_sndcodec.obj: ../../src/mmedia\sndcodec.cpp + $(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_sndcpcm.obj: ../../src/mmedia\sndcpcm.cpp + $(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_sndfile.obj: ../../src/mmedia\sndfile.cpp + $(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_sndg72x.obj: ../../src/mmedia\sndg72x.cpp + $(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_sndmsad.obj: ../../src/mmedia\sndmsad.cpp + $(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_sndpcm.obj: ../../src/mmedia\sndpcm.cpp + $(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_sndulaw.obj: ../../src/mmedia\sndulaw.cpp + $(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_sndwav.obj: ../../src/mmedia\sndwav.cpp + $(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_sndwin.obj: ../../src/mmedia\sndwin.cpp + $(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_vidbase.obj: ../../src/mmedia\vidbase.cpp + $(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_vidwin.obj: ../../src/mmedia\vidwin.cpp + $(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmedialib_cdbase.obj: ../../src/mmedia\cdbase.cpp + $(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_cdwin.obj: ../../src/mmedia\cdwin.cpp + $(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_dummy.obj: ../../src/mmedia\..\..\..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) -H $** + +$(OBJS)\mmedialib_g711.obj: ../../src/mmedia\g711.cpp + $(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_g721.obj: ../../src/mmedia\g721.cpp + $(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_g723_24.obj: ../../src/mmedia\g723_24.cpp + $(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_g723_40.obj: ../../src/mmedia\g723_40.cpp + $(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_g72x.obj: ../../src/mmedia\g72x.cpp + $(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_sndaiff.obj: ../../src/mmedia\sndaiff.cpp + $(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_sndbase.obj: ../../src/mmedia\sndbase.cpp + $(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_sndcodec.obj: ../../src/mmedia\sndcodec.cpp + $(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_sndcpcm.obj: ../../src/mmedia\sndcpcm.cpp + $(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_sndfile.obj: ../../src/mmedia\sndfile.cpp + $(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_sndg72x.obj: ../../src/mmedia\sndg72x.cpp + $(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_sndmsad.obj: ../../src/mmedia\sndmsad.cpp + $(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_sndpcm.obj: ../../src/mmedia\sndpcm.cpp + $(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_sndulaw.obj: ../../src/mmedia\sndulaw.cpp + $(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_sndwav.obj: ../../src/mmedia\sndwav.cpp + $(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_sndwin.obj: ../../src/mmedia\sndwin.cpp + $(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_vidbase.obj: ../../src/mmedia\vidbase.cpp + $(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_vidwin.obj: ../../src/mmedia\vidwin.cpp + $(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib + +!if "$(SHARED)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_bcc$(VENDORTAG).dll: $(MMEDIADLL_OBJECTS) $(OBJS)\mmediadll_dummy.obj + ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + c0d32.obj $(MMEDIADLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, +| + implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia $@ +!endif + +!if "$(SHARED)" == "0" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib: $(MMEDIALIB_OBJECTS) $(OBJS)\mmedialib_dummy.obj + if exist $@ del $@ + tlib /a /p2048 $@ @&&| + $(MMEDIALIB_OBJECTS) +| +!endif diff --git a/contrib/build/mmedia/makefile.gcc b/contrib/build/mmedia/makefile.gcc new file mode 100644 index 0000000000..9ce02bcd98 --- /dev/null +++ b/contrib/build/mmedia/makefile.gcc @@ -0,0 +1,333 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../../build/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +LIBDIRNAME = \ + ..\..\src\mmedia\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +MMEDIADLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\mmedia\..\..\..\include -I$(LIBDIRNAME) \ + -I..\..\src\mmedia\..\..\..\src\tiff -I..\..\src\mmedia\..\..\..\src\jpeg \ + -I..\..\src\mmedia\..\..\..\src\png -I..\..\src\mmedia\..\..\..\src\zlib \ + -I..\..\src\mmedia\..\..\..\src\regex \ + -I..\..\src\mmedia\..\..\..\src\expat\lib \ + -I..\..\src\mmedia\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_MMEDIA \ + $(CXXFLAGS) +MMEDIADLL_OBJECTS = \ + $(OBJS)\mmediadll_dummy.o \ + $(OBJS)\mmediadll_cdwin.o \ + $(OBJS)\mmediadll_sndwin.o \ + $(OBJS)\mmediadll_vidwin.o \ + $(OBJS)\mmediadll_cdbase.o \ + $(OBJS)\mmediadll_g711.o \ + $(OBJS)\mmediadll_g721.o \ + $(OBJS)\mmediadll_g723_24.o \ + $(OBJS)\mmediadll_g723_40.o \ + $(OBJS)\mmediadll_g72x.o \ + $(OBJS)\mmediadll_sndaiff.o \ + $(OBJS)\mmediadll_sndbase.o \ + $(OBJS)\mmediadll_sndcodec.o \ + $(OBJS)\mmediadll_sndcpcm.o \ + $(OBJS)\mmediadll_sndfile.o \ + $(OBJS)\mmediadll_sndg72x.o \ + $(OBJS)\mmediadll_sndmsad.o \ + $(OBJS)\mmediadll_sndpcm.o \ + $(OBJS)\mmediadll_sndulaw.o \ + $(OBJS)\mmediadll_sndwav.o \ + $(OBJS)\mmediadll_vidbase.o +MMEDIALIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\mmedia\..\..\..\include -I$(LIBDIRNAME) \ + -I..\..\src\mmedia\..\..\..\src\tiff -I..\..\src\mmedia\..\..\..\src\jpeg \ + -I..\..\src\mmedia\..\..\..\src\png -I..\..\src\mmedia\..\..\..\src\zlib \ + -I..\..\src\mmedia\..\..\..\src\regex \ + -I..\..\src\mmedia\..\..\..\src\expat\lib \ + -I..\..\src\mmedia\..\..\include $(CXXFLAGS) +MMEDIALIB_OBJECTS = \ + $(OBJS)\mmedialib_dummy.o \ + $(OBJS)\mmedialib_cdwin.o \ + $(OBJS)\mmedialib_sndwin.o \ + $(OBJS)\mmedialib_vidwin.o \ + $(OBJS)\mmedialib_cdbase.o \ + $(OBJS)\mmedialib_g711.o \ + $(OBJS)\mmedialib_g721.o \ + $(OBJS)\mmedialib_g723_24.o \ + $(OBJS)\mmedialib_g723_40.o \ + $(OBJS)\mmedialib_g72x.o \ + $(OBJS)\mmedialib_sndaiff.o \ + $(OBJS)\mmedialib_sndbase.o \ + $(OBJS)\mmedialib_sndcodec.o \ + $(OBJS)\mmedialib_sndcpcm.o \ + $(OBJS)\mmedialib_sndfile.o \ + $(OBJS)\mmedialib_sndg72x.o \ + $(OBJS)\mmedialib_sndmsad.o \ + $(OBJS)\mmedialib_sndpcm.o \ + $(OBJS)\mmedialib_sndulaw.o \ + $(OBJS)\mmedialib_sndwav.o \ + $(OBJS)\mmedialib_vidbase.o +OBJS = \ + gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(OFFICIAL_BUILD),0) +VENDORTAG = _$(VENDOR) +endif +ifeq ($(OFFICIAL_BUILD),1) +VENDORTAG = +endif +ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +WXDEBUGFLAG = d +endif +endif +ifeq ($(DEBUG_FLAG),1) +WXDEBUGFLAG = d +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(BUILD),debug) +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = -g +endif +endif +ifeq ($(BUILD),release) +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = +endif +endif +ifeq ($(DEBUG_INFO),0) +__DEBUGINFO = +endif +ifeq ($(DEBUG_INFO),1) +__DEBUGINFO = -g +endif +ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +endif +ifeq ($(DEBUG_FLAG),1) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +ifeq ($(USE_GUI),1) +__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) +endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG = -O2 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif +ifeq ($(SHARED),1) +__mmediadll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_gcc$(VENDORTAG).dll +endif +ifeq ($(SHARED),0) +__mmedialib___depname = \ + $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.a +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__mmediadll___depname) $(__mmedialib___depname) + +$(OBJS)\mmediadll_cdbase.o: ../../src/mmedia\cdbase.cpp + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_cdwin.o: ../../src/mmedia\cdwin.cpp + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_dummy.o: ../../src/mmedia\..\..\..\src\msw\dummy.cpp + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_g711.o: ../../src/mmedia\g711.cpp + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_g721.o: ../../src/mmedia\g721.cpp + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_g723_24.o: ../../src/mmedia\g723_24.cpp + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_g723_40.o: ../../src/mmedia\g723_40.cpp + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_g72x.o: ../../src/mmedia\g72x.cpp + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_sndaiff.o: ../../src/mmedia\sndaiff.cpp + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_sndbase.o: ../../src/mmedia\sndbase.cpp + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_sndcodec.o: ../../src/mmedia\sndcodec.cpp + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_sndcpcm.o: ../../src/mmedia\sndcpcm.cpp + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_sndfile.o: ../../src/mmedia\sndfile.cpp + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_sndg72x.o: ../../src/mmedia\sndg72x.cpp + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_sndmsad.o: ../../src/mmedia\sndmsad.cpp + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_sndpcm.o: ../../src/mmedia\sndpcm.cpp + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_sndulaw.o: ../../src/mmedia\sndulaw.cpp + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_sndwav.o: ../../src/mmedia\sndwav.cpp + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_sndwin.o: ../../src/mmedia\sndwin.cpp + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_vidbase.o: ../../src/mmedia\vidbase.cpp + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_vidwin.o: ../../src/mmedia\vidwin.cpp + $(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmedialib_cdbase.o: ../../src/mmedia\cdbase.cpp + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_cdwin.o: ../../src/mmedia\cdwin.cpp + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_dummy.o: ../../src/mmedia\..\..\..\src\msw\dummy.cpp + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_g711.o: ../../src/mmedia\g711.cpp + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_g721.o: ../../src/mmedia\g721.cpp + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_g723_24.o: ../../src/mmedia\g723_24.cpp + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_g723_40.o: ../../src/mmedia\g723_40.cpp + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_g72x.o: ../../src/mmedia\g72x.cpp + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_sndaiff.o: ../../src/mmedia\sndaiff.cpp + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_sndbase.o: ../../src/mmedia\sndbase.cpp + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_sndcodec.o: ../../src/mmedia\sndcodec.cpp + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_sndcpcm.o: ../../src/mmedia\sndcpcm.cpp + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_sndfile.o: ../../src/mmedia\sndfile.cpp + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_sndg72x.o: ../../src/mmedia\sndg72x.cpp + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_sndmsad.o: ../../src/mmedia\sndmsad.cpp + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_sndpcm.o: ../../src/mmedia\sndpcm.cpp + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_sndulaw.o: ../../src/mmedia\sndulaw.cpp + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_sndwav.o: ../../src/mmedia\sndwav.cpp + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_sndwin.o: ../../src/mmedia\sndwin.cpp + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_vidbase.o: ../../src/mmedia\vidbase.cpp + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_vidwin.o: ../../src/mmedia\vidwin.cpp + $(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.a + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.a + +ifeq ($(SHARED),1) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_gcc$(VENDORTAG).dll: $(MMEDIADLL_OBJECTS) + $(CXX) -shared -o $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) +endif + +ifeq ($(SHARED),0) +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.a: $(MMEDIALIB_OBJECTS) + if exist $@ del $@ + ar rcu $@ $(MMEDIALIB_OBJECTS) + ranlib $@ +endif + +.PHONY: all clean diff --git a/contrib/build/mmedia/makefile.vc b/contrib/build/mmedia/makefile.vc new file mode 100644 index 0000000000..2442ae33fb --- /dev/null +++ b/contrib/build/mmedia/makefile.vc @@ -0,0 +1,409 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +LIBDIRNAME = \ + ..\..\src\mmedia\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +MMEDIADLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) \ + /DWIN32 $(__DEBUGINFO_2) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_vc$(VENDORTAG).pdb \ + $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + /I..\..\src\mmedia\..\..\..\include /I$(LIBDIRNAME) \ + /I..\..\src\mmedia\..\..\..\src\tiff /I..\..\src\mmedia\..\..\..\src\jpeg \ + /I..\..\src\mmedia\..\..\..\src\png /I..\..\src\mmedia\..\..\..\src\zlib \ + /I..\..\src\mmedia\..\..\..\src\regex \ + /I..\..\src\mmedia\..\..\..\src\expat\lib \ + /I..\..\src\mmedia\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_MMEDIA \ + $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_mmediadll.pch" +MMEDIADLL_OBJECTS = \ + $(OBJS)\mmediadll_dummy.obj \ + $(OBJS)\mmediadll_cdwin.obj \ + $(OBJS)\mmediadll_sndwin.obj \ + $(OBJS)\mmediadll_vidwin.obj \ + $(OBJS)\mmediadll_cdbase.obj \ + $(OBJS)\mmediadll_g711.obj \ + $(OBJS)\mmediadll_g721.obj \ + $(OBJS)\mmediadll_g723_24.obj \ + $(OBJS)\mmediadll_g723_40.obj \ + $(OBJS)\mmediadll_g72x.obj \ + $(OBJS)\mmediadll_sndaiff.obj \ + $(OBJS)\mmediadll_sndbase.obj \ + $(OBJS)\mmediadll_sndcodec.obj \ + $(OBJS)\mmediadll_sndcpcm.obj \ + $(OBJS)\mmediadll_sndfile.obj \ + $(OBJS)\mmediadll_sndg72x.obj \ + $(OBJS)\mmediadll_sndmsad.obj \ + $(OBJS)\mmediadll_sndpcm.obj \ + $(OBJS)\mmediadll_sndulaw.obj \ + $(OBJS)\mmediadll_sndwav.obj \ + $(OBJS)\mmediadll_vidbase.obj +MMEDIALIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_12) \ + /DWIN32 $(__DEBUGINFO_2) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.pdb \ + $(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + /I..\..\src\mmedia\..\..\..\include /I$(LIBDIRNAME) \ + /I..\..\src\mmedia\..\..\..\src\tiff /I..\..\src\mmedia\..\..\..\src\jpeg \ + /I..\..\src\mmedia\..\..\..\src\png /I..\..\src\mmedia\..\..\..\src\zlib \ + /I..\..\src\mmedia\..\..\..\src\regex \ + /I..\..\src\mmedia\..\..\..\src\expat\lib \ + /I..\..\src\mmedia\..\..\include $(CXXFLAGS) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_mmedialib.pch" +MMEDIALIB_OBJECTS = \ + $(OBJS)\mmedialib_dummy.obj \ + $(OBJS)\mmedialib_cdwin.obj \ + $(OBJS)\mmedialib_sndwin.obj \ + $(OBJS)\mmedialib_vidwin.obj \ + $(OBJS)\mmedialib_cdbase.obj \ + $(OBJS)\mmedialib_g711.obj \ + $(OBJS)\mmedialib_g721.obj \ + $(OBJS)\mmedialib_g723_24.obj \ + $(OBJS)\mmedialib_g723_40.obj \ + $(OBJS)\mmedialib_g72x.obj \ + $(OBJS)\mmedialib_sndaiff.obj \ + $(OBJS)\mmedialib_sndbase.obj \ + $(OBJS)\mmedialib_sndcodec.obj \ + $(OBJS)\mmedialib_sndcpcm.obj \ + $(OBJS)\mmedialib_sndfile.obj \ + $(OBJS)\mmedialib_sndg72x.obj \ + $(OBJS)\mmedialib_sndmsad.obj \ + $(OBJS)\mmedialib_sndpcm.obj \ + $(OBJS)\mmedialib_sndulaw.obj \ + $(OBJS)\mmedialib_sndwav.obj \ + $(OBJS)\mmedialib_vidbase.obj +OBJS = \ + vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(OFFICIAL_BUILD)" == "0" +VENDORTAG = _$(VENDOR) +!endif +!if "$(OFFICIAL_BUILD)" == "1" +VENDORTAG = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = /Zi +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_12 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_12 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_12 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_3 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_3 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_3 = $(__DEBUGINFO) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS = T +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO = +!endif +!if "$(DEBUG_INFO)" == "0" +____DEBUGINFO = +!endif +!if "$(DEBUG_INFO)" == "1" +____DEBUGINFO = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_11_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_11_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_11_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_2_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_2_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p = $(____DEBUGINFO) +!endif +!if "$(SHARED)" == "1" +__mmediadll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_vc$(VENDORTAG).dll +!endif +!if "$(SHARED)" == "0" +__mmedialib___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__mmediadll___depname) $(__mmedialib___depname) + +$(OBJS)\mmediadll_cdbase.obj: ../../src/mmedia\cdbase.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_cdwin.obj: ../../src/mmedia\cdwin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_dummy.obj: ../../src/mmedia\..\..\..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\mmediadll_g711.obj: ../../src/mmedia\g711.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_g721.obj: ../../src/mmedia\g721.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_g723_24.obj: ../../src/mmedia\g723_24.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_g723_40.obj: ../../src/mmedia\g723_40.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_g72x.obj: ../../src/mmedia\g72x.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_sndaiff.obj: ../../src/mmedia\sndaiff.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_sndbase.obj: ../../src/mmedia\sndbase.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_sndcodec.obj: ../../src/mmedia\sndcodec.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_sndcpcm.obj: ../../src/mmedia\sndcpcm.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_sndfile.obj: ../../src/mmedia\sndfile.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_sndg72x.obj: ../../src/mmedia\sndg72x.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_sndmsad.obj: ../../src/mmedia\sndmsad.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_sndpcm.obj: ../../src/mmedia\sndpcm.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_sndulaw.obj: ../../src/mmedia\sndulaw.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_sndwav.obj: ../../src/mmedia\sndwav.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_sndwin.obj: ../../src/mmedia\sndwin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_vidbase.obj: ../../src/mmedia\vidbase.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmediadll_vidwin.obj: ../../src/mmedia\vidwin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $** + +$(OBJS)\mmedialib_cdbase.obj: ../../src/mmedia\cdbase.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_cdwin.obj: ../../src/mmedia\cdwin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_dummy.obj: ../../src/mmedia\..\..\..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\mmedialib_g711.obj: ../../src/mmedia\g711.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_g721.obj: ../../src/mmedia\g721.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_g723_24.obj: ../../src/mmedia\g723_24.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_g723_40.obj: ../../src/mmedia\g723_40.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_g72x.obj: ../../src/mmedia\g72x.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_sndaiff.obj: ../../src/mmedia\sndaiff.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_sndbase.obj: ../../src/mmedia\sndbase.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_sndcodec.obj: ../../src/mmedia\sndcodec.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_sndcpcm.obj: ../../src/mmedia\sndcpcm.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_sndfile.obj: ../../src/mmedia\sndfile.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_sndg72x.obj: ../../src/mmedia\sndg72x.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_sndmsad.obj: ../../src/mmedia\sndmsad.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_sndpcm.obj: ../../src/mmedia\sndpcm.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_sndulaw.obj: ../../src/mmedia\sndulaw.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_sndwav.obj: ../../src/mmedia\sndwav.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_sndwin.obj: ../../src/mmedia\sndwin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_vidbase.obj: ../../src/mmedia\vidbase.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $** + +$(OBJS)\mmedialib_vidwin.obj: ../../src/mmedia\vidwin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib + +!if "$(SHARED)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_vc$(VENDORTAG).dll: $(MMEDIADLL_OBJECTS) $(OBJS)\mmediadll_dummy.obj + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) @<< + $(MMEDIADLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib +<< +!endif + +!if "$(SHARED)" == "0" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib: $(MMEDIALIB_OBJECTS) $(OBJS)\mmedialib_dummy.obj + if exist $@ del $@ + lib /NOLOGO /OUT:$@ @<< + $(MMEDIALIB_OBJECTS) +<< +!endif diff --git a/contrib/build/mmedia/makefile.wat b/contrib/build/mmedia/makefile.wat new file mode 100644 index 0000000000..6420f1b21a --- /dev/null +++ b/contrib/build/mmedia/makefile.wat @@ -0,0 +1,405 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +VENDORTAG = +!ifeq OFFICIAL_BUILD 0 +VENDORTAG = _$(VENDOR) +!endif +!ifeq OFFICIAL_BUILD 1 +VENDORTAG = +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +!ifeq DEBUG_FLAG default +WXDEBUGFLAG = d +!endif +!endif +!ifeq DEBUG_FLAG 1 +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGINFO = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__OPTIMIZEFLAG = +!ifeq BUILD debug +__OPTIMIZEFLAG = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG = -ot -ox +!endif +__RUNTIME_LIBS = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__mmediadll___depname = +!ifeq SHARED 1 +__mmediadll___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_wat$(VENDORTAG).dll +!endif +__mmedialib___depname = +!ifeq SHARED 0 +__mmedialib___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib +!endif + +### Variables: ### + +LIBDIRNAME = & + ..\..\src\mmedia\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +MMEDIADLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=..\..\src\mmedia\..\..\..\include & + -i=$(LIBDIRNAME) -i=..\..\src\mmedia\..\..\..\src\tiff & + -i=..\..\src\mmedia\..\..\..\src\jpeg & + -i=..\..\src\mmedia\..\..\..\src\png & + -i=..\..\src\mmedia\..\..\..\src\zlib & + -i=..\..\src\mmedia\..\..\..\src\regex & + -i=..\..\src\mmedia\..\..\..\src\expat\lib & + -i=..\..\src\mmedia\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_MMEDIA & + $(CXXFLAGS) /fh=$(OBJS)\wxprec_mmediadll.pch +MMEDIADLL_OBJECTS = & + $(OBJS)\mmediadll_dummy.obj & + $(OBJS)\mmediadll_cdwin.obj & + $(OBJS)\mmediadll_sndwin.obj & + $(OBJS)\mmediadll_vidwin.obj & + $(OBJS)\mmediadll_cdbase.obj & + $(OBJS)\mmediadll_g711.obj & + $(OBJS)\mmediadll_g721.obj & + $(OBJS)\mmediadll_g723_24.obj & + $(OBJS)\mmediadll_g723_40.obj & + $(OBJS)\mmediadll_g72x.obj & + $(OBJS)\mmediadll_sndaiff.obj & + $(OBJS)\mmediadll_sndbase.obj & + $(OBJS)\mmediadll_sndcodec.obj & + $(OBJS)\mmediadll_sndcpcm.obj & + $(OBJS)\mmediadll_sndfile.obj & + $(OBJS)\mmediadll_sndg72x.obj & + $(OBJS)\mmediadll_sndmsad.obj & + $(OBJS)\mmediadll_sndpcm.obj & + $(OBJS)\mmediadll_sndulaw.obj & + $(OBJS)\mmediadll_sndwav.obj & + $(OBJS)\mmediadll_vidbase.obj +MMEDIALIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=..\..\src\mmedia\..\..\..\include & + -i=$(LIBDIRNAME) -i=..\..\src\mmedia\..\..\..\src\tiff & + -i=..\..\src\mmedia\..\..\..\src\jpeg & + -i=..\..\src\mmedia\..\..\..\src\png & + -i=..\..\src\mmedia\..\..\..\src\zlib & + -i=..\..\src\mmedia\..\..\..\src\regex & + -i=..\..\src\mmedia\..\..\..\src\expat\lib & + -i=..\..\src\mmedia\..\..\include $(CXXFLAGS) & + /fh=$(OBJS)\wxprec_mmedialib.pch +MMEDIALIB_OBJECTS = & + $(OBJS)\mmedialib_dummy.obj & + $(OBJS)\mmedialib_cdwin.obj & + $(OBJS)\mmedialib_sndwin.obj & + $(OBJS)\mmedialib_vidwin.obj & + $(OBJS)\mmedialib_cdbase.obj & + $(OBJS)\mmedialib_g711.obj & + $(OBJS)\mmedialib_g721.obj & + $(OBJS)\mmedialib_g723_24.obj & + $(OBJS)\mmedialib_g723_40.obj & + $(OBJS)\mmedialib_g72x.obj & + $(OBJS)\mmedialib_sndaiff.obj & + $(OBJS)\mmedialib_sndbase.obj & + $(OBJS)\mmedialib_sndcodec.obj & + $(OBJS)\mmedialib_sndcpcm.obj & + $(OBJS)\mmedialib_sndfile.obj & + $(OBJS)\mmedialib_sndg72x.obj & + $(OBJS)\mmedialib_sndmsad.obj & + $(OBJS)\mmedialib_sndpcm.obj & + $(OBJS)\mmedialib_sndulaw.obj & + $(OBJS)\mmedialib_sndwav.obj & + $(OBJS)\mmedialib_vidbase.obj +OBJS = & + wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(__mmediadll___depname) $(__mmedialib___depname) + +$(OBJS)\mmediadll_cdbase.obj : .AUTODEPEND ../../src/mmedia\cdbase.cpp + $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_cdwin.obj : .AUTODEPEND ../../src/mmedia\cdwin.cpp + $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_dummy.obj : .AUTODEPEND ../../src/mmedia\..\..\..\src\msw\dummy.cpp + $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_g711.obj : .AUTODEPEND ../../src/mmedia\g711.cpp + $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_g721.obj : .AUTODEPEND ../../src/mmedia\g721.cpp + $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_g723_24.obj : .AUTODEPEND ../../src/mmedia\g723_24.cpp + $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_g723_40.obj : .AUTODEPEND ../../src/mmedia\g723_40.cpp + $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_g72x.obj : .AUTODEPEND ../../src/mmedia\g72x.cpp + $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_sndaiff.obj : .AUTODEPEND ../../src/mmedia\sndaiff.cpp + $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_sndbase.obj : .AUTODEPEND ../../src/mmedia\sndbase.cpp + $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_sndcodec.obj : .AUTODEPEND ../../src/mmedia\sndcodec.cpp + $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_sndcpcm.obj : .AUTODEPEND ../../src/mmedia\sndcpcm.cpp + $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_sndfile.obj : .AUTODEPEND ../../src/mmedia\sndfile.cpp + $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_sndg72x.obj : .AUTODEPEND ../../src/mmedia\sndg72x.cpp + $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_sndmsad.obj : .AUTODEPEND ../../src/mmedia\sndmsad.cpp + $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_sndpcm.obj : .AUTODEPEND ../../src/mmedia\sndpcm.cpp + $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_sndulaw.obj : .AUTODEPEND ../../src/mmedia\sndulaw.cpp + $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_sndwav.obj : .AUTODEPEND ../../src/mmedia\sndwav.cpp + $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_sndwin.obj : .AUTODEPEND ../../src/mmedia\sndwin.cpp + $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_vidbase.obj : .AUTODEPEND ../../src/mmedia\vidbase.cpp + $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmediadll_vidwin.obj : .AUTODEPEND ../../src/mmedia\vidwin.cpp + $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $< + +$(OBJS)\mmedialib_cdbase.obj : .AUTODEPEND ../../src/mmedia\cdbase.cpp + $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_cdwin.obj : .AUTODEPEND ../../src/mmedia\cdwin.cpp + $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_dummy.obj : .AUTODEPEND ../../src/mmedia\..\..\..\src\msw\dummy.cpp + $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_g711.obj : .AUTODEPEND ../../src/mmedia\g711.cpp + $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_g721.obj : .AUTODEPEND ../../src/mmedia\g721.cpp + $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_g723_24.obj : .AUTODEPEND ../../src/mmedia\g723_24.cpp + $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_g723_40.obj : .AUTODEPEND ../../src/mmedia\g723_40.cpp + $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_g72x.obj : .AUTODEPEND ../../src/mmedia\g72x.cpp + $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_sndaiff.obj : .AUTODEPEND ../../src/mmedia\sndaiff.cpp + $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_sndbase.obj : .AUTODEPEND ../../src/mmedia\sndbase.cpp + $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_sndcodec.obj : .AUTODEPEND ../../src/mmedia\sndcodec.cpp + $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_sndcpcm.obj : .AUTODEPEND ../../src/mmedia\sndcpcm.cpp + $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_sndfile.obj : .AUTODEPEND ../../src/mmedia\sndfile.cpp + $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_sndg72x.obj : .AUTODEPEND ../../src/mmedia\sndg72x.cpp + $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_sndmsad.obj : .AUTODEPEND ../../src/mmedia\sndmsad.cpp + $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_sndpcm.obj : .AUTODEPEND ../../src/mmedia\sndpcm.cpp + $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_sndulaw.obj : .AUTODEPEND ../../src/mmedia\sndulaw.cpp + $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_sndwav.obj : .AUTODEPEND ../../src/mmedia\sndwav.cpp + $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_sndwin.obj : .AUTODEPEND ../../src/mmedia\sndwin.cpp + $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_vidbase.obj : .AUTODEPEND ../../src/mmedia\vidbase.cpp + $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + +$(OBJS)\mmedialib_vidwin.obj : .AUTODEPEND ../../src/mmedia\vidwin.cpp + $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib + +!ifeq SHARED 1 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_wat$(VENDORTAG).dll : $(MMEDIADLL_OBJECTS) + @%create $(OBJS)\mmediadll.lbc + @%append $(OBJS)\mmediadll.lbc option quiet + @%append $(OBJS)\mmediadll.lbc name $^@ + @%append $(OBJS)\mmediadll.lbc option incremental + @%append $(OBJS)\mmediadll.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) + @for %i in ($(MMEDIADLL_OBJECTS)) do @%append $(OBJS)\mmediadll.lbc file %i + @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\mmediadll.lbc library %i + @%append $(OBJS)\mmediadll.lbc + @%append $(OBJS)\mmediadll.lbc system nt_dll + wlink @$(OBJS)\mmediadll.lbc + wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib +$^@ +!endif + +!ifeq SHARED 0 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib : $(MMEDIALIB_OBJECTS) + @%create $(OBJS)\mmedialib.lbc + @for %i in ($(MMEDIALIB_OBJECTS)) do @%append $(OBJS)\mmedialib.lbc +%i + wlib -q -p2048 -n -b $^@ @$(OBJS)\mmedialib.lbc +!endif diff --git a/contrib/build/mmedia/mmedia.bkl b/contrib/build/mmedia/mmedia.bkl new file mode 100644 index 0000000000..67e5fb13a3 --- /dev/null +++ b/contrib/build/mmedia/mmedia.bkl @@ -0,0 +1,89 @@ + + + + + + + + + + + + cdunix.cpp + sndesd.cpp + sndoss.cpp + vidxanm.cpp + + + + cdwin.cpp + sndwin.cpp + vidwin.cpp + + + + $(MMEDIA_UNIX_SRC) + $(MMEDIA_WIN32_SRC) + + + + $(MMEDIA_PLATFORM_SRC) + cdbase.cpp + g711.cpp + g721.cpp + g723_24.cpp + g723_40.cpp + g72x.cpp + sndaiff.cpp + sndbase.cpp + sndcodec.cpp + sndcpcm.cpp + sndfile.cpp + sndg72x.cpp + sndmsad.cpp + sndpcm.cpp + sndulaw.cpp + sndwav.cpp + vidbase.cpp + + + + + wx/mmedia/cdbase.h + wx/mmedia/cdunix.h + wx/mmedia/cdwin.h + wx/mmedia/sndaiff.h + wx/mmedia/sndbase.h + wx/mmedia/sndcodec.h + wx/mmedia/sndcpcm.h + wx/mmedia/sndesd.h + wx/mmedia/sndfile.h + wx/mmedia/sndg72x.h + wx/mmedia/sndmsad.h + wx/mmedia/sndoss.h + wx/mmedia/sndpcm.h + wx/mmedia/sndulaw.h + wx/mmedia/sndwav.h + wx/mmedia/sndwin.h + wx/mmedia/vidbase.h + wx/mmedia/vidwin.h + wx/mmedia/vidxanm.h + + + + + WXUSINGDLL + WXMAKINGDLL_MMEDIA + $(MMEDIA_SRC) + core + base + $(EXTRALIBS_ESD) + + + + $(MMEDIA_SRC) + + + + diff --git a/contrib/build/mmedia/mmedia.dsw b/contrib/build/mmedia/mmedia.dsw new file mode 100644 index 0000000000..317fe45dbc --- /dev/null +++ b/contrib/build/mmedia/mmedia.dsw @@ -0,0 +1,28 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### +Project: "mmediadll"=mmedia_mmediadll.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "mmedialib"=mmedia_mmedialib.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + diff --git a/contrib/build/mmedia/mmedia_mmediadll.dsp b/contrib/build/mmedia/mmedia_mmediadll.dsp new file mode 100644 index 0000000000..b8896151aa --- /dev/null +++ b/contrib/build/mmedia/mmedia_mmediadll.dsp @@ -0,0 +1,342 @@ +# Microsoft Developer Studio Project File - Name="mmediadll" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=mmediadll - Win32 DLL Native Debug Unicode +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "mmedia_mmediadll.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "mmedia_mmediadll.mak" CFG="mmediadll - Win32 DLL Native Debug Unicode" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "mmediadll - Win32 DLL Native Debug Unicode" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mmediadll - Win32 DLL Native Release Ansi" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mmediadll - Win32 DLL wxUniv Debug Unicode" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mmediadll - Win32 DLL wxUniv Release Unicode" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mmediadll - Win32 DLL Native Debug Ansi" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mmediadll - Win32 DLL wxUniv Release Ansi" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mmediadll - Win32 DLL wxUniv Debug Ansi" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mmediadll - Win32 DLL Native Release Unicode" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "mmediadll - Win32 DLL Native Debug Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswuddll" +# PROP BASE Intermediate_Dir "vc_mswuddll\mmediadll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswuddll" +# PROP Intermediate_Dir "vc_mswuddll\mmediadll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswuddll" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_mmediadll.pch" /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_mswuddll\wxmsw250ud_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswuddll" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_mmediadll.pch" /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_mswuddll\wxmsw250ud_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\mmedia\..\..\..\include" /i "..\..\src\mmedia\..\..\..\lib\vc_mswuddll" /i "..\..\src\mmedia\..\..\..\src\tiff" /i "..\..\src\mmedia\..\..\..\src\jpeg" /i "..\..\src\mmedia\..\..\..\src\png" /i "..\..\src\mmedia\..\..\..\src\zlib" /i "..\..\src\mmedia\..\..\..\src\regex" /i "..\..\src\mmedia\..\..\..\src\expat\lib" /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\mmedia\..\..\..\include" /i "..\..\src\mmedia\..\..\..\lib\vc_mswuddll" /i "..\..\src\mmedia\..\..\..\src\tiff" /i "..\..\src\mmedia\..\..\..\src\jpeg" /i "..\..\src\mmedia\..\..\..\src\png" /i "..\..\src\mmedia\..\..\..\src\zlib" /i "..\..\src\mmedia\..\..\..\src\regex" /i "..\..\src\mmedia\..\..\..\src\expat\lib" /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_mswuddll\wxmsw250ud_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_mswuddll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_mswuddll\wxmsw25ud_mmedia.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_mswuddll\wxmsw250ud_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_mswuddll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_mswuddll\wxmsw25ud_mmedia.lib" /debug + +!ELSEIF "$(CFG)" == "mmediadll - Win32 DLL Native Release Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswdll" +# PROP BASE Intermediate_Dir "vc_mswdll\mmediadll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswdll" +# PROP Intermediate_Dir "vc_mswdll\mmediadll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswdll" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_mmediadll.pch" /Fd..\..\src\mmedia\..\..\..\lib\vc_mswdll\wxmsw250_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswdll" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_mmediadll.pch" /Fd..\..\src\mmedia\..\..\..\lib\vc_mswdll\wxmsw250_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\mmedia\..\..\..\include" /i "..\..\src\mmedia\..\..\..\lib\vc_mswdll" /i "..\..\src\mmedia\..\..\..\src\tiff" /i "..\..\src\mmedia\..\..\..\src\jpeg" /i "..\..\src\mmedia\..\..\..\src\png" /i "..\..\src\mmedia\..\..\..\src\zlib" /i "..\..\src\mmedia\..\..\..\src\regex" /i "..\..\src\mmedia\..\..\..\src\expat\lib" /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA +# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\mmedia\..\..\..\include" /i "..\..\src\mmedia\..\..\..\lib\vc_mswdll" /i "..\..\src\mmedia\..\..\..\src\tiff" /i "..\..\src\mmedia\..\..\..\src\jpeg" /i "..\..\src\mmedia\..\..\..\src\png" /i "..\..\src\mmedia\..\..\..\src\zlib" /i "..\..\src\mmedia\..\..\..\src\regex" /i "..\..\src\mmedia\..\..\..\src\expat\lib" /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_mswdll\wxmsw250_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_mswdll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_mswdll\wxmsw25_mmedia.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_mswdll\wxmsw250_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_mswdll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_mswdll\wxmsw25_mmedia.lib" + +!ELSEIF "$(CFG)" == "mmediadll - Win32 DLL wxUniv Debug Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswunivuddll" +# PROP BASE Intermediate_Dir "vc_mswunivuddll\mmediadll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswunivuddll" +# PROP Intermediate_Dir "vc_mswunivuddll\mmediadll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswunivuddll" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_mmediadll.pch" /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswunivuddll" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_mmediadll.pch" /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\mmedia\..\..\..\include" /i "..\..\src\mmedia\..\..\..\lib\vc_mswunivuddll" /i "..\..\src\mmedia\..\..\..\src\tiff" /i "..\..\src\mmedia\..\..\..\src\jpeg" /i "..\..\src\mmedia\..\..\..\src\png" /i "..\..\src\mmedia\..\..\..\src\zlib" /i "..\..\src\mmedia\..\..\..\src\regex" /i "..\..\src\mmedia\..\..\..\src\expat\lib" /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\mmedia\..\..\..\include" /i "..\..\src\mmedia\..\..\..\lib\vc_mswunivuddll" /i "..\..\src\mmedia\..\..\..\src\tiff" /i "..\..\src\mmedia\..\..\..\src\jpeg" /i "..\..\src\mmedia\..\..\..\src\png" /i "..\..\src\mmedia\..\..\..\src\zlib" /i "..\..\src\mmedia\..\..\..\src\regex" /i "..\..\src\mmedia\..\..\..\src\expat\lib" /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_mswunivuddll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_mswunivuddll\wxmswuniv25ud_mmedia.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_mswunivuddll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_mswunivuddll\wxmswuniv25ud_mmedia.lib" /debug + +!ELSEIF "$(CFG)" == "mmediadll - Win32 DLL wxUniv Release Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswunivudll" +# PROP BASE Intermediate_Dir "vc_mswunivudll\mmediadll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswunivudll" +# PROP Intermediate_Dir "vc_mswunivudll\mmediadll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswunivudll" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_mmediadll.pch" /Fd..\..\src\mmedia\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswunivudll" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_mmediadll.pch" /Fd..\..\src\mmedia\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\mmedia\..\..\..\include" /i "..\..\src\mmedia\..\..\..\lib\vc_mswunivudll" /i "..\..\src\mmedia\..\..\..\src\tiff" /i "..\..\src\mmedia\..\..\..\src\jpeg" /i "..\..\src\mmedia\..\..\..\src\png" /i "..\..\src\mmedia\..\..\..\src\zlib" /i "..\..\src\mmedia\..\..\..\src\regex" /i "..\..\src\mmedia\..\..\..\src\expat\lib" /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA +# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\mmedia\..\..\..\include" /i "..\..\src\mmedia\..\..\..\lib\vc_mswunivudll" /i "..\..\src\mmedia\..\..\..\src\tiff" /i "..\..\src\mmedia\..\..\..\src\jpeg" /i "..\..\src\mmedia\..\..\..\src\png" /i "..\..\src\mmedia\..\..\..\src\zlib" /i "..\..\src\mmedia\..\..\..\src\regex" /i "..\..\src\mmedia\..\..\..\src\expat\lib" /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_mswunivudll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_mswunivudll\wxmswuniv25u_mmedia.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_mswunivudll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_mswunivudll\wxmswuniv25u_mmedia.lib" + +!ELSEIF "$(CFG)" == "mmediadll - Win32 DLL Native Debug Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswddll" +# PROP BASE Intermediate_Dir "vc_mswddll\mmediadll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswddll" +# PROP Intermediate_Dir "vc_mswddll\mmediadll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswddll" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_mmediadll.pch" /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_mswddll\wxmsw250d_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswddll" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_mmediadll.pch" /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_mswddll\wxmsw250d_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\mmedia\..\..\..\include" /i "..\..\src\mmedia\..\..\..\lib\vc_mswddll" /i "..\..\src\mmedia\..\..\..\src\tiff" /i "..\..\src\mmedia\..\..\..\src\jpeg" /i "..\..\src\mmedia\..\..\..\src\png" /i "..\..\src\mmedia\..\..\..\src\zlib" /i "..\..\src\mmedia\..\..\..\src\regex" /i "..\..\src\mmedia\..\..\..\src\expat\lib" /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\mmedia\..\..\..\include" /i "..\..\src\mmedia\..\..\..\lib\vc_mswddll" /i "..\..\src\mmedia\..\..\..\src\tiff" /i "..\..\src\mmedia\..\..\..\src\jpeg" /i "..\..\src\mmedia\..\..\..\src\png" /i "..\..\src\mmedia\..\..\..\src\zlib" /i "..\..\src\mmedia\..\..\..\src\regex" /i "..\..\src\mmedia\..\..\..\src\expat\lib" /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_mswddll\wxmsw250d_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_mswddll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_mswddll\wxmsw25d_mmedia.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_mswddll\wxmsw250d_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_mswddll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_mswddll\wxmsw25d_mmedia.lib" /debug + +!ELSEIF "$(CFG)" == "mmediadll - Win32 DLL wxUniv Release Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswunivdll" +# PROP BASE Intermediate_Dir "vc_mswunivdll\mmediadll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswunivdll" +# PROP Intermediate_Dir "vc_mswunivdll\mmediadll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswunivdll" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_mmediadll.pch" /Fd..\..\src\mmedia\..\..\..\lib\vc_mswunivdll\wxmswuniv250_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswunivdll" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_mmediadll.pch" /Fd..\..\src\mmedia\..\..\..\lib\vc_mswunivdll\wxmswuniv250_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\mmedia\..\..\..\include" /i "..\..\src\mmedia\..\..\..\lib\vc_mswunivdll" /i "..\..\src\mmedia\..\..\..\src\tiff" /i "..\..\src\mmedia\..\..\..\src\jpeg" /i "..\..\src\mmedia\..\..\..\src\png" /i "..\..\src\mmedia\..\..\..\src\zlib" /i "..\..\src\mmedia\..\..\..\src\regex" /i "..\..\src\mmedia\..\..\..\src\expat\lib" /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA +# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\mmedia\..\..\..\include" /i "..\..\src\mmedia\..\..\..\lib\vc_mswunivdll" /i "..\..\src\mmedia\..\..\..\src\tiff" /i "..\..\src\mmedia\..\..\..\src\jpeg" /i "..\..\src\mmedia\..\..\..\src\png" /i "..\..\src\mmedia\..\..\..\src\zlib" /i "..\..\src\mmedia\..\..\..\src\regex" /i "..\..\src\mmedia\..\..\..\src\expat\lib" /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_mswunivdll\wxmswuniv250_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_mswunivdll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_mswunivdll\wxmswuniv25_mmedia.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_mswunivdll\wxmswuniv250_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_mswunivdll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_mswunivdll\wxmswuniv25_mmedia.lib" + +!ELSEIF "$(CFG)" == "mmediadll - Win32 DLL wxUniv Debug Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswunivddll" +# PROP BASE Intermediate_Dir "vc_mswunivddll\mmediadll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswunivddll" +# PROP Intermediate_Dir "vc_mswunivddll\mmediadll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswunivddll" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_mmediadll.pch" /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswunivddll" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_mmediadll.pch" /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\mmedia\..\..\..\include" /i "..\..\src\mmedia\..\..\..\lib\vc_mswunivddll" /i "..\..\src\mmedia\..\..\..\src\tiff" /i "..\..\src\mmedia\..\..\..\src\jpeg" /i "..\..\src\mmedia\..\..\..\src\png" /i "..\..\src\mmedia\..\..\..\src\zlib" /i "..\..\src\mmedia\..\..\..\src\regex" /i "..\..\src\mmedia\..\..\..\src\expat\lib" /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\mmedia\..\..\..\include" /i "..\..\src\mmedia\..\..\..\lib\vc_mswunivddll" /i "..\..\src\mmedia\..\..\..\src\tiff" /i "..\..\src\mmedia\..\..\..\src\jpeg" /i "..\..\src\mmedia\..\..\..\src\png" /i "..\..\src\mmedia\..\..\..\src\zlib" /i "..\..\src\mmedia\..\..\..\src\regex" /i "..\..\src\mmedia\..\..\..\src\expat\lib" /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_mswunivddll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_mswunivddll\wxmswuniv25d_mmedia.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_mswunivddll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_mswunivddll\wxmswuniv25d_mmedia.lib" /debug + +!ELSEIF "$(CFG)" == "mmediadll - Win32 DLL Native Release Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswudll" +# PROP BASE Intermediate_Dir "vc_mswudll\mmediadll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswudll" +# PROP Intermediate_Dir "vc_mswudll\mmediadll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswudll" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_mmediadll.pch" /Fd..\..\src\mmedia\..\..\..\lib\vc_mswudll\wxmsw250u_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswudll" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_mmediadll.pch" /Fd..\..\src\mmedia\..\..\..\lib\vc_mswudll\wxmsw250u_mmedia_vc_custom.pdb /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_MMEDIA" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\mmedia\..\..\..\include" /i "..\..\src\mmedia\..\..\..\lib\vc_mswudll" /i "..\..\src\mmedia\..\..\..\src\tiff" /i "..\..\src\mmedia\..\..\..\src\jpeg" /i "..\..\src\mmedia\..\..\..\src\png" /i "..\..\src\mmedia\..\..\..\src\zlib" /i "..\..\src\mmedia\..\..\..\src\regex" /i "..\..\src\mmedia\..\..\..\src\expat\lib" /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA +# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\mmedia\..\..\..\include" /i "..\..\src\mmedia\..\..\..\lib\vc_mswudll" /i "..\..\src\mmedia\..\..\..\src\tiff" /i "..\..\src\mmedia\..\..\..\src\jpeg" /i "..\..\src\mmedia\..\..\..\src\png" /i "..\..\src\mmedia\..\..\..\src\zlib" /i "..\..\src\mmedia\..\..\..\src\regex" /i "..\..\src\mmedia\..\..\..\src\expat\lib" /i "..\..\src\mmedia\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_MMEDIA +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_mswudll\wxmsw250u_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_mswudll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_mswudll\wxmsw25u_mmedia.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\mmedia\..\..\..\lib\vc_mswudll\wxmsw250u_mmedia_vc_custom.dll" /libpath:"..\..\src\mmedia\..\..\..\lib\vc_mswudll" /implib:"..\..\src\mmedia\..\..\..\lib\vc_mswudll\wxmsw25u_mmedia.lib" + +!ENDIF + +# Begin Target + +# Name "mmediadll - Win32 DLL Native Debug Unicode" +# Name "mmediadll - Win32 DLL Native Release Ansi" +# Name "mmediadll - Win32 DLL wxUniv Debug Unicode" +# Name "mmediadll - Win32 DLL wxUniv Release Unicode" +# Name "mmediadll - Win32 DLL Native Debug Ansi" +# Name "mmediadll - Win32 DLL wxUniv Release Ansi" +# Name "mmediadll - Win32 DLL wxUniv Debug Ansi" +# Name "mmediadll - Win32 DLL Native Release Unicode" +# Begin Group "Source Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=../../src/mmedia\..\..\..\src\msw\dummy.cpp +# ADD BASE CPP /Yc"wx/wxprec.h" +# ADD CPP /Yc"wx/wxprec.h" +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\cdbase.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\cdwin.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\g711.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\g721.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\g723_24.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\g723_40.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\g72x.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\sndaiff.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\sndbase.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\sndcodec.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\sndcpcm.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\sndfile.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\sndg72x.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\sndmsad.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\sndpcm.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\sndulaw.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\sndwav.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\sndwin.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\vidbase.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\vidwin.cpp +# End Source File +# End Group +# End Target +# End Project + diff --git a/contrib/build/mmedia/mmedia_mmedialib.dsp b/contrib/build/mmedia/mmedia_mmedialib.dsp new file mode 100644 index 0000000000..1c0e4e142e --- /dev/null +++ b/contrib/build/mmedia/mmedia_mmedialib.dsp @@ -0,0 +1,325 @@ +# Microsoft Developer Studio Project File - Name="mmedialib" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=mmedialib - Win32 LIB wxUniv Release Ansi +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "mmedia_mmedialib.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "mmedia_mmedialib.mak" CFG="mmedialib - Win32 LIB wxUniv Release Ansi" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "mmedialib - Win32 LIB wxUniv Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "mmedialib - Win32 LIB Native Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "mmedialib - Win32 LIB wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "mmedialib - Win32 LIB Native Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "mmedialib - Win32 LIB Native Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "mmedialib - Win32 LIB wxUniv Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "mmedialib - Win32 LIB wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "mmedialib - Win32 LIB Native Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "mmedialib - Win32 LIB wxUniv Release Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswuniv" +# PROP BASE Intermediate_Dir "vc_mswuniv\mmedialib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswuniv" +# PROP Intermediate_Dir "vc_mswuniv\mmedialib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswuniv" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Fd..\..\src\mmedia\..\..\..\lib\vc_mswuniv\wxmswuniv25_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswuniv" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Fd..\..\src\mmedia\..\..\..\lib\vc_mswuniv\wxmswuniv25_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_mswuniv\wxmswuniv25_mmedia.lib" +# ADD LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_mswuniv\wxmswuniv25_mmedia.lib" + +!ELSEIF "$(CFG)" == "mmedialib - Win32 LIB Native Release Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswu" +# PROP BASE Intermediate_Dir "vc_mswu\mmedialib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswu" +# PROP Intermediate_Dir "vc_mswu\mmedialib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswu" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Fd..\..\src\mmedia\..\..\..\lib\vc_mswu\wxmsw25u_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswu" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Fd..\..\src\mmedia\..\..\..\lib\vc_mswu\wxmsw25u_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_mswu\wxmsw25u_mmedia.lib" +# ADD LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_mswu\wxmsw25u_mmedia.lib" + +!ELSEIF "$(CFG)" == "mmedialib - Win32 LIB wxUniv Debug Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswunivd" +# PROP BASE Intermediate_Dir "vc_mswunivd\mmedialib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswunivd" +# PROP Intermediate_Dir "vc_mswunivd\mmedialib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswunivd" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_mswunivd\wxmswuniv25d_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswunivd" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_mswunivd\wxmswuniv25d_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_mswunivd\wxmswuniv25d_mmedia.lib" +# ADD LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_mswunivd\wxmswuniv25d_mmedia.lib" + +!ELSEIF "$(CFG)" == "mmedialib - Win32 LIB Native Release Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_msw" +# PROP BASE Intermediate_Dir "vc_msw\mmedialib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_msw" +# PROP Intermediate_Dir "vc_msw\mmedialib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_msw" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Fd..\..\src\mmedia\..\..\..\lib\vc_msw\wxmsw25_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_msw" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Fd..\..\src\mmedia\..\..\..\lib\vc_msw\wxmsw25_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_msw\wxmsw25_mmedia.lib" +# ADD LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_msw\wxmsw25_mmedia.lib" + +!ELSEIF "$(CFG)" == "mmedialib - Win32 LIB Native Debug Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswud" +# PROP BASE Intermediate_Dir "vc_mswud\mmedialib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswud" +# PROP Intermediate_Dir "vc_mswud\mmedialib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswud" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_mswud\wxmsw25ud_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswud" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_mswud\wxmsw25ud_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_mswud\wxmsw25ud_mmedia.lib" +# ADD LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_mswud\wxmsw25ud_mmedia.lib" + +!ELSEIF "$(CFG)" == "mmedialib - Win32 LIB wxUniv Release Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswunivu" +# PROP BASE Intermediate_Dir "vc_mswunivu\mmedialib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswunivu" +# PROP Intermediate_Dir "vc_mswunivu\mmedialib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswunivu" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Fd..\..\src\mmedia\..\..\..\lib\vc_mswunivu\wxmswuniv25u_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswunivu" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Fd..\..\src\mmedia\..\..\..\lib\vc_mswunivu\wxmswuniv25u_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_mswunivu\wxmswuniv25u_mmedia.lib" +# ADD LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_mswunivu\wxmswuniv25u_mmedia.lib" + +!ELSEIF "$(CFG)" == "mmedialib - Win32 LIB wxUniv Debug Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswunivud" +# PROP BASE Intermediate_Dir "vc_mswunivud\mmedialib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswunivud" +# PROP Intermediate_Dir "vc_mswunivud\mmedialib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswunivud" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswunivud" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_mmedia.lib" +# ADD LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_mmedia.lib" + +!ELSEIF "$(CFG)" == "mmedialib - Win32 LIB Native Debug Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswd" +# PROP BASE Intermediate_Dir "vc_mswd\mmedialib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\mmedia\..\..\..\lib\vc_mswd" +# PROP Intermediate_Dir "vc_mswd\mmedialib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswd" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_mswd\wxmsw25d_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\mmedia\..\..\..\include" /I "..\..\src\mmedia\..\..\..\lib\vc_mswd" /I "..\..\src\mmedia\..\..\..\src\tiff" /I "..\..\src\mmedia\..\..\..\src\jpeg" /I "..\..\src\mmedia\..\..\..\src\png" /I "..\..\src\mmedia\..\..\..\src\zlib" /I "..\..\src\mmedia\..\..\..\src\regex" /I "..\..\src\mmedia\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\mmedia\..\..\..\lib\vc_mswd\wxmsw25d_mmedia.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_mmedialib.pch" /I "..\..\src\mmedia\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_mswd\wxmsw25d_mmedia.lib" +# ADD LIB32 /nologo /out:"..\..\src\mmedia\..\..\..\lib\vc_mswd\wxmsw25d_mmedia.lib" + +!ENDIF + +# Begin Target + +# Name "mmedialib - Win32 LIB wxUniv Release Ansi" +# Name "mmedialib - Win32 LIB Native Release Unicode" +# Name "mmedialib - Win32 LIB wxUniv Debug Ansi" +# Name "mmedialib - Win32 LIB Native Release Ansi" +# Name "mmedialib - Win32 LIB Native Debug Unicode" +# Name "mmedialib - Win32 LIB wxUniv Release Unicode" +# Name "mmedialib - Win32 LIB wxUniv Debug Unicode" +# Name "mmedialib - Win32 LIB Native Debug Ansi" +# Begin Group "Source Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=../../src/mmedia\..\..\..\src\msw\dummy.cpp +# ADD BASE CPP /Yc"wx/wxprec.h" +# ADD CPP /Yc"wx/wxprec.h" +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\cdbase.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\cdwin.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\g711.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\g721.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\g723_24.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\g723_40.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\g72x.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\sndaiff.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\sndbase.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\sndcodec.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\sndcpcm.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\sndfile.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\sndg72x.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\sndmsad.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\sndpcm.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\sndulaw.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\sndwav.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\sndwin.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\vidbase.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/mmedia\vidwin.cpp +# End Source File +# End Group +# End Target +# End Project + diff --git a/contrib/build/net/makefile.bcc b/contrib/build/net/makefile.bcc new file mode 100644 index 0000000000..594fddcd6d --- /dev/null +++ b/contrib/build/net/makefile.bcc @@ -0,0 +1,208 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +LIBDIRNAME = \ + ..\..\src\net\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +NETUTILSDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\net\..\..\..\include -I$(LIBDIRNAME) \ + -I..\..\src\net\..\..\..\src\tiff -I..\..\src\net\..\..\..\src\jpeg \ + -I..\..\src\net\..\..\..\src\png -I..\..\src\net\..\..\..\src\zlib \ + -I..\..\src\net\..\..\..\src\regex -I..\..\src\net\..\..\..\src\expat\lib \ + -I..\..\src\net\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_NETUTILS \ + $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_netutilsdll.csm +NETUTILSDLL_OBJECTS = \ + $(OBJS)\netutilsdll_dummy.obj \ + $(OBJS)\netutilsdll_email.obj \ + $(OBJS)\netutilsdll_smapi.obj \ + $(OBJS)\netutilsdll_web.obj +NETUTILSLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\net\..\..\..\include -I$(LIBDIRNAME) \ + -I..\..\src\net\..\..\..\src\tiff -I..\..\src\net\..\..\..\src\jpeg \ + -I..\..\src\net\..\..\..\src\png -I..\..\src\net\..\..\..\src\zlib \ + -I..\..\src\net\..\..\..\src\regex -I..\..\src\net\..\..\..\src\expat\lib \ + -I..\..\src\net\..\..\include $(CXXFLAGS) -Hu \ + -H=$(OBJS)\wxprec_netutilslib.csm +NETUTILSLIB_OBJECTS = \ + $(OBJS)\netutilslib_dummy.obj \ + $(OBJS)\netutilslib_email.obj \ + $(OBJS)\netutilslib_smapi.obj \ + $(OBJS)\netutilslib_web.obj +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(OFFICIAL_BUILD)" == "0" +VENDORTAG = _$(VENDOR) +!endif +!if "$(OFFICIAL_BUILD)" == "1" +VENDORTAG = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = -v +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(SHARED)" == "1" +__netutilsdll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_bcc$(VENDORTAG).dll +!endif +!if "$(SHARED)" == "0" +__netutilslib___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__netutilsdll___depname) $(__netutilslib___depname) + +$(OBJS)\netutilsdll_dummy.obj: ../../src/net\..\..\..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(NETUTILSDLL_CXXFLAGS) -H $** + +$(OBJS)\netutilsdll_email.obj: ../../src/net\email.cpp + $(CXX) -q -c -P -o$@ $(NETUTILSDLL_CXXFLAGS) $** + +$(OBJS)\netutilsdll_smapi.obj: ../../src/net\smapi.cpp + $(CXX) -q -c -P -o$@ $(NETUTILSDLL_CXXFLAGS) $** + +$(OBJS)\netutilsdll_web.obj: ../../src/net\web.cpp + $(CXX) -q -c -P -o$@ $(NETUTILSDLL_CXXFLAGS) $** + +$(OBJS)\netutilslib_dummy.obj: ../../src/net\..\..\..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(NETUTILSLIB_CXXFLAGS) -H $** + +$(OBJS)\netutilslib_email.obj: ../../src/net\email.cpp + $(CXX) -q -c -P -o$@ $(NETUTILSLIB_CXXFLAGS) $** + +$(OBJS)\netutilslib_smapi.obj: ../../src/net\smapi.cpp + $(CXX) -q -c -P -o$@ $(NETUTILSLIB_CXXFLAGS) $** + +$(OBJS)\netutilslib_web.obj: ../../src/net\web.cpp + $(CXX) -q -c -P -o$@ $(NETUTILSLIB_CXXFLAGS) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib + +!if "$(SHARED)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_bcc$(VENDORTAG).dll: $(NETUTILSDLL_OBJECTS) $(OBJS)\netutilsdll_dummy.obj + ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + c0d32.obj $(NETUTILSDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, +| + implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils $@ +!endif + +!if "$(SHARED)" == "0" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib: $(NETUTILSLIB_OBJECTS) $(OBJS)\netutilslib_dummy.obj + if exist $@ del $@ + tlib /a /p2048 $@ @&&| + $(NETUTILSLIB_OBJECTS) +| +!endif diff --git a/contrib/build/net/makefile.gcc b/contrib/build/net/makefile.gcc new file mode 100644 index 0000000000..426d0b2fd3 --- /dev/null +++ b/contrib/build/net/makefile.gcc @@ -0,0 +1,195 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../../build/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +LIBDIRNAME = \ + ..\..\src\net\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +NETUTILSDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\net\..\..\..\include -I$(LIBDIRNAME) \ + -I..\..\src\net\..\..\..\src\tiff -I..\..\src\net\..\..\..\src\jpeg \ + -I..\..\src\net\..\..\..\src\png -I..\..\src\net\..\..\..\src\zlib \ + -I..\..\src\net\..\..\..\src\regex -I..\..\src\net\..\..\..\src\expat\lib \ + -I..\..\src\net\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_NETUTILS \ + $(CXXFLAGS) +NETUTILSDLL_OBJECTS = \ + $(OBJS)\netutilsdll_dummy.o \ + $(OBJS)\netutilsdll_email.o \ + $(OBJS)\netutilsdll_smapi.o \ + $(OBJS)\netutilsdll_web.o +NETUTILSLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\net\..\..\..\include -I$(LIBDIRNAME) \ + -I..\..\src\net\..\..\..\src\tiff -I..\..\src\net\..\..\..\src\jpeg \ + -I..\..\src\net\..\..\..\src\png -I..\..\src\net\..\..\..\src\zlib \ + -I..\..\src\net\..\..\..\src\regex -I..\..\src\net\..\..\..\src\expat\lib \ + -I..\..\src\net\..\..\include $(CXXFLAGS) +NETUTILSLIB_OBJECTS = \ + $(OBJS)\netutilslib_dummy.o \ + $(OBJS)\netutilslib_email.o \ + $(OBJS)\netutilslib_smapi.o \ + $(OBJS)\netutilslib_web.o +OBJS = \ + gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(OFFICIAL_BUILD),0) +VENDORTAG = _$(VENDOR) +endif +ifeq ($(OFFICIAL_BUILD),1) +VENDORTAG = +endif +ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +WXDEBUGFLAG = d +endif +endif +ifeq ($(DEBUG_FLAG),1) +WXDEBUGFLAG = d +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(BUILD),debug) +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = -g +endif +endif +ifeq ($(BUILD),release) +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = +endif +endif +ifeq ($(DEBUG_INFO),0) +__DEBUGINFO = +endif +ifeq ($(DEBUG_INFO),1) +__DEBUGINFO = -g +endif +ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +endif +ifeq ($(DEBUG_FLAG),1) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +ifeq ($(USE_GUI),1) +__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) +endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG = -O2 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif +ifeq ($(SHARED),1) +__netutilsdll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_gcc$(VENDORTAG).dll +endif +ifeq ($(SHARED),0) +__netutilslib___depname = \ + $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.a +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__netutilsdll___depname) $(__netutilslib___depname) + +$(OBJS)\netutilsdll_dummy.o: ../../src/net\..\..\..\src\msw\dummy.cpp + $(CXX) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $< + +$(OBJS)\netutilsdll_email.o: ../../src/net\email.cpp + $(CXX) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $< + +$(OBJS)\netutilsdll_smapi.o: ../../src/net\smapi.cpp + $(CXX) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $< + +$(OBJS)\netutilsdll_web.o: ../../src/net\web.cpp + $(CXX) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $< + +$(OBJS)\netutilslib_dummy.o: ../../src/net\..\..\..\src\msw\dummy.cpp + $(CXX) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $< + +$(OBJS)\netutilslib_email.o: ../../src/net\email.cpp + $(CXX) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $< + +$(OBJS)\netutilslib_smapi.o: ../../src/net\smapi.cpp + $(CXX) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $< + +$(OBJS)\netutilslib_web.o: ../../src/net\web.cpp + $(CXX) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $< + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.a + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.a + +ifeq ($(SHARED),1) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_gcc$(VENDORTAG).dll: $(NETUTILSDLL_OBJECTS) + $(CXX) -shared -o $@ $(NETUTILSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) +endif + +ifeq ($(SHARED),0) +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.a: $(NETUTILSLIB_OBJECTS) + if exist $@ del $@ + ar rcu $@ $(NETUTILSLIB_OBJECTS) + ranlib $@ +endif + +.PHONY: all clean diff --git a/contrib/build/net/makefile.vc b/contrib/build/net/makefile.vc new file mode 100644 index 0000000000..b18e17ca38 --- /dev/null +++ b/contrib/build/net/makefile.vc @@ -0,0 +1,270 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +LIBDIRNAME = \ + ..\..\src\net\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +NETUTILSDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) \ + /DWIN32 $(__DEBUGINFO_2) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_vc$(VENDORTAG).pdb \ + $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\net\..\..\..\include \ + /I$(LIBDIRNAME) /I..\..\src\net\..\..\..\src\tiff \ + /I..\..\src\net\..\..\..\src\jpeg /I..\..\src\net\..\..\..\src\png \ + /I..\..\src\net\..\..\..\src\zlib /I..\..\src\net\..\..\..\src\regex \ + /I..\..\src\net\..\..\..\src\expat\lib /I..\..\src\net\..\..\include \ + /DWXUSINGDLL /DWXMAKINGDLL_NETUTILS $(CXXFLAGS) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_netutilsdll.pch" +NETUTILSDLL_OBJECTS = \ + $(OBJS)\netutilsdll_dummy.obj \ + $(OBJS)\netutilsdll_email.obj \ + $(OBJS)\netutilsdll_smapi.obj \ + $(OBJS)\netutilsdll_web.obj +NETUTILSLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_12) \ + /DWIN32 $(__DEBUGINFO_2) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.pdb \ + $(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\net\..\..\..\include \ + /I$(LIBDIRNAME) /I..\..\src\net\..\..\..\src\tiff \ + /I..\..\src\net\..\..\..\src\jpeg /I..\..\src\net\..\..\..\src\png \ + /I..\..\src\net\..\..\..\src\zlib /I..\..\src\net\..\..\..\src\regex \ + /I..\..\src\net\..\..\..\src\expat\lib /I..\..\src\net\..\..\include \ + $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netutilslib.pch" +NETUTILSLIB_OBJECTS = \ + $(OBJS)\netutilslib_dummy.obj \ + $(OBJS)\netutilslib_email.obj \ + $(OBJS)\netutilslib_smapi.obj \ + $(OBJS)\netutilslib_web.obj +OBJS = \ + vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(OFFICIAL_BUILD)" == "0" +VENDORTAG = _$(VENDOR) +!endif +!if "$(OFFICIAL_BUILD)" == "1" +VENDORTAG = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = /Zi +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_12 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_12 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_12 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_3 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_3 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_3 = $(__DEBUGINFO) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS = T +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO = +!endif +!if "$(DEBUG_INFO)" == "0" +____DEBUGINFO = +!endif +!if "$(DEBUG_INFO)" == "1" +____DEBUGINFO = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_11_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_11_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_11_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_2_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_2_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p = $(____DEBUGINFO) +!endif +!if "$(SHARED)" == "1" +__netutilsdll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_vc$(VENDORTAG).dll +!endif +!if "$(SHARED)" == "0" +__netutilslib___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__netutilsdll___depname) $(__netutilslib___depname) + +$(OBJS)\netutilsdll_dummy.obj: ../../src/net\..\..\..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETUTILSDLL_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\netutilsdll_email.obj: ../../src/net\email.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETUTILSDLL_CXXFLAGS) $** + +$(OBJS)\netutilsdll_smapi.obj: ../../src/net\smapi.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETUTILSDLL_CXXFLAGS) $** + +$(OBJS)\netutilsdll_web.obj: ../../src/net\web.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETUTILSDLL_CXXFLAGS) $** + +$(OBJS)\netutilslib_dummy.obj: ../../src/net\..\..\..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETUTILSLIB_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\netutilslib_email.obj: ../../src/net\email.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETUTILSLIB_CXXFLAGS) $** + +$(OBJS)\netutilslib_smapi.obj: ../../src/net\smapi.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETUTILSLIB_CXXFLAGS) $** + +$(OBJS)\netutilslib_web.obj: ../../src/net\web.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETUTILSLIB_CXXFLAGS) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib + +!if "$(SHARED)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_vc$(VENDORTAG).dll: $(NETUTILSDLL_OBJECTS) $(OBJS)\netutilsdll_dummy.obj + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) @<< + $(NETUTILSDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib +<< +!endif + +!if "$(SHARED)" == "0" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib: $(NETUTILSLIB_OBJECTS) $(OBJS)\netutilslib_dummy.obj + if exist $@ del $@ + lib /NOLOGO /OUT:$@ @<< + $(NETUTILSLIB_OBJECTS) +<< +!endif diff --git a/contrib/build/net/makefile.wat b/contrib/build/net/makefile.wat new file mode 100644 index 0000000000..2e0791fdc6 --- /dev/null +++ b/contrib/build/net/makefile.wat @@ -0,0 +1,264 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +VENDORTAG = +!ifeq OFFICIAL_BUILD 0 +VENDORTAG = _$(VENDOR) +!endif +!ifeq OFFICIAL_BUILD 1 +VENDORTAG = +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +!ifeq DEBUG_FLAG default +WXDEBUGFLAG = d +!endif +!endif +!ifeq DEBUG_FLAG 1 +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGINFO = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__OPTIMIZEFLAG = +!ifeq BUILD debug +__OPTIMIZEFLAG = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG = -ot -ox +!endif +__RUNTIME_LIBS = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__netutilsdll___depname = +!ifeq SHARED 1 +__netutilsdll___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_wat$(VENDORTAG).dll +!endif +__netutilslib___depname = +!ifeq SHARED 0 +__netutilslib___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib +!endif + +### Variables: ### + +LIBDIRNAME = & + ..\..\src\net\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +NETUTILSDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=..\..\src\net\..\..\..\include -i=$(LIBDIRNAME) & + -i=..\..\src\net\..\..\..\src\tiff -i=..\..\src\net\..\..\..\src\jpeg & + -i=..\..\src\net\..\..\..\src\png -i=..\..\src\net\..\..\..\src\zlib & + -i=..\..\src\net\..\..\..\src\regex & + -i=..\..\src\net\..\..\..\src\expat\lib -i=..\..\src\net\..\..\include & + -dWXUSINGDLL -dWXMAKINGDLL_NETUTILS $(CXXFLAGS) & + /fh=$(OBJS)\wxprec_netutilsdll.pch +NETUTILSDLL_OBJECTS = & + $(OBJS)\netutilsdll_dummy.obj & + $(OBJS)\netutilsdll_email.obj & + $(OBJS)\netutilsdll_smapi.obj & + $(OBJS)\netutilsdll_web.obj +NETUTILSLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=..\..\src\net\..\..\..\include -i=$(LIBDIRNAME) & + -i=..\..\src\net\..\..\..\src\tiff -i=..\..\src\net\..\..\..\src\jpeg & + -i=..\..\src\net\..\..\..\src\png -i=..\..\src\net\..\..\..\src\zlib & + -i=..\..\src\net\..\..\..\src\regex & + -i=..\..\src\net\..\..\..\src\expat\lib -i=..\..\src\net\..\..\include & + $(CXXFLAGS) /fh=$(OBJS)\wxprec_netutilslib.pch +NETUTILSLIB_OBJECTS = & + $(OBJS)\netutilslib_dummy.obj & + $(OBJS)\netutilslib_email.obj & + $(OBJS)\netutilslib_smapi.obj & + $(OBJS)\netutilslib_web.obj +OBJS = & + wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(__netutilsdll___depname) $(__netutilslib___depname) + +$(OBJS)\netutilsdll_dummy.obj : .AUTODEPEND ../../src/net\..\..\..\src\msw\dummy.cpp + $(CXX) -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $< + +$(OBJS)\netutilsdll_email.obj : .AUTODEPEND ../../src/net\email.cpp + $(CXX) -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $< + +$(OBJS)\netutilsdll_smapi.obj : .AUTODEPEND ../../src/net\smapi.cpp + $(CXX) -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $< + +$(OBJS)\netutilsdll_web.obj : .AUTODEPEND ../../src/net\web.cpp + $(CXX) -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $< + +$(OBJS)\netutilslib_dummy.obj : .AUTODEPEND ../../src/net\..\..\..\src\msw\dummy.cpp + $(CXX) -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $< + +$(OBJS)\netutilslib_email.obj : .AUTODEPEND ../../src/net\email.cpp + $(CXX) -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $< + +$(OBJS)\netutilslib_smapi.obj : .AUTODEPEND ../../src/net\smapi.cpp + $(CXX) -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $< + +$(OBJS)\netutilslib_web.obj : .AUTODEPEND ../../src/net\web.cpp + $(CXX) -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib + +!ifeq SHARED 1 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_wat$(VENDORTAG).dll : $(NETUTILSDLL_OBJECTS) + @%create $(OBJS)\netutilsdll.lbc + @%append $(OBJS)\netutilsdll.lbc option quiet + @%append $(OBJS)\netutilsdll.lbc name $^@ + @%append $(OBJS)\netutilsdll.lbc option incremental + @%append $(OBJS)\netutilsdll.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) + @for %i in ($(NETUTILSDLL_OBJECTS)) do @%append $(OBJS)\netutilsdll.lbc file %i + @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\netutilsdll.lbc library %i + @%append $(OBJS)\netutilsdll.lbc + @%append $(OBJS)\netutilsdll.lbc system nt_dll + wlink @$(OBJS)\netutilsdll.lbc + wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib +$^@ +!endif + +!ifeq SHARED 0 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib : $(NETUTILSLIB_OBJECTS) + @%create $(OBJS)\netutilslib.lbc + @for %i in ($(NETUTILSLIB_OBJECTS)) do @%append $(OBJS)\netutilslib.lbc +%i + wlib -q -p2048 -n -b $^@ @$(OBJS)\netutilslib.lbc +!endif diff --git a/contrib/build/net/netutils.bkl b/contrib/build/net/netutils.bkl new file mode 100644 index 0000000000..56c6a35112 --- /dev/null +++ b/contrib/build/net/netutils.bkl @@ -0,0 +1,35 @@ + + + + + + + + + email.cpp + smapi.cpp + web.cpp + + + + + wx/net/email.h + wx/net/msg.h + wx/net/smapi.h + wx/net/web.h + + + + + WXUSINGDLL + WXMAKINGDLL_NETUTILS + $(NETUTILS_SRC) + core + base + + + + $(NETUTILS_SRC) + + + diff --git a/contrib/build/net/netutils.dsw b/contrib/build/net/netutils.dsw new file mode 100644 index 0000000000..309ba4e2c1 --- /dev/null +++ b/contrib/build/net/netutils.dsw @@ -0,0 +1,28 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### +Project: "netutilsdll"=netutils_netutilsdll.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "netutilslib"=netutils_netutilslib.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + diff --git a/contrib/build/net/netutils_netutilsdll.dsp b/contrib/build/net/netutils_netutilsdll.dsp new file mode 100644 index 0000000000..5aacb7b7a9 --- /dev/null +++ b/contrib/build/net/netutils_netutilsdll.dsp @@ -0,0 +1,274 @@ +# Microsoft Developer Studio Project File - Name="netutilsdll" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=netutilsdll - Win32 DLL Native Debug Unicode +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "netutils_netutilsdll.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "netutils_netutilsdll.mak" CFG="netutilsdll - Win32 DLL Native Debug Unicode" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "netutilsdll - Win32 DLL Native Debug Unicode" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "netutilsdll - Win32 DLL Native Release Ansi" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "netutilsdll - Win32 DLL wxUniv Debug Unicode" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "netutilsdll - Win32 DLL wxUniv Release Unicode" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "netutilsdll - Win32 DLL Native Debug Ansi" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "netutilsdll - Win32 DLL wxUniv Release Ansi" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "netutilsdll - Win32 DLL wxUniv Debug Ansi" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "netutilsdll - Win32 DLL Native Release Unicode" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "netutilsdll - Win32 DLL Native Debug Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_mswuddll" +# PROP BASE Intermediate_Dir "vc_mswuddll\netutilsdll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_mswuddll" +# PROP Intermediate_Dir "vc_mswuddll\netutilsdll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswuddll" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_mswuddll\wxmsw250ud_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswuddll" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_mswuddll\wxmsw250ud_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_mswuddll" /i "..\..\src\net\..\..\..\src\tiff" /i "..\..\src\net\..\..\..\src\jpeg" /i "..\..\src\net\..\..\..\src\png" /i "..\..\src\net\..\..\..\src\zlib" /i "..\..\src\net\..\..\..\src\regex" /i "..\..\src\net\..\..\..\src\expat\lib" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_mswuddll" /i "..\..\src\net\..\..\..\src\tiff" /i "..\..\src\net\..\..\..\src\jpeg" /i "..\..\src\net\..\..\..\src\png" /i "..\..\src\net\..\..\..\src\zlib" /i "..\..\src\net\..\..\..\src\regex" /i "..\..\src\net\..\..\..\src\expat\lib" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_mswuddll\wxmsw250ud_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_mswuddll" /implib:"..\..\src\net\..\..\..\lib\vc_mswuddll\wxmsw25ud_netutils.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_mswuddll\wxmsw250ud_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_mswuddll" /implib:"..\..\src\net\..\..\..\lib\vc_mswuddll\wxmsw25ud_netutils.lib" /debug + +!ELSEIF "$(CFG)" == "netutilsdll - Win32 DLL Native Release Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_mswdll" +# PROP BASE Intermediate_Dir "vc_mswdll\netutilsdll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_mswdll" +# PROP Intermediate_Dir "vc_mswdll\netutilsdll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswdll" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_mswdll\wxmsw250_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswdll" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_mswdll\wxmsw250_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_mswdll" /i "..\..\src\net\..\..\..\src\tiff" /i "..\..\src\net\..\..\..\src\jpeg" /i "..\..\src\net\..\..\..\src\png" /i "..\..\src\net\..\..\..\src\zlib" /i "..\..\src\net\..\..\..\src\regex" /i "..\..\src\net\..\..\..\src\expat\lib" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS +# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_mswdll" /i "..\..\src\net\..\..\..\src\tiff" /i "..\..\src\net\..\..\..\src\jpeg" /i "..\..\src\net\..\..\..\src\png" /i "..\..\src\net\..\..\..\src\zlib" /i "..\..\src\net\..\..\..\src\regex" /i "..\..\src\net\..\..\..\src\expat\lib" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_mswdll\wxmsw250_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_mswdll" /implib:"..\..\src\net\..\..\..\lib\vc_mswdll\wxmsw25_netutils.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_mswdll\wxmsw250_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_mswdll" /implib:"..\..\src\net\..\..\..\lib\vc_mswdll\wxmsw25_netutils.lib" + +!ELSEIF "$(CFG)" == "netutilsdll - Win32 DLL wxUniv Debug Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_mswunivuddll" +# PROP BASE Intermediate_Dir "vc_mswunivuddll\netutilsdll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_mswunivuddll" +# PROP Intermediate_Dir "vc_mswunivuddll\netutilsdll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswunivuddll" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswunivuddll" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_mswunivuddll" /i "..\..\src\net\..\..\..\src\tiff" /i "..\..\src\net\..\..\..\src\jpeg" /i "..\..\src\net\..\..\..\src\png" /i "..\..\src\net\..\..\..\src\zlib" /i "..\..\src\net\..\..\..\src\regex" /i "..\..\src\net\..\..\..\src\expat\lib" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_mswunivuddll" /i "..\..\src\net\..\..\..\src\tiff" /i "..\..\src\net\..\..\..\src\jpeg" /i "..\..\src\net\..\..\..\src\png" /i "..\..\src\net\..\..\..\src\zlib" /i "..\..\src\net\..\..\..\src\regex" /i "..\..\src\net\..\..\..\src\expat\lib" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_mswunivuddll" /implib:"..\..\src\net\..\..\..\lib\vc_mswunivuddll\wxmswuniv25ud_netutils.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_mswunivuddll" /implib:"..\..\src\net\..\..\..\lib\vc_mswunivuddll\wxmswuniv25ud_netutils.lib" /debug + +!ELSEIF "$(CFG)" == "netutilsdll - Win32 DLL wxUniv Release Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_mswunivudll" +# PROP BASE Intermediate_Dir "vc_mswunivudll\netutilsdll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_mswunivudll" +# PROP Intermediate_Dir "vc_mswunivudll\netutilsdll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswunivudll" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswunivudll" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_mswunivudll" /i "..\..\src\net\..\..\..\src\tiff" /i "..\..\src\net\..\..\..\src\jpeg" /i "..\..\src\net\..\..\..\src\png" /i "..\..\src\net\..\..\..\src\zlib" /i "..\..\src\net\..\..\..\src\regex" /i "..\..\src\net\..\..\..\src\expat\lib" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS +# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_mswunivudll" /i "..\..\src\net\..\..\..\src\tiff" /i "..\..\src\net\..\..\..\src\jpeg" /i "..\..\src\net\..\..\..\src\png" /i "..\..\src\net\..\..\..\src\zlib" /i "..\..\src\net\..\..\..\src\regex" /i "..\..\src\net\..\..\..\src\expat\lib" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_mswunivudll" /implib:"..\..\src\net\..\..\..\lib\vc_mswunivudll\wxmswuniv25u_netutils.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_mswunivudll" /implib:"..\..\src\net\..\..\..\lib\vc_mswunivudll\wxmswuniv25u_netutils.lib" + +!ELSEIF "$(CFG)" == "netutilsdll - Win32 DLL Native Debug Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_mswddll" +# PROP BASE Intermediate_Dir "vc_mswddll\netutilsdll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_mswddll" +# PROP Intermediate_Dir "vc_mswddll\netutilsdll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswddll" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_mswddll\wxmsw250d_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswddll" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_mswddll\wxmsw250d_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_mswddll" /i "..\..\src\net\..\..\..\src\tiff" /i "..\..\src\net\..\..\..\src\jpeg" /i "..\..\src\net\..\..\..\src\png" /i "..\..\src\net\..\..\..\src\zlib" /i "..\..\src\net\..\..\..\src\regex" /i "..\..\src\net\..\..\..\src\expat\lib" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_mswddll" /i "..\..\src\net\..\..\..\src\tiff" /i "..\..\src\net\..\..\..\src\jpeg" /i "..\..\src\net\..\..\..\src\png" /i "..\..\src\net\..\..\..\src\zlib" /i "..\..\src\net\..\..\..\src\regex" /i "..\..\src\net\..\..\..\src\expat\lib" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_mswddll\wxmsw250d_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_mswddll" /implib:"..\..\src\net\..\..\..\lib\vc_mswddll\wxmsw25d_netutils.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_mswddll\wxmsw250d_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_mswddll" /implib:"..\..\src\net\..\..\..\lib\vc_mswddll\wxmsw25d_netutils.lib" /debug + +!ELSEIF "$(CFG)" == "netutilsdll - Win32 DLL wxUniv Release Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_mswunivdll" +# PROP BASE Intermediate_Dir "vc_mswunivdll\netutilsdll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_mswunivdll" +# PROP Intermediate_Dir "vc_mswunivdll\netutilsdll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswunivdll" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_mswunivdll\wxmswuniv250_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswunivdll" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_mswunivdll\wxmswuniv250_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_mswunivdll" /i "..\..\src\net\..\..\..\src\tiff" /i "..\..\src\net\..\..\..\src\jpeg" /i "..\..\src\net\..\..\..\src\png" /i "..\..\src\net\..\..\..\src\zlib" /i "..\..\src\net\..\..\..\src\regex" /i "..\..\src\net\..\..\..\src\expat\lib" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS +# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_mswunivdll" /i "..\..\src\net\..\..\..\src\tiff" /i "..\..\src\net\..\..\..\src\jpeg" /i "..\..\src\net\..\..\..\src\png" /i "..\..\src\net\..\..\..\src\zlib" /i "..\..\src\net\..\..\..\src\regex" /i "..\..\src\net\..\..\..\src\expat\lib" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_mswunivdll\wxmswuniv250_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_mswunivdll" /implib:"..\..\src\net\..\..\..\lib\vc_mswunivdll\wxmswuniv25_netutils.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_mswunivdll\wxmswuniv250_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_mswunivdll" /implib:"..\..\src\net\..\..\..\lib\vc_mswunivdll\wxmswuniv25_netutils.lib" + +!ELSEIF "$(CFG)" == "netutilsdll - Win32 DLL wxUniv Debug Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_mswunivddll" +# PROP BASE Intermediate_Dir "vc_mswunivddll\netutilsdll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_mswunivddll" +# PROP Intermediate_Dir "vc_mswunivddll\netutilsdll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswunivddll" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswunivddll" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_mswunivddll" /i "..\..\src\net\..\..\..\src\tiff" /i "..\..\src\net\..\..\..\src\jpeg" /i "..\..\src\net\..\..\..\src\png" /i "..\..\src\net\..\..\..\src\zlib" /i "..\..\src\net\..\..\..\src\regex" /i "..\..\src\net\..\..\..\src\expat\lib" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_mswunivddll" /i "..\..\src\net\..\..\..\src\tiff" /i "..\..\src\net\..\..\..\src\jpeg" /i "..\..\src\net\..\..\..\src\png" /i "..\..\src\net\..\..\..\src\zlib" /i "..\..\src\net\..\..\..\src\regex" /i "..\..\src\net\..\..\..\src\expat\lib" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_mswunivddll" /implib:"..\..\src\net\..\..\..\lib\vc_mswunivddll\wxmswuniv25d_netutils.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_mswunivddll" /implib:"..\..\src\net\..\..\..\lib\vc_mswunivddll\wxmswuniv25d_netutils.lib" /debug + +!ELSEIF "$(CFG)" == "netutilsdll - Win32 DLL Native Release Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_mswudll" +# PROP BASE Intermediate_Dir "vc_mswudll\netutilsdll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_mswudll" +# PROP Intermediate_Dir "vc_mswudll\netutilsdll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswudll" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_mswudll\wxmsw250u_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswudll" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_mswudll\wxmsw250u_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_mswudll" /i "..\..\src\net\..\..\..\src\tiff" /i "..\..\src\net\..\..\..\src\jpeg" /i "..\..\src\net\..\..\..\src\png" /i "..\..\src\net\..\..\..\src\zlib" /i "..\..\src\net\..\..\..\src\regex" /i "..\..\src\net\..\..\..\src\expat\lib" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS +# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_mswudll" /i "..\..\src\net\..\..\..\src\tiff" /i "..\..\src\net\..\..\..\src\jpeg" /i "..\..\src\net\..\..\..\src\png" /i "..\..\src\net\..\..\..\src\zlib" /i "..\..\src\net\..\..\..\src\regex" /i "..\..\src\net\..\..\..\src\expat\lib" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_mswudll\wxmsw250u_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_mswudll" /implib:"..\..\src\net\..\..\..\lib\vc_mswudll\wxmsw25u_netutils.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_mswudll\wxmsw250u_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_mswudll" /implib:"..\..\src\net\..\..\..\lib\vc_mswudll\wxmsw25u_netutils.lib" + +!ENDIF + +# Begin Target + +# Name "netutilsdll - Win32 DLL Native Debug Unicode" +# Name "netutilsdll - Win32 DLL Native Release Ansi" +# Name "netutilsdll - Win32 DLL wxUniv Debug Unicode" +# Name "netutilsdll - Win32 DLL wxUniv Release Unicode" +# Name "netutilsdll - Win32 DLL Native Debug Ansi" +# Name "netutilsdll - Win32 DLL wxUniv Release Ansi" +# Name "netutilsdll - Win32 DLL wxUniv Debug Ansi" +# Name "netutilsdll - Win32 DLL Native Release Unicode" +# Begin Group "Source Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=../../src/net\..\..\..\src\msw\dummy.cpp +# ADD BASE CPP /Yc"wx/wxprec.h" +# ADD CPP /Yc"wx/wxprec.h" +# End Source File +# Begin Source File + +SOURCE=../../src/net\email.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/net\smapi.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/net\web.cpp +# End Source File +# End Group +# End Target +# End Project + diff --git a/contrib/build/net/netutils_netutilslib.dsp b/contrib/build/net/netutils_netutilslib.dsp new file mode 100644 index 0000000000..d6ef0cbf76 --- /dev/null +++ b/contrib/build/net/netutils_netutilslib.dsp @@ -0,0 +1,257 @@ +# Microsoft Developer Studio Project File - Name="netutilslib" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=netutilslib - Win32 LIB wxUniv Release Ansi +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "netutils_netutilslib.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "netutils_netutilslib.mak" CFG="netutilslib - Win32 LIB wxUniv Release Ansi" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "netutilslib - Win32 LIB wxUniv Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "netutilslib - Win32 LIB Native Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "netutilslib - Win32 LIB wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "netutilslib - Win32 LIB Native Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "netutilslib - Win32 LIB Native Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "netutilslib - Win32 LIB wxUniv Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "netutilslib - Win32 LIB wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "netutilslib - Win32 LIB Native Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "netutilslib - Win32 LIB wxUniv Release Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_mswuniv" +# PROP BASE Intermediate_Dir "vc_mswuniv\netutilslib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_mswuniv" +# PROP Intermediate_Dir "vc_mswuniv\netutilslib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswuniv" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Fd..\..\src\net\..\..\..\lib\vc_mswuniv\wxmswuniv25_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswuniv" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Fd..\..\src\net\..\..\..\lib\vc_mswuniv\wxmswuniv25_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_mswuniv\wxmswuniv25_netutils.lib" +# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_mswuniv\wxmswuniv25_netutils.lib" + +!ELSEIF "$(CFG)" == "netutilslib - Win32 LIB Native Release Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_mswu" +# PROP BASE Intermediate_Dir "vc_mswu\netutilslib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_mswu" +# PROP Intermediate_Dir "vc_mswu\netutilslib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswu" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Fd..\..\src\net\..\..\..\lib\vc_mswu\wxmsw25u_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswu" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Fd..\..\src\net\..\..\..\lib\vc_mswu\wxmsw25u_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_mswu\wxmsw25u_netutils.lib" +# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_mswu\wxmsw25u_netutils.lib" + +!ELSEIF "$(CFG)" == "netutilslib - Win32 LIB wxUniv Debug Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_mswunivd" +# PROP BASE Intermediate_Dir "vc_mswunivd\netutilslib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_mswunivd" +# PROP Intermediate_Dir "vc_mswunivd\netutilslib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswunivd" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_mswunivd\wxmswuniv25d_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswunivd" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_mswunivd\wxmswuniv25d_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_mswunivd\wxmswuniv25d_netutils.lib" +# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_mswunivd\wxmswuniv25d_netutils.lib" + +!ELSEIF "$(CFG)" == "netutilslib - Win32 LIB Native Release Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_msw" +# PROP BASE Intermediate_Dir "vc_msw\netutilslib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_msw" +# PROP Intermediate_Dir "vc_msw\netutilslib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_msw" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Fd..\..\src\net\..\..\..\lib\vc_msw\wxmsw25_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_msw" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Fd..\..\src\net\..\..\..\lib\vc_msw\wxmsw25_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_msw\wxmsw25_netutils.lib" +# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_msw\wxmsw25_netutils.lib" + +!ELSEIF "$(CFG)" == "netutilslib - Win32 LIB Native Debug Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_mswud" +# PROP BASE Intermediate_Dir "vc_mswud\netutilslib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_mswud" +# PROP Intermediate_Dir "vc_mswud\netutilslib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswud" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_mswud\wxmsw25ud_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswud" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_mswud\wxmsw25ud_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_mswud\wxmsw25ud_netutils.lib" +# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_mswud\wxmsw25ud_netutils.lib" + +!ELSEIF "$(CFG)" == "netutilslib - Win32 LIB wxUniv Release Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_mswunivu" +# PROP BASE Intermediate_Dir "vc_mswunivu\netutilslib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_mswunivu" +# PROP Intermediate_Dir "vc_mswunivu\netutilslib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswunivu" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Fd..\..\src\net\..\..\..\lib\vc_mswunivu\wxmswuniv25u_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswunivu" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Fd..\..\src\net\..\..\..\lib\vc_mswunivu\wxmswuniv25u_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_mswunivu\wxmswuniv25u_netutils.lib" +# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_mswunivu\wxmswuniv25u_netutils.lib" + +!ELSEIF "$(CFG)" == "netutilslib - Win32 LIB wxUniv Debug Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_mswunivud" +# PROP BASE Intermediate_Dir "vc_mswunivud\netutilslib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_mswunivud" +# PROP Intermediate_Dir "vc_mswunivud\netutilslib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswunivud" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswunivud" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_netutils.lib" +# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_netutils.lib" + +!ELSEIF "$(CFG)" == "netutilslib - Win32 LIB Native Debug Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_mswd" +# PROP BASE Intermediate_Dir "vc_mswd\netutilslib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_mswd" +# PROP Intermediate_Dir "vc_mswd\netutilslib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswd" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_mswd\wxmsw25d_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_mswd" /I "..\..\src\net\..\..\..\src\tiff" /I "..\..\src\net\..\..\..\src\jpeg" /I "..\..\src\net\..\..\..\src\png" /I "..\..\src\net\..\..\..\src\zlib" /I "..\..\src\net\..\..\..\src\regex" /I "..\..\src\net\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_mswd\wxmsw25d_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_mswd\wxmsw25d_netutils.lib" +# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_mswd\wxmsw25d_netutils.lib" + +!ENDIF + +# Begin Target + +# Name "netutilslib - Win32 LIB wxUniv Release Ansi" +# Name "netutilslib - Win32 LIB Native Release Unicode" +# Name "netutilslib - Win32 LIB wxUniv Debug Ansi" +# Name "netutilslib - Win32 LIB Native Release Ansi" +# Name "netutilslib - Win32 LIB Native Debug Unicode" +# Name "netutilslib - Win32 LIB wxUniv Release Unicode" +# Name "netutilslib - Win32 LIB wxUniv Debug Unicode" +# Name "netutilslib - Win32 LIB Native Debug Ansi" +# Begin Group "Source Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=../../src/net\..\..\..\src\msw\dummy.cpp +# ADD BASE CPP /Yc"wx/wxprec.h" +# ADD CPP /Yc"wx/wxprec.h" +# End Source File +# Begin Source File + +SOURCE=../../src/net\email.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/net\smapi.cpp +# End Source File +# Begin Source File + +SOURCE=../../src/net\web.cpp +# End Source File +# End Group +# End Target +# End Project + diff --git a/contrib/build/plot/makefile.bcc b/contrib/build/plot/makefile.bcc new file mode 100644 index 0000000000..75c155c2bd --- /dev/null +++ b/contrib/build/plot/makefile.bcc @@ -0,0 +1,193 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +LIBDIRNAME = \ + ..\..\src\plot\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +PLOTDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\plot\..\..\..\include -I$(LIBDIRNAME) \ + -I..\..\src\plot\..\..\..\src\tiff -I..\..\src\plot\..\..\..\src\jpeg \ + -I..\..\src\plot\..\..\..\src\png -I..\..\src\plot\..\..\..\src\zlib \ + -I..\..\src\plot\..\..\..\src\regex \ + -I..\..\src\plot\..\..\..\src\expat\lib -I..\..\src\plot\..\..\include \ + -DWXUSINGDLL -DWXMAKINGDLL_PLOT $(CXXFLAGS) -Hu \ + -H=$(OBJS)\wxprec_plotdll.csm +PLOTDLL_OBJECTS = \ + $(OBJS)\plotdll_dummy.obj \ + $(OBJS)\plotdll_plot.obj +PLOTLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\plot\..\..\..\include -I$(LIBDIRNAME) \ + -I..\..\src\plot\..\..\..\src\tiff -I..\..\src\plot\..\..\..\src\jpeg \ + -I..\..\src\plot\..\..\..\src\png -I..\..\src\plot\..\..\..\src\zlib \ + -I..\..\src\plot\..\..\..\src\regex \ + -I..\..\src\plot\..\..\..\src\expat\lib -I..\..\src\plot\..\..\include \ + $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_plotlib.csm +PLOTLIB_OBJECTS = \ + $(OBJS)\plotlib_dummy.obj \ + $(OBJS)\plotlib_plot.obj + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(OFFICIAL_BUILD)" == "0" +VENDORTAG = _$(VENDOR) +!endif +!if "$(OFFICIAL_BUILD)" == "1" +VENDORTAG = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = -v +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(SHARED)" == "1" +__plotdll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_bcc$(VENDORTAG).dll +!endif +!if "$(SHARED)" == "0" +__plotlib___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__plotdll___depname) $(__plotlib___depname) + +$(OBJS)\plotdll_dummy.obj: ../../src/plot\..\..\..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(PLOTDLL_CXXFLAGS) -H $** + +$(OBJS)\plotdll_plot.obj: ../../src/plot\plot.cpp + $(CXX) -q -c -P -o$@ $(PLOTDLL_CXXFLAGS) $** + +$(OBJS)\plotlib_dummy.obj: ../../src/plot\..\..\..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(PLOTLIB_CXXFLAGS) -H $** + +$(OBJS)\plotlib_plot.obj: ../../src/plot\plot.cpp + $(CXX) -q -c -P -o$@ $(PLOTLIB_CXXFLAGS) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib + +!if "$(SHARED)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_bcc$(VENDORTAG).dll: $(PLOTDLL_OBJECTS) $(OBJS)\plotdll_dummy.obj + ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + c0d32.obj $(PLOTDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, +| + implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot $@ +!endif + +!if "$(SHARED)" == "0" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib: $(PLOTLIB_OBJECTS) $(OBJS)\plotlib_dummy.obj + if exist $@ del $@ + tlib /a /p2048 $@ @&&| + $(PLOTLIB_OBJECTS) +| +!endif diff --git a/contrib/build/plot/makefile.gcc b/contrib/build/plot/makefile.gcc new file mode 100644 index 0000000000..6bb960d05a --- /dev/null +++ b/contrib/build/plot/makefile.gcc @@ -0,0 +1,180 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../../build/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +LIBDIRNAME = \ + ..\..\src\plot\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +PLOTDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\plot\..\..\..\include -I$(LIBDIRNAME) \ + -I..\..\src\plot\..\..\..\src\tiff -I..\..\src\plot\..\..\..\src\jpeg \ + -I..\..\src\plot\..\..\..\src\png -I..\..\src\plot\..\..\..\src\zlib \ + -I..\..\src\plot\..\..\..\src\regex \ + -I..\..\src\plot\..\..\..\src\expat\lib -I..\..\src\plot\..\..\include \ + -DWXUSINGDLL -DWXMAKINGDLL_PLOT $(CXXFLAGS) +PLOTDLL_OBJECTS = \ + $(OBJS)\plotdll_dummy.o \ + $(OBJS)\plotdll_plot.o +PLOTLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\plot\..\..\..\include -I$(LIBDIRNAME) \ + -I..\..\src\plot\..\..\..\src\tiff -I..\..\src\plot\..\..\..\src\jpeg \ + -I..\..\src\plot\..\..\..\src\png -I..\..\src\plot\..\..\..\src\zlib \ + -I..\..\src\plot\..\..\..\src\regex \ + -I..\..\src\plot\..\..\..\src\expat\lib -I..\..\src\plot\..\..\include \ + $(CXXFLAGS) +PLOTLIB_OBJECTS = \ + $(OBJS)\plotlib_dummy.o \ + $(OBJS)\plotlib_plot.o + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(OFFICIAL_BUILD),0) +VENDORTAG = _$(VENDOR) +endif +ifeq ($(OFFICIAL_BUILD),1) +VENDORTAG = +endif +ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +WXDEBUGFLAG = d +endif +endif +ifeq ($(DEBUG_FLAG),1) +WXDEBUGFLAG = d +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(BUILD),debug) +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = -g +endif +endif +ifeq ($(BUILD),release) +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = +endif +endif +ifeq ($(DEBUG_INFO),0) +__DEBUGINFO = +endif +ifeq ($(DEBUG_INFO),1) +__DEBUGINFO = -g +endif +ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +endif +ifeq ($(DEBUG_FLAG),1) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +ifeq ($(USE_GUI),1) +__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) +endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG = -O2 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif +ifeq ($(SHARED),1) +__plotdll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_gcc$(VENDORTAG).dll +endif +ifeq ($(SHARED),0) +__plotlib___depname = \ + $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.a +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__plotdll___depname) $(__plotlib___depname) + +$(OBJS)\plotdll_dummy.o: ../../src/plot\..\..\..\src\msw\dummy.cpp + $(CXX) -c -o $@ $(PLOTDLL_CXXFLAGS) $< + +$(OBJS)\plotdll_plot.o: ../../src/plot\plot.cpp + $(CXX) -c -o $@ $(PLOTDLL_CXXFLAGS) $< + +$(OBJS)\plotlib_dummy.o: ../../src/plot\..\..\..\src\msw\dummy.cpp + $(CXX) -c -o $@ $(PLOTLIB_CXXFLAGS) $< + +$(OBJS)\plotlib_plot.o: ../../src/plot\plot.cpp + $(CXX) -c -o $@ $(PLOTLIB_CXXFLAGS) $< + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.a + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.a + +ifeq ($(SHARED),1) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_gcc$(VENDORTAG).dll: $(PLOTDLL_OBJECTS) + $(CXX) -shared -o $@ $(PLOTDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) +endif + +ifeq ($(SHARED),0) +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.a: $(PLOTLIB_OBJECTS) + if exist $@ del $@ + ar rcu $@ $(PLOTLIB_OBJECTS) + ranlib $@ +endif + +.PHONY: all clean diff --git a/contrib/build/plot/makefile.vc b/contrib/build/plot/makefile.vc new file mode 100644 index 0000000000..e5005923ba --- /dev/null +++ b/contrib/build/plot/makefile.vc @@ -0,0 +1,256 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +LIBDIRNAME = \ + ..\..\src\plot\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +PLOTDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_2) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_vc$(VENDORTAG).pdb \ + $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + /I..\..\src\plot\..\..\..\include /I$(LIBDIRNAME) \ + /I..\..\src\plot\..\..\..\src\tiff /I..\..\src\plot\..\..\..\src\jpeg \ + /I..\..\src\plot\..\..\..\src\png /I..\..\src\plot\..\..\..\src\zlib \ + /I..\..\src\plot\..\..\..\src\regex \ + /I..\..\src\plot\..\..\..\src\expat\lib /I..\..\src\plot\..\..\include \ + /DWXUSINGDLL /DWXMAKINGDLL_PLOT $(CXXFLAGS) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_plotdll.pch" +PLOTDLL_OBJECTS = \ + $(OBJS)\plotdll_dummy.obj \ + $(OBJS)\plotdll_plot.obj +PLOTLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_12) /DWIN32 \ + $(__DEBUGINFO_2) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.pdb \ + $(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + /I..\..\src\plot\..\..\..\include /I$(LIBDIRNAME) \ + /I..\..\src\plot\..\..\..\src\tiff /I..\..\src\plot\..\..\..\src\jpeg \ + /I..\..\src\plot\..\..\..\src\png /I..\..\src\plot\..\..\..\src\zlib \ + /I..\..\src\plot\..\..\..\src\regex \ + /I..\..\src\plot\..\..\..\src\expat\lib /I..\..\src\plot\..\..\include \ + $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_plotlib.pch" +PLOTLIB_OBJECTS = \ + $(OBJS)\plotlib_dummy.obj \ + $(OBJS)\plotlib_plot.obj + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(OFFICIAL_BUILD)" == "0" +VENDORTAG = _$(VENDOR) +!endif +!if "$(OFFICIAL_BUILD)" == "1" +VENDORTAG = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = /Zi +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_12 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_12 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_12 = $(__DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_3 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_3 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_3 = $(__DEBUGINFO) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS = T +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +____DEBUGINFO = +!endif +!if "$(DEBUG_INFO)" == "0" +____DEBUGINFO = +!endif +!if "$(DEBUG_INFO)" == "1" +____DEBUGINFO = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_11_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_11_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_11_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_2_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_2_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p = $(____DEBUGINFO) +!endif +!if "$(SHARED)" == "1" +__plotdll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_vc$(VENDORTAG).dll +!endif +!if "$(SHARED)" == "0" +__plotlib___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__plotdll___depname) $(__plotlib___depname) + +$(OBJS)\plotdll_dummy.obj: ../../src/plot\..\..\..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(PLOTDLL_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\plotdll_plot.obj: ../../src/plot\plot.cpp + $(CXX) /c /nologo /TP /Fo$@ $(PLOTDLL_CXXFLAGS) $** + +$(OBJS)\plotlib_dummy.obj: ../../src/plot\..\..\..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(PLOTLIB_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\plotlib_plot.obj: ../../src/plot\plot.cpp + $(CXX) /c /nologo /TP /Fo$@ $(PLOTLIB_CXXFLAGS) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib + +!if "$(SHARED)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_vc$(VENDORTAG).dll: $(PLOTDLL_OBJECTS) $(OBJS)\plotdll_dummy.obj + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) @<< + $(PLOTDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib +<< +!endif + +!if "$(SHARED)" == "0" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib: $(PLOTLIB_OBJECTS) $(OBJS)\plotlib_dummy.obj + if exist $@ del $@ + lib /NOLOGO /OUT:$@ @<< + $(PLOTLIB_OBJECTS) +<< +!endif diff --git a/contrib/build/plot/makefile.wat b/contrib/build/plot/makefile.wat new file mode 100644 index 0000000000..126b653944 --- /dev/null +++ b/contrib/build/plot/makefile.wat @@ -0,0 +1,247 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +VENDORTAG = +!ifeq OFFICIAL_BUILD 0 +VENDORTAG = _$(VENDOR) +!endif +!ifeq OFFICIAL_BUILD 1 +VENDORTAG = +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +!ifeq DEBUG_FLAG default +WXDEBUGFLAG = d +!endif +!endif +!ifeq DEBUG_FLAG 1 +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGINFO = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +!ifeq DEBUG_FLAG default +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +!endif +!ifeq DEBUG_FLAG 1 +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__OPTIMIZEFLAG = +!ifeq BUILD debug +__OPTIMIZEFLAG = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG = -ot -ox +!endif +__RUNTIME_LIBS = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__plotdll___depname = +!ifeq SHARED 1 +__plotdll___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_wat$(VENDORTAG).dll +!endif +__plotlib___depname = +!ifeq SHARED 0 +__plotlib___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib +!endif + +### Variables: ### + +LIBDIRNAME = & + ..\..\src\plot\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = & + wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +PLOTDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=..\..\src\plot\..\..\..\include -i=$(LIBDIRNAME) & + -i=..\..\src\plot\..\..\..\src\tiff -i=..\..\src\plot\..\..\..\src\jpeg & + -i=..\..\src\plot\..\..\..\src\png -i=..\..\src\plot\..\..\..\src\zlib & + -i=..\..\src\plot\..\..\..\src\regex & + -i=..\..\src\plot\..\..\..\src\expat\lib -i=..\..\src\plot\..\..\include & + -dWXUSINGDLL -dWXMAKINGDLL_PLOT $(CXXFLAGS) /fh=$(OBJS)\wxprec_plotdll.pch +PLOTDLL_OBJECTS = & + $(OBJS)\plotdll_dummy.obj & + $(OBJS)\plotdll_plot.obj +PLOTLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=..\..\src\plot\..\..\..\include -i=$(LIBDIRNAME) & + -i=..\..\src\plot\..\..\..\src\tiff -i=..\..\src\plot\..\..\..\src\jpeg & + -i=..\..\src\plot\..\..\..\src\png -i=..\..\src\plot\..\..\..\src\zlib & + -i=..\..\src\plot\..\..\..\src\regex & + -i=..\..\src\plot\..\..\..\src\expat\lib -i=..\..\src\plot\..\..\include & + $(CXXFLAGS) /fh=$(OBJS)\wxprec_plotlib.pch +PLOTLIB_OBJECTS = & + $(OBJS)\plotlib_dummy.obj & + $(OBJS)\plotlib_plot.obj + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(__plotdll___depname) $(__plotlib___depname) + +$(OBJS)\plotdll_dummy.obj : .AUTODEPEND ../../src/plot\..\..\..\src\msw\dummy.cpp + $(CXX) -zq -fo=$^@ $(PLOTDLL_CXXFLAGS) $< + +$(OBJS)\plotdll_plot.obj : .AUTODEPEND ../../src/plot\plot.cpp + $(CXX) -zq -fo=$^@ $(PLOTDLL_CXXFLAGS) $< + +$(OBJS)\plotlib_dummy.obj : .AUTODEPEND ../../src/plot\..\..\..\src\msw\dummy.cpp + $(CXX) -zq -fo=$^@ $(PLOTLIB_CXXFLAGS) $< + +$(OBJS)\plotlib_plot.obj : .AUTODEPEND ../../src/plot\plot.cpp + $(CXX) -zq -fo=$^@ $(PLOTLIB_CXXFLAGS) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib + +!ifeq SHARED 1 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_wat$(VENDORTAG).dll : $(PLOTDLL_OBJECTS) + @%create $(OBJS)\plotdll.lbc + @%append $(OBJS)\plotdll.lbc option quiet + @%append $(OBJS)\plotdll.lbc name $^@ + @%append $(OBJS)\plotdll.lbc option incremental + @%append $(OBJS)\plotdll.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) + @for %i in ($(PLOTDLL_OBJECTS)) do @%append $(OBJS)\plotdll.lbc file %i + @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\plotdll.lbc library %i + @%append $(OBJS)\plotdll.lbc + @%append $(OBJS)\plotdll.lbc system nt_dll + wlink @$(OBJS)\plotdll.lbc + wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib +$^@ +!endif + +!ifeq SHARED 0 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib : $(PLOTLIB_OBJECTS) + @%create $(OBJS)\plotlib.lbc + @for %i in ($(PLOTLIB_OBJECTS)) do @%append $(OBJS)\plotlib.lbc +%i + wlib -q -p2048 -n -b $^@ @$(OBJS)\plotlib.lbc +!endif diff --git a/contrib/build/plot/plot.bkl b/contrib/build/plot/plot.bkl new file mode 100644 index 0000000000..90b6d925f8 --- /dev/null +++ b/contrib/build/plot/plot.bkl @@ -0,0 +1,37 @@ + + + + + + + + + plot.cpp + + + + + wx/plot/plot.h + wx/plot/plot_dwn.bmp + wx/plot/plot_enl.bmp + wx/plot/plot_shr.bmp + wx/plot/plot_up.bmp + wx/plot/plot_zin.bmp + wx/plot/plot_zot.bmp + wx/plot/wxplot.rc + + + + + WXUSINGDLL + WXMAKINGDLL_PLOT + $(PLOT_SRC) + core + base + + + + $(PLOT_SRC) + + + diff --git a/contrib/build/plot/plot.dsw b/contrib/build/plot/plot.dsw new file mode 100644 index 0000000000..a129415e52 --- /dev/null +++ b/contrib/build/plot/plot.dsw @@ -0,0 +1,28 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### +Project: "plotdll"=plot_plotdll.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "plotlib"=plot_plotlib.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + diff --git a/contrib/build/plot/plot_plotdll.dsp b/contrib/build/plot/plot_plotdll.dsp new file mode 100644 index 0000000000..bdb2c5b1eb --- /dev/null +++ b/contrib/build/plot/plot_plotdll.dsp @@ -0,0 +1,266 @@ +# Microsoft Developer Studio Project File - Name="plotdll" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=plotdll - Win32 DLL Native Debug Unicode +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "plot_plotdll.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "plot_plotdll.mak" CFG="plotdll - Win32 DLL Native Debug Unicode" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "plotdll - Win32 DLL Native Debug Unicode" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "plotdll - Win32 DLL Native Release Ansi" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "plotdll - Win32 DLL wxUniv Debug Unicode" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "plotdll - Win32 DLL wxUniv Release Unicode" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "plotdll - Win32 DLL Native Debug Ansi" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "plotdll - Win32 DLL wxUniv Release Ansi" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "plotdll - Win32 DLL wxUniv Debug Ansi" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "plotdll - Win32 DLL Native Release Unicode" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "plotdll - Win32 DLL Native Debug Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswuddll" +# PROP BASE Intermediate_Dir "vc_mswuddll\plotdll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswuddll" +# PROP Intermediate_Dir "vc_mswuddll\plotdll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswuddll" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_plotdll.pch" /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_mswuddll\wxmsw250ud_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswuddll" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_plotdll.pch" /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_mswuddll\wxmsw250ud_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\plot\..\..\..\include" /i "..\..\src\plot\..\..\..\lib\vc_mswuddll" /i "..\..\src\plot\..\..\..\src\tiff" /i "..\..\src\plot\..\..\..\src\jpeg" /i "..\..\src\plot\..\..\..\src\png" /i "..\..\src\plot\..\..\..\src\zlib" /i "..\..\src\plot\..\..\..\src\regex" /i "..\..\src\plot\..\..\..\src\expat\lib" /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\plot\..\..\..\include" /i "..\..\src\plot\..\..\..\lib\vc_mswuddll" /i "..\..\src\plot\..\..\..\src\tiff" /i "..\..\src\plot\..\..\..\src\jpeg" /i "..\..\src\plot\..\..\..\src\png" /i "..\..\src\plot\..\..\..\src\zlib" /i "..\..\src\plot\..\..\..\src\regex" /i "..\..\src\plot\..\..\..\src\expat\lib" /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_mswuddll\wxmsw250ud_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_mswuddll" /implib:"..\..\src\plot\..\..\..\lib\vc_mswuddll\wxmsw25ud_plot.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_mswuddll\wxmsw250ud_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_mswuddll" /implib:"..\..\src\plot\..\..\..\lib\vc_mswuddll\wxmsw25ud_plot.lib" /debug + +!ELSEIF "$(CFG)" == "plotdll - Win32 DLL Native Release Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswdll" +# PROP BASE Intermediate_Dir "vc_mswdll\plotdll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswdll" +# PROP Intermediate_Dir "vc_mswdll\plotdll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswdll" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_plotdll.pch" /Fd..\..\src\plot\..\..\..\lib\vc_mswdll\wxmsw250_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswdll" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_plotdll.pch" /Fd..\..\src\plot\..\..\..\lib\vc_mswdll\wxmsw250_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\plot\..\..\..\include" /i "..\..\src\plot\..\..\..\lib\vc_mswdll" /i "..\..\src\plot\..\..\..\src\tiff" /i "..\..\src\plot\..\..\..\src\jpeg" /i "..\..\src\plot\..\..\..\src\png" /i "..\..\src\plot\..\..\..\src\zlib" /i "..\..\src\plot\..\..\..\src\regex" /i "..\..\src\plot\..\..\..\src\expat\lib" /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT +# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\plot\..\..\..\include" /i "..\..\src\plot\..\..\..\lib\vc_mswdll" /i "..\..\src\plot\..\..\..\src\tiff" /i "..\..\src\plot\..\..\..\src\jpeg" /i "..\..\src\plot\..\..\..\src\png" /i "..\..\src\plot\..\..\..\src\zlib" /i "..\..\src\plot\..\..\..\src\regex" /i "..\..\src\plot\..\..\..\src\expat\lib" /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_mswdll\wxmsw250_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_mswdll" /implib:"..\..\src\plot\..\..\..\lib\vc_mswdll\wxmsw25_plot.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_mswdll\wxmsw250_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_mswdll" /implib:"..\..\src\plot\..\..\..\lib\vc_mswdll\wxmsw25_plot.lib" + +!ELSEIF "$(CFG)" == "plotdll - Win32 DLL wxUniv Debug Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswunivuddll" +# PROP BASE Intermediate_Dir "vc_mswunivuddll\plotdll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswunivuddll" +# PROP Intermediate_Dir "vc_mswunivuddll\plotdll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswunivuddll" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_plotdll.pch" /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswunivuddll" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_plotdll.pch" /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\plot\..\..\..\include" /i "..\..\src\plot\..\..\..\lib\vc_mswunivuddll" /i "..\..\src\plot\..\..\..\src\tiff" /i "..\..\src\plot\..\..\..\src\jpeg" /i "..\..\src\plot\..\..\..\src\png" /i "..\..\src\plot\..\..\..\src\zlib" /i "..\..\src\plot\..\..\..\src\regex" /i "..\..\src\plot\..\..\..\src\expat\lib" /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\plot\..\..\..\include" /i "..\..\src\plot\..\..\..\lib\vc_mswunivuddll" /i "..\..\src\plot\..\..\..\src\tiff" /i "..\..\src\plot\..\..\..\src\jpeg" /i "..\..\src\plot\..\..\..\src\png" /i "..\..\src\plot\..\..\..\src\zlib" /i "..\..\src\plot\..\..\..\src\regex" /i "..\..\src\plot\..\..\..\src\expat\lib" /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_mswunivuddll" /implib:"..\..\src\plot\..\..\..\lib\vc_mswunivuddll\wxmswuniv25ud_plot.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_mswunivuddll" /implib:"..\..\src\plot\..\..\..\lib\vc_mswunivuddll\wxmswuniv25ud_plot.lib" /debug + +!ELSEIF "$(CFG)" == "plotdll - Win32 DLL wxUniv Release Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswunivudll" +# PROP BASE Intermediate_Dir "vc_mswunivudll\plotdll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswunivudll" +# PROP Intermediate_Dir "vc_mswunivudll\plotdll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswunivudll" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_plotdll.pch" /Fd..\..\src\plot\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswunivudll" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_plotdll.pch" /Fd..\..\src\plot\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\plot\..\..\..\include" /i "..\..\src\plot\..\..\..\lib\vc_mswunivudll" /i "..\..\src\plot\..\..\..\src\tiff" /i "..\..\src\plot\..\..\..\src\jpeg" /i "..\..\src\plot\..\..\..\src\png" /i "..\..\src\plot\..\..\..\src\zlib" /i "..\..\src\plot\..\..\..\src\regex" /i "..\..\src\plot\..\..\..\src\expat\lib" /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT +# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\plot\..\..\..\include" /i "..\..\src\plot\..\..\..\lib\vc_mswunivudll" /i "..\..\src\plot\..\..\..\src\tiff" /i "..\..\src\plot\..\..\..\src\jpeg" /i "..\..\src\plot\..\..\..\src\png" /i "..\..\src\plot\..\..\..\src\zlib" /i "..\..\src\plot\..\..\..\src\regex" /i "..\..\src\plot\..\..\..\src\expat\lib" /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_mswunivudll" /implib:"..\..\src\plot\..\..\..\lib\vc_mswunivudll\wxmswuniv25u_plot.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_mswunivudll" /implib:"..\..\src\plot\..\..\..\lib\vc_mswunivudll\wxmswuniv25u_plot.lib" + +!ELSEIF "$(CFG)" == "plotdll - Win32 DLL Native Debug Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswddll" +# PROP BASE Intermediate_Dir "vc_mswddll\plotdll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswddll" +# PROP Intermediate_Dir "vc_mswddll\plotdll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswddll" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_plotdll.pch" /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_mswddll\wxmsw250d_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswddll" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_plotdll.pch" /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_mswddll\wxmsw250d_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\plot\..\..\..\include" /i "..\..\src\plot\..\..\..\lib\vc_mswddll" /i "..\..\src\plot\..\..\..\src\tiff" /i "..\..\src\plot\..\..\..\src\jpeg" /i "..\..\src\plot\..\..\..\src\png" /i "..\..\src\plot\..\..\..\src\zlib" /i "..\..\src\plot\..\..\..\src\regex" /i "..\..\src\plot\..\..\..\src\expat\lib" /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\plot\..\..\..\include" /i "..\..\src\plot\..\..\..\lib\vc_mswddll" /i "..\..\src\plot\..\..\..\src\tiff" /i "..\..\src\plot\..\..\..\src\jpeg" /i "..\..\src\plot\..\..\..\src\png" /i "..\..\src\plot\..\..\..\src\zlib" /i "..\..\src\plot\..\..\..\src\regex" /i "..\..\src\plot\..\..\..\src\expat\lib" /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_mswddll\wxmsw250d_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_mswddll" /implib:"..\..\src\plot\..\..\..\lib\vc_mswddll\wxmsw25d_plot.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_mswddll\wxmsw250d_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_mswddll" /implib:"..\..\src\plot\..\..\..\lib\vc_mswddll\wxmsw25d_plot.lib" /debug + +!ELSEIF "$(CFG)" == "plotdll - Win32 DLL wxUniv Release Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswunivdll" +# PROP BASE Intermediate_Dir "vc_mswunivdll\plotdll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswunivdll" +# PROP Intermediate_Dir "vc_mswunivdll\plotdll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswunivdll" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_plotdll.pch" /Fd..\..\src\plot\..\..\..\lib\vc_mswunivdll\wxmswuniv250_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswunivdll" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_plotdll.pch" /Fd..\..\src\plot\..\..\..\lib\vc_mswunivdll\wxmswuniv250_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\plot\..\..\..\include" /i "..\..\src\plot\..\..\..\lib\vc_mswunivdll" /i "..\..\src\plot\..\..\..\src\tiff" /i "..\..\src\plot\..\..\..\src\jpeg" /i "..\..\src\plot\..\..\..\src\png" /i "..\..\src\plot\..\..\..\src\zlib" /i "..\..\src\plot\..\..\..\src\regex" /i "..\..\src\plot\..\..\..\src\expat\lib" /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT +# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\plot\..\..\..\include" /i "..\..\src\plot\..\..\..\lib\vc_mswunivdll" /i "..\..\src\plot\..\..\..\src\tiff" /i "..\..\src\plot\..\..\..\src\jpeg" /i "..\..\src\plot\..\..\..\src\png" /i "..\..\src\plot\..\..\..\src\zlib" /i "..\..\src\plot\..\..\..\src\regex" /i "..\..\src\plot\..\..\..\src\expat\lib" /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_mswunivdll\wxmswuniv250_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_mswunivdll" /implib:"..\..\src\plot\..\..\..\lib\vc_mswunivdll\wxmswuniv25_plot.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_mswunivdll\wxmswuniv250_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_mswunivdll" /implib:"..\..\src\plot\..\..\..\lib\vc_mswunivdll\wxmswuniv25_plot.lib" + +!ELSEIF "$(CFG)" == "plotdll - Win32 DLL wxUniv Debug Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswunivddll" +# PROP BASE Intermediate_Dir "vc_mswunivddll\plotdll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswunivddll" +# PROP Intermediate_Dir "vc_mswunivddll\plotdll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswunivddll" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_plotdll.pch" /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswunivddll" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_plotdll.pch" /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\plot\..\..\..\include" /i "..\..\src\plot\..\..\..\lib\vc_mswunivddll" /i "..\..\src\plot\..\..\..\src\tiff" /i "..\..\src\plot\..\..\..\src\jpeg" /i "..\..\src\plot\..\..\..\src\png" /i "..\..\src\plot\..\..\..\src\zlib" /i "..\..\src\plot\..\..\..\src\regex" /i "..\..\src\plot\..\..\..\src\expat\lib" /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\plot\..\..\..\include" /i "..\..\src\plot\..\..\..\lib\vc_mswunivddll" /i "..\..\src\plot\..\..\..\src\tiff" /i "..\..\src\plot\..\..\..\src\jpeg" /i "..\..\src\plot\..\..\..\src\png" /i "..\..\src\plot\..\..\..\src\zlib" /i "..\..\src\plot\..\..\..\src\regex" /i "..\..\src\plot\..\..\..\src\expat\lib" /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_mswunivddll" /implib:"..\..\src\plot\..\..\..\lib\vc_mswunivddll\wxmswuniv25d_plot.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_mswunivddll" /implib:"..\..\src\plot\..\..\..\lib\vc_mswunivddll\wxmswuniv25d_plot.lib" /debug + +!ELSEIF "$(CFG)" == "plotdll - Win32 DLL Native Release Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswudll" +# PROP BASE Intermediate_Dir "vc_mswudll\plotdll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswudll" +# PROP Intermediate_Dir "vc_mswudll\plotdll" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswudll" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_plotdll.pch" /Fd..\..\src\plot\..\..\..\lib\vc_mswudll\wxmsw250u_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswudll" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_plotdll.pch" /Fd..\..\src\plot\..\..\..\lib\vc_mswudll\wxmsw250u_plot_vc_custom.pdb /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_PLOT" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\plot\..\..\..\include" /i "..\..\src\plot\..\..\..\lib\vc_mswudll" /i "..\..\src\plot\..\..\..\src\tiff" /i "..\..\src\plot\..\..\..\src\jpeg" /i "..\..\src\plot\..\..\..\src\png" /i "..\..\src\plot\..\..\..\src\zlib" /i "..\..\src\plot\..\..\..\src\regex" /i "..\..\src\plot\..\..\..\src\expat\lib" /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT +# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\plot\..\..\..\include" /i "..\..\src\plot\..\..\..\lib\vc_mswudll" /i "..\..\src\plot\..\..\..\src\tiff" /i "..\..\src\plot\..\..\..\src\jpeg" /i "..\..\src\plot\..\..\..\src\png" /i "..\..\src\plot\..\..\..\src\zlib" /i "..\..\src\plot\..\..\..\src\regex" /i "..\..\src\plot\..\..\..\src\expat\lib" /i "..\..\src\plot\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_PLOT +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_mswudll\wxmsw250u_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_mswudll" /implib:"..\..\src\plot\..\..\..\lib\vc_mswudll\wxmsw25u_plot.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\plot\..\..\..\lib\vc_mswudll\wxmsw250u_plot_vc_custom.dll" /libpath:"..\..\src\plot\..\..\..\lib\vc_mswudll" /implib:"..\..\src\plot\..\..\..\lib\vc_mswudll\wxmsw25u_plot.lib" + +!ENDIF + +# Begin Target + +# Name "plotdll - Win32 DLL Native Debug Unicode" +# Name "plotdll - Win32 DLL Native Release Ansi" +# Name "plotdll - Win32 DLL wxUniv Debug Unicode" +# Name "plotdll - Win32 DLL wxUniv Release Unicode" +# Name "plotdll - Win32 DLL Native Debug Ansi" +# Name "plotdll - Win32 DLL wxUniv Release Ansi" +# Name "plotdll - Win32 DLL wxUniv Debug Ansi" +# Name "plotdll - Win32 DLL Native Release Unicode" +# Begin Group "Source Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=../../src/plot\..\..\..\src\msw\dummy.cpp +# ADD BASE CPP /Yc"wx/wxprec.h" +# ADD CPP /Yc"wx/wxprec.h" +# End Source File +# Begin Source File + +SOURCE=../../src/plot\plot.cpp +# End Source File +# End Group +# End Target +# End Project + diff --git a/contrib/build/plot/plot_plotlib.dsp b/contrib/build/plot/plot_plotlib.dsp new file mode 100644 index 0000000000..2886ca9433 --- /dev/null +++ b/contrib/build/plot/plot_plotlib.dsp @@ -0,0 +1,249 @@ +# Microsoft Developer Studio Project File - Name="plotlib" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=plotlib - Win32 LIB wxUniv Release Ansi +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "plot_plotlib.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "plot_plotlib.mak" CFG="plotlib - Win32 LIB wxUniv Release Ansi" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "plotlib - Win32 LIB wxUniv Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "plotlib - Win32 LIB Native Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "plotlib - Win32 LIB wxUniv Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "plotlib - Win32 LIB Native Release Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE "plotlib - Win32 LIB Native Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "plotlib - Win32 LIB wxUniv Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "plotlib - Win32 LIB wxUniv Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "plotlib - Win32 LIB Native Debug Ansi" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "plotlib - Win32 LIB wxUniv Release Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswuniv" +# PROP BASE Intermediate_Dir "vc_mswuniv\plotlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswuniv" +# PROP Intermediate_Dir "vc_mswuniv\plotlib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswuniv" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Fd..\..\src\plot\..\..\..\lib\vc_mswuniv\wxmswuniv25_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswuniv" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Fd..\..\src\plot\..\..\..\lib\vc_mswuniv\wxmswuniv25_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_mswuniv\wxmswuniv25_plot.lib" +# ADD LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_mswuniv\wxmswuniv25_plot.lib" + +!ELSEIF "$(CFG)" == "plotlib - Win32 LIB Native Release Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswu" +# PROP BASE Intermediate_Dir "vc_mswu\plotlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswu" +# PROP Intermediate_Dir "vc_mswu\plotlib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswu" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Fd..\..\src\plot\..\..\..\lib\vc_mswu\wxmsw25u_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswu" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Fd..\..\src\plot\..\..\..\lib\vc_mswu\wxmsw25u_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_mswu\wxmsw25u_plot.lib" +# ADD LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_mswu\wxmsw25u_plot.lib" + +!ELSEIF "$(CFG)" == "plotlib - Win32 LIB wxUniv Debug Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswunivd" +# PROP BASE Intermediate_Dir "vc_mswunivd\plotlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswunivd" +# PROP Intermediate_Dir "vc_mswunivd\plotlib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswunivd" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_mswunivd\wxmswuniv25d_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswunivd" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_mswunivd\wxmswuniv25d_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_mswunivd\wxmswuniv25d_plot.lib" +# ADD LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_mswunivd\wxmswuniv25d_plot.lib" + +!ELSEIF "$(CFG)" == "plotlib - Win32 LIB Native Release Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_msw" +# PROP BASE Intermediate_Dir "vc_msw\plotlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_msw" +# PROP Intermediate_Dir "vc_msw\plotlib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_msw" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Fd..\..\src\plot\..\..\..\lib\vc_msw\wxmsw25_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_msw" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Fd..\..\src\plot\..\..\..\lib\vc_msw\wxmsw25_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_msw\wxmsw25_plot.lib" +# ADD LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_msw\wxmsw25_plot.lib" + +!ELSEIF "$(CFG)" == "plotlib - Win32 LIB Native Debug Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswud" +# PROP BASE Intermediate_Dir "vc_mswud\plotlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswud" +# PROP Intermediate_Dir "vc_mswud\plotlib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswud" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_mswud\wxmsw25ud_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswud" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_mswud\wxmsw25ud_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_mswud\wxmsw25ud_plot.lib" +# ADD LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_mswud\wxmsw25ud_plot.lib" + +!ELSEIF "$(CFG)" == "plotlib - Win32 LIB wxUniv Release Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswunivu" +# PROP BASE Intermediate_Dir "vc_mswunivu\plotlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswunivu" +# PROP Intermediate_Dir "vc_mswunivu\plotlib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswunivu" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Fd..\..\src\plot\..\..\..\lib\vc_mswunivu\wxmswuniv25u_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswunivu" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Fd..\..\src\plot\..\..\..\lib\vc_mswunivu\wxmswuniv25u_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_mswunivu\wxmswuniv25u_plot.lib" +# ADD LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_mswunivu\wxmswuniv25u_plot.lib" + +!ELSEIF "$(CFG)" == "plotlib - Win32 LIB wxUniv Debug Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswunivud" +# PROP BASE Intermediate_Dir "vc_mswunivud\plotlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswunivud" +# PROP Intermediate_Dir "vc_mswunivud\plotlib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswunivud" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswunivud" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_plot.lib" +# ADD LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_plot.lib" + +!ELSEIF "$(CFG)" == "plotlib - Win32 LIB Native Debug Ansi" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswd" +# PROP BASE Intermediate_Dir "vc_mswd\plotlib" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src\plot\..\..\..\lib\vc_mswd" +# PROP Intermediate_Dir "vc_mswd\plotlib" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswd" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_mswd\wxmsw25d_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c +# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\plot\..\..\..\include" /I "..\..\src\plot\..\..\..\lib\vc_mswd" /I "..\..\src\plot\..\..\..\src\tiff" /I "..\..\src\plot\..\..\..\src\jpeg" /I "..\..\src\plot\..\..\..\src\png" /I "..\..\src\plot\..\..\..\src\zlib" /I "..\..\src\plot\..\..\..\src\regex" /I "..\..\src\plot\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\plot\..\..\..\lib\vc_mswd\wxmsw25d_plot.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_plotlib.pch" /I "..\..\src\plot\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c +# ADD BASE RSC /l 0x405 +# ADD RSC /l 0x405 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_mswd\wxmsw25d_plot.lib" +# ADD LIB32 /nologo /out:"..\..\src\plot\..\..\..\lib\vc_mswd\wxmsw25d_plot.lib" + +!ENDIF + +# Begin Target + +# Name "plotlib - Win32 LIB wxUniv Release Ansi" +# Name "plotlib - Win32 LIB Native Release Unicode" +# Name "plotlib - Win32 LIB wxUniv Debug Ansi" +# Name "plotlib - Win32 LIB Native Release Ansi" +# Name "plotlib - Win32 LIB Native Debug Unicode" +# Name "plotlib - Win32 LIB wxUniv Release Unicode" +# Name "plotlib - Win32 LIB wxUniv Debug Unicode" +# Name "plotlib - Win32 LIB Native Debug Ansi" +# Begin Group "Source Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=../../src/plot\..\..\..\src\msw\dummy.cpp +# ADD BASE CPP /Yc"wx/wxprec.h" +# ADD CPP /Yc"wx/wxprec.h" +# End Source File +# Begin Source File + +SOURCE=../../src/plot\plot.cpp +# End Source File +# End Group +# End Target +# End Project + diff --git a/contrib/include/wx/deprecated/prop.h b/contrib/include/wx/deprecated/prop.h index 8882220e2f..5d3f0e09c0 100644 --- a/contrib/include/wx/deprecated/prop.h +++ b/contrib/include/wx/deprecated/prop.h @@ -43,7 +43,7 @@ class wxPropertyValidatorRegistry; #define wxPROPERTY_VERSION 2.0 // A storable sheet of values -class WXDLLEXPORT wxPropertySheet: public wxObject +class WXDLLIMPEXP_DEPRECATED wxPropertySheet: public wxObject { public: wxPropertySheet(const wxString& name = wxT("")); @@ -91,7 +91,7 @@ private: // Base class for property sheet views. There are currently two directly derived // classes: wxPropertyListView, and wxPropertyFormView. -class WXDLLEXPORT wxPropertyView: public wxEvtHandler +class WXDLLIMPEXP_DEPRECATED wxPropertyView: public wxEvtHandler { public: wxPropertyView(long flags = 0); @@ -131,7 +131,7 @@ private: }; -class WXDLLEXPORT wxPropertyValidator: public wxEvtHandler +class WXDLLIMPEXP_DEPRECATED wxPropertyValidator: public wxEvtHandler { public: wxPropertyValidator(long flags = 0); @@ -161,7 +161,7 @@ private: // extern wxPropertyValidator *wxDefaultPropertyValidator; -class WXDLLEXPORT wxPropertyValidatorRegistry: public wxHashTable +class WXDLLIMPEXP_DEPRECATED wxPropertyValidatorRegistry: public wxHashTable { public: wxPropertyValidatorRegistry(); @@ -192,7 +192,7 @@ typedef enum { wxPropertyValueStringPtr } wxPropertyValueType; -class WXDLLEXPORT wxPropertyValue: public wxObject +class WXDLLIMPEXP_DEPRECATED wxPropertyValue: public wxObject { DECLARE_DYNAMIC_CLASS(wxPropertyValue) @@ -307,7 +307,7 @@ class WXDLLEXPORT wxPropertyValue: public wxObject * Property class: contains a name and a value. */ -class WXDLLEXPORT wxProperty: public wxObject +class WXDLLIMPEXP_DEPRECATED wxProperty: public wxObject { DECLARE_DYNAMIC_CLASS(wxProperty) protected: diff --git a/contrib/include/wx/deprecated/propform.h b/contrib/include/wx/deprecated/propform.h index dabcc80eb0..0ef8e2ca08 100644 --- a/contrib/include/wx/deprecated/propform.h +++ b/contrib/include/wx/deprecated/propform.h @@ -23,7 +23,7 @@ #include "wx/deprecated/prop.h" #include "wx/panel.h" -class WXDLLEXPORT wxPropertyFormView; +class WXDLLIMPEXP_DEPRECATED wxPropertyFormView; //// //// Property form classes: for using an existing dialog or panel @@ -33,7 +33,7 @@ class WXDLLEXPORT wxPropertyFormView; #define wxID_PROP_UPDATE 3101 // Mediates between a physical panel and the property sheet -class WXDLLEXPORT wxPropertyFormView: public wxPropertyView +class WXDLLIMPEXP_DEPRECATED wxPropertyFormView: public wxPropertyView { DECLARE_DYNAMIC_CLASS(wxPropertyFormView) public: @@ -120,7 +120,7 @@ DECLARE_EVENT_TABLE() * assocated with a window. It's that kinda thing. */ -class WXDLLEXPORT wxPropertyFormValidator: public wxPropertyValidator +class WXDLLIMPEXP_DEPRECATED wxPropertyFormValidator: public wxPropertyValidator { DECLARE_DYNAMIC_CLASS(wxPropertyFormValidator) protected: @@ -161,7 +161,7 @@ private: * Some default validators */ -class WXDLLEXPORT wxRealFormValidator: public wxPropertyFormValidator +class WXDLLIMPEXP_DEPRECATED wxRealFormValidator: public wxPropertyFormValidator { DECLARE_DYNAMIC_CLASS(wxRealFormValidator) public: @@ -182,7 +182,7 @@ class WXDLLEXPORT wxRealFormValidator: public wxPropertyFormValidator float m_realMax; }; -class WXDLLEXPORT wxIntegerFormValidator: public wxPropertyFormValidator +class WXDLLIMPEXP_DEPRECATED wxIntegerFormValidator: public wxPropertyFormValidator { DECLARE_DYNAMIC_CLASS(wxIntegerFormValidator) public: @@ -202,7 +202,7 @@ class WXDLLEXPORT wxIntegerFormValidator: public wxPropertyFormValidator long m_integerMax; }; -class WXDLLEXPORT wxBoolFormValidator: public wxPropertyFormValidator +class WXDLLIMPEXP_DEPRECATED wxBoolFormValidator: public wxPropertyFormValidator { DECLARE_DYNAMIC_CLASS(wxBoolFormValidator) protected: @@ -217,7 +217,7 @@ class WXDLLEXPORT wxBoolFormValidator: public wxPropertyFormValidator bool OnDisplayValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow); }; -class WXDLLEXPORT wxStringFormValidator: public wxPropertyFormValidator +class WXDLLIMPEXP_DEPRECATED wxStringFormValidator: public wxPropertyFormValidator { DECLARE_DYNAMIC_CLASS(wxStringFormValidator) public: @@ -241,7 +241,7 @@ class WXDLLEXPORT wxStringFormValidator: public wxPropertyFormValidator * A default dialog box class to use. */ -class WXDLLEXPORT wxPropertyFormDialog: public wxDialog +class WXDLLIMPEXP_DEPRECATED wxPropertyFormDialog: public wxDialog { public: wxPropertyFormDialog(wxPropertyFormView *v = NULL, @@ -270,7 +270,7 @@ private: * A default panel class to use. */ -class WXDLLEXPORT wxPropertyFormPanel: public wxPanel +class WXDLLIMPEXP_DEPRECATED wxPropertyFormPanel: public wxPanel { public: wxPropertyFormPanel(wxPropertyFormView *v = NULL, @@ -301,7 +301,7 @@ private: * A default frame class to use. */ -class WXDLLEXPORT wxPropertyFormFrame: public wxFrame +class WXDLLIMPEXP_DEPRECATED wxPropertyFormFrame: public wxFrame { public: wxPropertyFormFrame(wxPropertyFormView *v = NULL, diff --git a/contrib/include/wx/deprecated/proplist.h b/contrib/include/wx/deprecated/proplist.h index 02c874e532..aa7667f22a 100644 --- a/contrib/include/wx/deprecated/proplist.h +++ b/contrib/include/wx/deprecated/proplist.h @@ -78,7 +78,7 @@ #define wxID_PROP_VALUE_SELECT 3005 // Mediates between a physical panel and the property sheet -class WXDLLEXPORT wxPropertyListView: public wxPropertyView +class WXDLLIMPEXP_DEPRECATED wxPropertyListView: public wxPropertyView { public: wxPropertyListView(wxPanel *propPanel = NULL, long flags = wxPROP_BUTTON_DEFAULT); @@ -195,7 +195,7 @@ private: { wxPropertyView::ShowView(propertySheet, window); }; }; -class WXDLLEXPORT wxPropertyTextEdit: public wxTextCtrl +class WXDLLIMPEXP_DEPRECATED wxPropertyTextEdit: public wxTextCtrl { public: wxPropertyTextEdit(wxPropertyListView *v = NULL, @@ -222,7 +222,7 @@ private: * The type of validator used for property lists (Visual Basic style) */ -class WXDLLEXPORT wxPropertyListValidator: public wxPropertyValidator +class WXDLLIMPEXP_DEPRECATED wxPropertyListValidator: public wxPropertyValidator { public: wxPropertyListValidator(long flags = wxPROP_ALLOW_TEXT_EDITING): wxPropertyValidator(flags) { } @@ -285,7 +285,7 @@ private: * A default dialog box class to use. */ -class WXDLLEXPORT wxPropertyListDialog: public wxDialog +class WXDLLIMPEXP_DEPRECATED wxPropertyListDialog: public wxDialog { public: wxPropertyListDialog(wxPropertyListView *v = NULL, @@ -315,7 +315,7 @@ private: * A default panel class to use. */ -class WXDLLEXPORT wxPropertyListPanel: public wxPanel +class WXDLLIMPEXP_DEPRECATED wxPropertyListPanel: public wxPanel { public: wxPropertyListPanel(wxPropertyListView *v = NULL, @@ -352,7 +352,7 @@ private: * A default frame class to use. */ -class WXDLLEXPORT wxPropertyListFrame: public wxFrame +class WXDLLIMPEXP_DEPRECATED wxPropertyListFrame: public wxFrame { public: wxPropertyListFrame(wxPropertyListView *v = NULL, @@ -388,7 +388,7 @@ private: * Some default validators */ -class WXDLLEXPORT wxRealListValidator: public wxPropertyListValidator +class WXDLLIMPEXP_DEPRECATED wxRealListValidator: public wxPropertyListValidator { public: // 0.0, 0.0 means no range @@ -415,7 +415,7 @@ private: DECLARE_DYNAMIC_CLASS(wxRealListValidator) }; -class WXDLLEXPORT wxIntegerListValidator: public wxPropertyListValidator +class WXDLLIMPEXP_DEPRECATED wxIntegerListValidator: public wxPropertyListValidator { public: // 0, 0 means no range @@ -444,7 +444,7 @@ private: DECLARE_DYNAMIC_CLASS(wxIntegerListValidator) }; -class WXDLLEXPORT wxBoolListValidator: public wxPropertyListValidator +class WXDLLIMPEXP_DEPRECATED wxBoolListValidator: public wxPropertyListValidator { public: wxBoolListValidator(long flags = 0):wxPropertyListValidator(flags) {} @@ -472,7 +472,7 @@ private: DECLARE_DYNAMIC_CLASS(wxBoolListValidator) }; -class WXDLLEXPORT wxStringListValidator: public wxPropertyListValidator +class WXDLLIMPEXP_DEPRECATED wxStringListValidator: public wxPropertyListValidator { public: wxStringListValidator(wxStringList *list = NULL, long flags = 0); @@ -508,7 +508,7 @@ private: DECLARE_DYNAMIC_CLASS(wxStringListValidator) }; -class WXDLLEXPORT wxFilenameListValidator: public wxPropertyListValidator +class WXDLLIMPEXP_DEPRECATED wxFilenameListValidator: public wxPropertyListValidator { public: wxFilenameListValidator(wxString message = wxT("Select a file"), wxString wildcard = wxALL_FILES_PATTERN, long flags = 0); @@ -539,7 +539,7 @@ private: DECLARE_DYNAMIC_CLASS(wxFilenameListValidator) }; -class WXDLLEXPORT wxColourListValidator: public wxPropertyListValidator +class WXDLLIMPEXP_DEPRECATED wxColourListValidator: public wxPropertyListValidator { public: wxColourListValidator(long flags = 0); @@ -560,7 +560,7 @@ private: DECLARE_DYNAMIC_CLASS(wxColourListValidator) }; -class WXDLLEXPORT wxListOfStringsListValidator: public wxPropertyListValidator +class WXDLLIMPEXP_DEPRECATED wxListOfStringsListValidator: public wxPropertyListValidator { public: wxListOfStringsListValidator(long flags = 0); diff --git a/contrib/include/wx/deprecated/resource.h b/contrib/include/wx/deprecated/resource.h index ea71779250..48f1255630 100644 --- a/contrib/include/wx/deprecated/resource.h +++ b/contrib/include/wx/deprecated/resource.h @@ -59,7 +59,7 @@ class WXDLLEXPORT wxInputStream; * Internal format for control/panel item */ -class WXDLLEXPORT wxItemResource: public wxObject +class WXDLLIMPEXP_DEPRECATED wxItemResource: public wxObject { DECLARE_DYNAMIC_CLASS(wxItemResource) @@ -139,7 +139,7 @@ class WXDLLEXPORT wxItemResource: public wxObject * Resource table (normally only one of these) */ -class WXDLLEXPORT wxResourceTable: public wxHashTable +class WXDLLIMPEXP_DEPRECATED wxResourceTable: public wxHashTable { DECLARE_DYNAMIC_CLASS(wxResourceTable) @@ -169,37 +169,37 @@ class WXDLLEXPORT wxResourceTable: public wxHashTable virtual void ClearTable(); }; -WXDLLEXPORT extern void wxInitializeResourceSystem(); -WXDLLEXPORT extern void wxCleanUpResourceSystem(); +WXDLLIMPEXP_DEPRECATED extern void wxInitializeResourceSystem(); +WXDLLIMPEXP_DEPRECATED extern void wxCleanUpResourceSystem(); -WXDLLEXPORT_DATA(extern wxResourceTable*) wxDefaultResourceTable; -WXDLLEXPORT extern long wxParseWindowStyle(const wxString& style); +WXDLLIMPEXP_DATA_DEPRECATED(extern wxResourceTable*) wxDefaultResourceTable; +WXDLLIMPEXP_DEPRECATED extern long wxParseWindowStyle(const wxString& style); class WXDLLEXPORT wxMenuBar; class WXDLLEXPORT wxMenu; class WXDLLEXPORT wxBitmap; class WXDLLEXPORT wxIcon; -WXDLLEXPORT extern wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table = (wxResourceTable *) NULL); -WXDLLEXPORT extern wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table = (wxResourceTable *) NULL); -WXDLLEXPORT extern wxMenuBar* wxResourceCreateMenuBar(const wxString& resource, wxResourceTable *table = (wxResourceTable *) NULL, wxMenuBar *menuBar = (wxMenuBar *) NULL); -WXDLLEXPORT extern wxMenu* wxResourceCreateMenu(const wxString& resource, wxResourceTable *table = (wxResourceTable *) NULL); -WXDLLEXPORT extern bool wxResourceParseData(const wxString& resource, wxResourceTable *table = (wxResourceTable *) NULL); -WXDLLEXPORT extern bool wxResourceParseData(const char* resource, wxResourceTable *table = (wxResourceTable *) NULL); -WXDLLEXPORT extern bool wxResourceParseFile(const wxString& filename, wxResourceTable *table = (wxResourceTable *) NULL); -WXDLLEXPORT extern bool wxResourceParseString(char* s, wxResourceTable *table = (wxResourceTable *) NULL); -WXDLLEXPORT extern bool wxResourceParseString(const wxString& s, wxResourceTable *table = (wxResourceTable *) NULL); -WXDLLEXPORT extern void wxResourceClear(wxResourceTable *table = (wxResourceTable *) NULL); +WXDLLIMPEXP_DEPRECATED extern wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table = (wxResourceTable *) NULL); +WXDLLIMPEXP_DEPRECATED extern wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table = (wxResourceTable *) NULL); +WXDLLIMPEXP_DEPRECATED extern wxMenuBar* wxResourceCreateMenuBar(const wxString& resource, wxResourceTable *table = (wxResourceTable *) NULL, wxMenuBar *menuBar = (wxMenuBar *) NULL); +WXDLLIMPEXP_DEPRECATED extern wxMenu* wxResourceCreateMenu(const wxString& resource, wxResourceTable *table = (wxResourceTable *) NULL); +WXDLLIMPEXP_DEPRECATED extern bool wxResourceParseData(const wxString& resource, wxResourceTable *table = (wxResourceTable *) NULL); +WXDLLIMPEXP_DEPRECATED extern bool wxResourceParseData(const char* resource, wxResourceTable *table = (wxResourceTable *) NULL); +WXDLLIMPEXP_DEPRECATED extern bool wxResourceParseFile(const wxString& filename, wxResourceTable *table = (wxResourceTable *) NULL); +WXDLLIMPEXP_DEPRECATED extern bool wxResourceParseString(char* s, wxResourceTable *table = (wxResourceTable *) NULL); +WXDLLIMPEXP_DEPRECATED extern bool wxResourceParseString(const wxString& s, wxResourceTable *table = (wxResourceTable *) NULL); +WXDLLIMPEXP_DEPRECATED extern void wxResourceClear(wxResourceTable *table = (wxResourceTable *) NULL); // Register XBM/XPM data -WXDLLEXPORT extern bool wxResourceRegisterBitmapData(const wxString& name, char bits[], int width, int height, wxResourceTable *table = (wxResourceTable *) NULL); -WXDLLEXPORT extern bool wxResourceRegisterBitmapData(const wxString& name, char **data, wxResourceTable *table = (wxResourceTable *) NULL); +WXDLLIMPEXP_DEPRECATED extern bool wxResourceRegisterBitmapData(const wxString& name, char bits[], int width, int height, wxResourceTable *table = (wxResourceTable *) NULL); +WXDLLIMPEXP_DEPRECATED extern bool wxResourceRegisterBitmapData(const wxString& name, char **data, wxResourceTable *table = (wxResourceTable *) NULL); #define wxResourceRegisterIconData wxResourceRegisterBitmapData /* * Resource identifer code: #define storage */ -WXDLLEXPORT extern bool wxResourceAddIdentifier(const wxString& name, int value, wxResourceTable *table = (wxResourceTable *) NULL); -WXDLLEXPORT extern int wxResourceGetIdentifier(const wxString& name, wxResourceTable *table = (wxResourceTable *) NULL); +WXDLLIMPEXP_DEPRECATED extern bool wxResourceAddIdentifier(const wxString& name, int value, wxResourceTable *table = (wxResourceTable *) NULL); +WXDLLIMPEXP_DEPRECATED extern int wxResourceGetIdentifier(const wxString& name, wxResourceTable *table = (wxResourceTable *) NULL); // Used to be wxWindowBase::LoadFromResource bool wxLoadFromResource(wxWindow* thisWindow, wxWindow *parent, const wxString& resourceName, const wxResourceTable *table = (const wxResourceTable *) NULL); diff --git a/contrib/include/wx/deprecated/setup.h b/contrib/include/wx/deprecated/setup.h index 0bee55cc61..e103e14332 100644 --- a/contrib/include/wx/deprecated/setup.h +++ b/contrib/include/wx/deprecated/setup.h @@ -26,12 +26,21 @@ #define wxUSE_TIMEDATE 0 // wxProperty[Value/Form/List] classes, used by Dialog Editor +#ifdef wxUSE_PROPSHEET +#undef wxUSE_PROPSHEET +#endif #define wxUSE_PROPSHEET 1 // wxTreeLayout class +#ifdef wxUSE_TREELAYOUT +#undef wxUSE_TREELAYOUT +#endif #define wxUSE_TREELAYOUT 1 // use wxExpr (a.k.a. PrologIO) +#ifdef wxUSE_PROLOGIO +#undef wxUSE_PROLOGIO +#endif #define wxUSE_PROLOGIO 1 // Use .wxr resource mechanism (requires PrologIO library) @@ -40,5 +49,20 @@ #endif #define wxUSE_WX_RESOURCES 1 + + + + +#ifdef WXMAKINGDLL_DEPRECATED + #define WXDLLIMPEXP_DEPRECATED WXEXPORT + #define WXDLLIMPEXP_DATA_DEPRECATED(type) WXEXPORT type +#elif defined(WXUSINGDLL) + #define WXDLLIMPEXP_DEPRECATED WXIMPORT + #define WXDLLIMPEXP_DATA_DEPRECATED(type) WXIMPORT type +#else // not making nor using DLL + #define WXDLLIMPEXP_DEPRECATED + #define WXDLLIMPEXP_DATA_DEPRECATED(type) type +#endif + #endif // _WX_DEPRECATED_SETUP_H_ diff --git a/contrib/include/wx/deprecated/treelay.h b/contrib/include/wx/deprecated/treelay.h index a87818356e..ad1a266662 100644 --- a/contrib/include/wx/deprecated/treelay.h +++ b/contrib/include/wx/deprecated/treelay.h @@ -28,7 +28,7 @@ class wxMouseEvent; #if wxUSE_TREELAYOUT -class WXDLLEXPORT wxTreeLayout: public wxObject +class WXDLLIMPEXP_DEPRECATED wxTreeLayout: public wxObject { public: wxTreeLayout(); @@ -89,7 +89,7 @@ private: DECLARE_ABSTRACT_CLASS(wxTreeLayout) }; -class WXDLLEXPORT wxStoredNode +class WXDLLIMPEXP_DEPRECATED wxStoredNode { public: wxString m_name; @@ -103,7 +103,7 @@ public: * A version of wxTreeLayout with storage for nodes */ -class WXDLLEXPORT wxTreeLayoutStored: public wxTreeLayout +class WXDLLIMPEXP_DEPRECATED wxTreeLayoutStored: public wxTreeLayout { public: wxTreeLayoutStored(int noNodes = 200); diff --git a/contrib/include/wx/deprecated/wxexpr.h b/contrib/include/wx/deprecated/wxexpr.h index 623314a8bc..e9837f04cf 100644 --- a/contrib/include/wx/deprecated/wxexpr.h +++ b/contrib/include/wx/deprecated/wxexpr.h @@ -52,7 +52,7 @@ // carry on processing. typedef bool (*wxExprErrorHandler) (int errorType, char *msg); -WXDLLEXPORT_DATA(extern wxExprErrorHandler) currentwxExprErrorHandler; +WXDLLIMPEXP_DATA_DEPRECATED(extern wxExprErrorHandler) currentwxExprErrorHandler; typedef enum { @@ -64,9 +64,9 @@ typedef enum { wxExprList } wxExprType; -class WXDLLEXPORT wxExprDatabase; +class WXDLLIMPEXP_DEPRECATED wxExprDatabase; -class WXDLLEXPORT wxExpr +class WXDLLIMPEXP_DEPRECATED wxExpr { public: wxObject *client_data; @@ -196,7 +196,7 @@ class WXDLLEXPORT wxExpr DECLARE_NO_COPY_CLASS(wxExpr) }; -class WXDLLEXPORT wxExprDatabase: public wxList +class WXDLLIMPEXP_DEPRECATED wxExprDatabase: public wxList { private: wxNode *position; // Where we are in a search @@ -262,7 +262,7 @@ private: // Function call-style interface - some more convenience wrappers/unwrappers // Make a call -WXDLLEXPORT wxExpr* wxExprMakeCall(const wxString& functor ...); +WXDLLIMPEXP_DEPRECATED wxExpr* wxExprMakeCall(const wxString& functor ...); #define wxExprMakeInteger(x) (new wxExpr((long)x)) #define wxExprMakeReal(x) (new wxExpr((double)x)) @@ -271,13 +271,13 @@ WXDLLEXPORT wxExpr* wxExprMakeCall(const wxString& functor ...); #define wxExprMake(x) (new wxExpr(x)) // Checks functor -WXDLLEXPORT bool wxExprIsFunctor(wxExpr *expr, const wxString& functor); +WXDLLIMPEXP_DEPRECATED bool wxExprIsFunctor(wxExpr *expr, const wxString& functor); // Temporary variable for communicating between wxexpr.cpp and YACC/LEX -WXDLLEXPORT_DATA(extern wxExprDatabase*) thewxExprDatabase; +WXDLLIMPEXP_DATA_DEPRECATED(extern wxExprDatabase*) thewxExprDatabase; // YACC/LEX can leave memory lying around... -extern "C" WXDLLEXPORT int wxExprCleanUp(); +extern "C" WXDLLIMPEXP_DEPRECATED int wxExprCleanUp(); #endif // wxUSE_PROLOGIO diff --git a/contrib/include/wx/mmedia/cdbase.h b/contrib/include/wx/mmedia/cdbase.h index d4b9ee3194..bc70cfa78f 100644 --- a/contrib/include/wx/mmedia/cdbase.h +++ b/contrib/include/wx/mmedia/cdbase.h @@ -16,18 +16,19 @@ #include "wx/defs.h" #include "wx/object.h" +#include "wx/mmedia/defs.h" typedef struct wxCDtime { wxUint8 track; wxUint8 hour, min, sec; } wxCDtime; -class WXDLLEXPORT wxCDAudio : public wxObject { +class WXDLLIMPEXP_MMEDIA wxCDAudio : public wxObject { DECLARE_ABSTRACT_CLASS(wxCDAudio) public: typedef enum { PLAYING, PAUSED, STOPPED } CDstatus; // Table of contents manager - class WXDLLEXPORT CDtoc { + class WXDLLIMPEXP_MMEDIA CDtoc { protected: wxCDtime *tracks_time, *tracks_pos; wxCDtime total_time; diff --git a/contrib/include/wx/mmedia/cdunix.h b/contrib/include/wx/mmedia/cdunix.h index 45994f0a0b..9745add9dc 100644 --- a/contrib/include/wx/mmedia/cdunix.h +++ b/contrib/include/wx/mmedia/cdunix.h @@ -17,10 +17,11 @@ #include "wx/defs.h" #include "wx/object.h" #include "wx/string.h" +#include "wx/mmedia/defs.h" #include "wx/mmedia/cdbase.h" /// -class WXDLLEXPORT wxCDAudioLinux : public wxCDAudio { +class WXDLLIMPEXP_MMEDIA wxCDAudioLinux : public wxCDAudio { DECLARE_DYNAMIC_CLASS(wxCDAudioLinux) protected: wxCDtime m_time; diff --git a/contrib/include/wx/mmedia/cdwin.h b/contrib/include/wx/mmedia/cdwin.h index 0c8fa5fd95..d543b9e51a 100644 --- a/contrib/include/wx/mmedia/cdwin.h +++ b/contrib/include/wx/mmedia/cdwin.h @@ -15,6 +15,7 @@ #endif #include "wx/wxprec.h" +#include "wx/mmedia/defs.h" #include "cdbase.h" #ifdef WXMMEDIA_INTERNAL @@ -26,7 +27,7 @@ typedef struct CDAW_Internal { #endif /// -class WXDLLEXPORT wxCDAudioWin : public wxCDAudio { +class WXDLLIMPEXP_MMEDIA wxCDAudioWin : public wxCDAudio { DECLARE_DYNAMIC_CLASS(wxCDAudioWin) protected: struct CDAW_Internal *m_internal; diff --git a/contrib/include/wx/mmedia/defs.h b/contrib/include/wx/mmedia/defs.h new file mode 100644 index 0000000000..223f84216b --- /dev/null +++ b/contrib/include/wx/mmedia/defs.h @@ -0,0 +1,15 @@ +#ifndef _WX_MMEDIA_DEFS_H_ +#define _WX_MMEDIA_DEFS_H_ + +#ifdef WXMAKINGDLL_MMEDIA + #define WXDLLIMPEXP_MMEDIA WXEXPORT + #define WXDLLIMPEXP_DATA_MMEDIA(type) WXEXPORT type +#elif defined(WXUSINGDLL) + #define WXDLLIMPEXP_MMEDIA WXIMPORT + #define WXDLLIMPEXP_DATA_MMEDIA(type) WXIMPORT type +#else // not making nor using DLL + #define WXDLLIMPEXP_MMEDIA + #define WXDLLIMPEXP_DATA_MMEDIA(type) type +#endif + +#endif // _WX_MMEDIA_DEFS_H_ diff --git a/contrib/include/wx/mmedia/sndaiff.h b/contrib/include/wx/mmedia/sndaiff.h index 3a44a856bc..b11f69fb33 100644 --- a/contrib/include/wx/mmedia/sndaiff.h +++ b/contrib/include/wx/mmedia/sndaiff.h @@ -14,6 +14,7 @@ #include "wx/defs.h" #include "wx/stream.h" +#include "wx/mmedia/defs.h" #include "wx/mmedia/sndbase.h" #include "wx/mmedia/sndcodec.h" #include "wx/mmedia/sndfile.h" @@ -22,7 +23,7 @@ // AIFF codec // -class WXDLLEXPORT wxSoundAiff: public wxSoundFileStream { +class WXDLLIMPEXP_MMEDIA wxSoundAiff: public wxSoundFileStream { public: wxSoundAiff(wxInputStream& stream, wxSoundStream& io_sound); wxSoundAiff(wxOutputStream& stream, wxSoundStream& io_sound); diff --git a/contrib/include/wx/mmedia/sndbase.h b/contrib/include/wx/mmedia/sndbase.h index a19cf39917..eff565ef6e 100644 --- a/contrib/include/wx/mmedia/sndbase.h +++ b/contrib/include/wx/mmedia/sndbase.h @@ -13,6 +13,7 @@ #endif #include "wx/defs.h" +#include "wx/mmedia/defs.h" // ------------------------------------------------------------------------ // DEFINITIONS @@ -76,7 +77,7 @@ typedef enum { wxSOUND_NOTSTARTED } wxSoundError; -class WXDLLEXPORT wxSoundStream; +class WXDLLIMPEXP_MMEDIA wxSoundStream; // --------------------- // wxSoundCallback(stream, evt, cdata): C callback for sound event. @@ -92,7 +93,7 @@ typedef void (*wxSoundCallback)(wxSoundStream *stream, int evt, // Base class for sound format specification // -class WXDLLEXPORT wxSoundFormatBase { +class WXDLLIMPEXP_MMEDIA wxSoundFormatBase { public: wxSoundFormatBase(); virtual ~wxSoundFormatBase(); @@ -112,7 +113,7 @@ class WXDLLEXPORT wxSoundFormatBase { // Base class for sound streams // -class WXDLLEXPORT wxSoundStream { +class WXDLLIMPEXP_MMEDIA wxSoundStream { public: wxSoundStream(); virtual ~wxSoundStream(); diff --git a/contrib/include/wx/mmedia/sndcodec.h b/contrib/include/wx/mmedia/sndcodec.h index 27ca206c5b..1ce621bdd5 100644 --- a/contrib/include/wx/mmedia/sndcodec.h +++ b/contrib/include/wx/mmedia/sndcodec.h @@ -13,9 +13,10 @@ #endif #include "wx/defs.h" +#include "wx/mmedia/defs.h" #include "wx/mmedia/sndbase.h" -class WXDLLEXPORT wxSoundStreamCodec: public wxSoundStream { +class WXDLLIMPEXP_MMEDIA wxSoundStreamCodec: public wxSoundStream { public: wxSoundStreamCodec(wxSoundStream& snd_io); ~wxSoundStreamCodec(); diff --git a/contrib/include/wx/mmedia/sndcpcm.h b/contrib/include/wx/mmedia/sndcpcm.h index 310e0ebd35..d54c6a6b8a 100644 --- a/contrib/include/wx/mmedia/sndcpcm.h +++ b/contrib/include/wx/mmedia/sndcpcm.h @@ -13,6 +13,7 @@ #endif #include "wx/defs.h" +#include "wx/mmedia/defs.h" #include "wx/mmedia/sndbase.h" #include "wx/mmedia/sndcodec.h" @@ -20,7 +21,7 @@ // PCM converter class // -class WXDLLEXPORT wxSoundStreamPcm: public wxSoundStreamCodec { +class WXDLLIMPEXP_MMEDIA wxSoundStreamPcm: public wxSoundStreamCodec { public: typedef void (*ConverterType)(const void *buf_in, void *buf_out, wxUint32 len); diff --git a/contrib/include/wx/mmedia/sndesd.h b/contrib/include/wx/mmedia/sndesd.h index 06cbce5f87..e0d9b5d0a4 100644 --- a/contrib/include/wx/mmedia/sndesd.h +++ b/contrib/include/wx/mmedia/sndesd.h @@ -14,6 +14,7 @@ #include "wx/defs.h" #include "wx/string.h" +#include "wx/mmedia/defs.h" #include "wx/mmedia/sndbase.h" #include "wx/mmedia/sndpcm.h" diff --git a/contrib/include/wx/mmedia/sndfile.h b/contrib/include/wx/mmedia/sndfile.h index 65dc888510..62218e81d8 100644 --- a/contrib/include/wx/mmedia/sndfile.h +++ b/contrib/include/wx/mmedia/sndfile.h @@ -10,6 +10,7 @@ #include "wx/defs.h" #include "wx/stream.h" +#include "wx/mmedia/defs.h" #include "wx/mmedia/sndbase.h" #include "wx/mmedia/sndcodec.h" @@ -19,7 +20,7 @@ // Codec router class // -class WXDLLEXPORT wxSoundRouterStream: public wxSoundStreamCodec { +class WXDLLIMPEXP_MMEDIA wxSoundRouterStream: public wxSoundStreamCodec { public: wxSoundRouterStream(wxSoundStream& sndio); ~wxSoundRouterStream(); diff --git a/contrib/include/wx/mmedia/sndg72x.h b/contrib/include/wx/mmedia/sndg72x.h index 61ef7d602f..7011cb5099 100644 --- a/contrib/include/wx/mmedia/sndg72x.h +++ b/contrib/include/wx/mmedia/sndg72x.h @@ -13,6 +13,7 @@ #endif #include "wx/defs.h" +#include "wx/mmedia/defs.h" #include "wx/mmedia/sndbase.h" #include "wx/mmedia/sndcodec.h" #include "wx/mmedia/sndbase.h" @@ -29,7 +30,7 @@ typedef struct g72x_state g72state; // // G72X format // -class WXDLLEXPORT wxSoundFormatG72X: public wxSoundFormatBase { +class WXDLLIMPEXP_MMEDIA wxSoundFormatG72X: public wxSoundFormatBase { public: wxSoundFormatG72X(); ~wxSoundFormatG72X(); @@ -57,8 +58,8 @@ class WXDLLEXPORT wxSoundFormatG72X: public wxSoundFormatBase { // ULAW converter class // -class WXDLLEXPORT wxSoundRouterStream; -class WXDLLEXPORT wxSoundStreamG72X: public wxSoundStreamCodec { +class WXDLLIMPEXP_MMEDIA wxSoundRouterStream; +class WXDLLIMPEXP_MMEDIA wxSoundStreamG72X: public wxSoundStreamCodec { public: wxSoundStreamG72X(wxSoundStream& sndio); ~wxSoundStreamG72X(); diff --git a/contrib/include/wx/mmedia/sndmsad.h b/contrib/include/wx/mmedia/sndmsad.h index 8073330b50..ff168fc204 100644 --- a/contrib/include/wx/mmedia/sndmsad.h +++ b/contrib/include/wx/mmedia/sndmsad.h @@ -14,6 +14,7 @@ #include "wx/defs.h" #include "wx/dynarray.h" +#include "wx/mmedia/defs.h" #include "wx/mmedia/sndcodec.h" #include "wx/mmedia/sndbase.h" @@ -22,7 +23,7 @@ WX_DEFINE_EXPORTED_ARRAY_INT(wxInt16, wxMSAdpcmCoeffs); // // MSADPCM format // -class WXDLLEXPORT wxSoundFormatMSAdpcm: public wxSoundFormatBase { +class WXDLLIMPEXP_MMEDIA wxSoundFormatMSAdpcm: public wxSoundFormatBase { public: wxSoundFormatMSAdpcm(); ~wxSoundFormatMSAdpcm(); @@ -58,8 +59,8 @@ protected: // // MS ADPCM converter class // -class WXDLLEXPORT wxSoundRouterStream; -class WXDLLEXPORT wxSoundStreamMSAdpcm: public wxSoundStreamCodec { +class WXDLLIMPEXP_MMEDIA wxSoundRouterStream; +class WXDLLIMPEXP_MMEDIA wxSoundStreamMSAdpcm: public wxSoundStreamCodec { public: wxSoundStreamMSAdpcm(wxSoundStream& sndio); ~wxSoundStreamMSAdpcm(); diff --git a/contrib/include/wx/mmedia/sndoss.h b/contrib/include/wx/mmedia/sndoss.h index 9a8f3ddf4a..d8c9d88ebf 100644 --- a/contrib/include/wx/mmedia/sndoss.h +++ b/contrib/include/wx/mmedia/sndoss.h @@ -14,6 +14,7 @@ #include "wx/defs.h" #include "wx/string.h" +#include "wx/mmedia/defs.h" #include "wx/mmedia/sndbase.h" #include "wx/mmedia/sndpcm.h" @@ -21,7 +22,7 @@ // OSS output class // -class WXDLLEXPORT wxSoundStreamOSS : public wxSoundStream { +class WXDLLIMPEXP_MMEDIA wxSoundStreamOSS : public wxSoundStream { public: wxSoundStreamOSS(const wxString& dev_name = wxT("/dev/dsp")); ~wxSoundStreamOSS(); diff --git a/contrib/include/wx/mmedia/sndpcm.h b/contrib/include/wx/mmedia/sndpcm.h index 652687a0f4..ab742f803f 100644 --- a/contrib/include/wx/mmedia/sndpcm.h +++ b/contrib/include/wx/mmedia/sndpcm.h @@ -13,6 +13,7 @@ #endif #include "wx/defs.h" +#include "wx/mmedia/defs.h" #include "wx/mmedia/sndbase.h" // diff --git a/contrib/include/wx/mmedia/sndulaw.h b/contrib/include/wx/mmedia/sndulaw.h index c558bb4758..122c53edc0 100644 --- a/contrib/include/wx/mmedia/sndulaw.h +++ b/contrib/include/wx/mmedia/sndulaw.h @@ -13,13 +13,14 @@ #endif #include "wx/defs.h" +#include "wx/mmedia/defs.h" #include "wx/mmedia/sndcodec.h" #include "wx/mmedia/sndbase.h" // // ULAW format // -class WXDLLEXPORT wxSoundFormatUlaw: public wxSoundFormatBase { +class WXDLLIMPEXP_MMEDIA wxSoundFormatUlaw: public wxSoundFormatBase { public: wxSoundFormatUlaw(); ~wxSoundFormatUlaw(); @@ -47,8 +48,8 @@ protected: // ULAW converter class // -class WXDLLEXPORT wxSoundRouterStream; -class WXDLLEXPORT wxSoundStreamUlaw: public wxSoundStreamCodec { +class WXDLLIMPEXP_MMEDIA wxSoundRouterStream; +class WXDLLIMPEXP_MMEDIA wxSoundStreamUlaw: public wxSoundStreamCodec { public: wxSoundStreamUlaw(wxSoundStream& sndio); ~wxSoundStreamUlaw(); diff --git a/contrib/include/wx/mmedia/sndwav.h b/contrib/include/wx/mmedia/sndwav.h index caebec4080..88b9e06c6a 100644 --- a/contrib/include/wx/mmedia/sndwav.h +++ b/contrib/include/wx/mmedia/sndwav.h @@ -16,6 +16,7 @@ #include "wx/string.h" #include "wx/stream.h" #include "wx/datstrm.h" +#include "wx/mmedia/defs.h" #include "wx/mmedia/sndbase.h" #include "wx/mmedia/sndcodec.h" #include "wx/mmedia/sndfile.h" diff --git a/contrib/include/wx/mmedia/sndwin.h b/contrib/include/wx/mmedia/sndwin.h index e630ee4543..d178f401c2 100644 --- a/contrib/include/wx/mmedia/sndwin.h +++ b/contrib/include/wx/mmedia/sndwin.h @@ -9,13 +9,14 @@ #define _WX_SNDWIN_H #include "wx/defs.h" +#include "wx/mmedia/defs.h" #include "wx/mmedia/sndbase.h" typedef struct _wxSoundInternal wxSoundInternal; typedef struct _wxSoundInfoHeader wxSoundInfoHeader; -// class WXDLLEXPORT wxSoundInternal; -class WXDLLEXPORT wxSoundStreamWin : public wxSoundStream { +// class WXDLLIMPEXP_MMEDIA wxSoundInternal; +class WXDLLIMPEXP_MMEDIA wxSoundStreamWin : public wxSoundStream { public: wxSoundStreamWin(); ~wxSoundStreamWin(); diff --git a/contrib/include/wx/mmedia/vidbase.h b/contrib/include/wx/mmedia/vidbase.h index 8d5d1d55ed..7cb64bea69 100644 --- a/contrib/include/wx/mmedia/vidbase.h +++ b/contrib/include/wx/mmedia/vidbase.h @@ -36,6 +36,8 @@ #include "wx/frame.h" #endif +#include "wx/mmedia/defs.h" + // ---------------------------------------------------------------------------- // wxMMedia2 (video) types @@ -54,7 +56,7 @@ typedef enum { // ---------------------------------------------------------------------------- // Classes definition -class WXDLLEXPORT wxVideoBaseDriver : public wxObject { +class WXDLLIMPEXP_MMEDIA wxVideoBaseDriver : public wxObject { DECLARE_ABSTRACT_CLASS(wxVideoBaseDriver) protected: wxWindow *m_video_output; @@ -104,7 +106,7 @@ public: virtual bool IsStopped() const = 0; }; -WXDLLEXPORT wxFrame *wxVideoCreateFrame(wxVideoBaseDriver *vid_drv); +WXDLLIMPEXP_MMEDIA wxFrame *wxVideoCreateFrame(wxVideoBaseDriver *vid_drv); #endif diff --git a/contrib/include/wx/mmedia/vidwin.h b/contrib/include/wx/mmedia/vidwin.h index b8d0527f97..a5e7a38913 100644 --- a/contrib/include/wx/mmedia/vidwin.h +++ b/contrib/include/wx/mmedia/vidwin.h @@ -36,6 +36,7 @@ // ---------------------------------------------------------------------------- // wxMMedia2 headers +#include "wx/mmedia/defs.h" #include "wx/mmedia/vidbase.h" // ---------------------------------------------------------------------------- @@ -53,7 +54,7 @@ typedef struct VIDW_Internal { // ---------------------------------------------------------------------------- // Class definition -class WXDLLEXPORT wxVideoWindows : public wxVideoBaseDriver { +class WXDLLIMPEXP_MMEDIA wxVideoWindows : public wxVideoBaseDriver { DECLARE_DYNAMIC_CLASS(wxVideoWindows) protected: struct VIDW_Internal *m_internal; diff --git a/contrib/include/wx/mmedia/vidxanm.h b/contrib/include/wx/mmedia/vidxanm.h index ff2a14d50a..c3dac3d82e 100644 --- a/contrib/include/wx/mmedia/vidxanm.h +++ b/contrib/include/wx/mmedia/vidxanm.h @@ -44,6 +44,7 @@ // ---------------------------------------------------------------------------- // wxMMedia2 headers +#include "wx/mmedia/defs.h" #include "wx/mmedia/vidbase.h" // ---------------------------------------------------------------------------- @@ -65,7 +66,7 @@ typedef struct wxXANIMinternal { // ---------------------------------------------------------------------------- // Class definition -class WXDLLEXPORT wxVideoXANIM : public wxVideoBaseDriver { +class WXDLLIMPEXP_MMEDIA wxVideoXANIM : public wxVideoBaseDriver { DECLARE_DYNAMIC_CLASS(wxVideoXANIM) protected: // Remember the state of the subprocess diff --git a/contrib/include/wx/net/email.h b/contrib/include/wx/net/email.h index be906a47c3..50573d8014 100644 --- a/contrib/include/wx/net/email.h +++ b/contrib/include/wx/net/email.h @@ -23,7 +23,7 @@ * Miscellaneous email functions */ -class wxEmail +class WXDLLIMPEXP_NETUTILS wxEmail { public: //// Ctor/dtor diff --git a/contrib/include/wx/net/msg.h b/contrib/include/wx/net/msg.h index 27af00eaa3..4d487d34ec 100644 --- a/contrib/include/wx/net/msg.h +++ b/contrib/include/wx/net/msg.h @@ -16,12 +16,24 @@ #ifndef _WX_MSG_H_ #define _WX_MSG_H_ +#ifdef WXMAKINGDLL_NETUTILS + #define WXDLLIMPEXP_NETUTILS WXEXPORT + #define WXDLLIMPEXP_DATA_NETUTILS(type) WXEXPORT type +#elif defined(WXUSINGDLL) + #define WXDLLIMPEXP_NETUTILS WXIMPORT + #define WXDLLIMPEXP_DATA_NETUTILS(type) WXIMPORT type +#else // not making nor using DLL + #define WXDLLIMPEXP_NETUTILS + #define WXDLLIMPEXP_DATA_NETUTILS(type) type +#endif + + /* * wxMailMessage * Encapsulates an email message */ -class wxMailMessage +class WXDLLIMPEXP_NETUTILS wxMailMessage { public: diff --git a/contrib/include/wx/net/smapi.h b/contrib/include/wx/net/smapi.h index 4d414580bf..1dd7af4864 100644 --- a/contrib/include/wx/net/smapi.h +++ b/contrib/include/wx/net/smapi.h @@ -18,10 +18,10 @@ #include "wx/net/msg.h" -class wxMapiData; +class WXDLLIMPEXP_NETUTILS wxMapiData; //The class which encapsulates the MAPI connection -class wxMapiSession +class WXDLLIMPEXP_NETUTILS wxMapiSession { public: //Constructors / Destructors diff --git a/contrib/include/wx/plot/plot.h b/contrib/include/wx/plot/plot.h index 6b60dbb49d..d4c53db834 100644 --- a/contrib/include/wx/plot/plot.h +++ b/contrib/include/wx/plot/plot.h @@ -22,17 +22,28 @@ #include "wx/event.h" #include "wx/dynarray.h" +#ifdef WXMAKINGDLL_PLOT + #define WXDLLIMPEXP_PLOT WXEXPORT + #define WXDLLIMPEXP_DATA_PLOT(type) WXEXPORT type +#elif defined(WXUSINGDLL) + #define WXDLLIMPEXP_PLOT WXIMPORT + #define WXDLLIMPEXP_DATA_PLOT(type) WXIMPORT type +#else // not making nor using DLL + #define WXDLLIMPEXP_PLOT + #define WXDLLIMPEXP_DATA_PLOT(type) type +#endif + //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- -class WXDLLEXPORT wxPlotEvent; -class WXDLLEXPORT wxPlotCurve; -class WXDLLEXPORT wxPlotValues; -class WXDLLEXPORT wxPlotArea; -class WXDLLEXPORT wxPlotXAxisArea; -class WXDLLEXPORT wxPlotYAxisArea; -class WXDLLEXPORT wxPlotWindow; +class WXDLLIMPEXP_PLOT wxPlotEvent; +class WXDLLIMPEXP_PLOT wxPlotCurve; +class WXDLLIMPEXP_PLOT wxPlotValues; +class WXDLLIMPEXP_PLOT wxPlotArea; +class WXDLLIMPEXP_PLOT wxPlotXAxisArea; +class WXDLLIMPEXP_PLOT wxPlotYAxisArea; +class WXDLLIMPEXP_PLOT wxPlotWindow; //----------------------------------------------------------------------------- // consts @@ -74,7 +85,7 @@ extern const int wxEVT_PLOT_AREA_CREATE; // wxPlotEvent //----------------------------------------------------------------------------- -class WXDLLEXPORT wxPlotEvent: public wxNotifyEvent +class WXDLLIMPEXP_PLOT wxPlotEvent: public wxNotifyEvent { public: wxPlotEvent( wxEventType commandType = wxEVT_NULL, int id = 0 ); @@ -104,7 +115,7 @@ private: // wxPlotCurve //----------------------------------------------------------------------------- -class WXDLLEXPORT wxPlotCurve: public wxObject +class WXDLLIMPEXP_PLOT wxPlotCurve: public wxObject { public: wxPlotCurve( int offsetY, double startY, double endY ); @@ -146,7 +157,7 @@ private: // wxPlotOnOffCurve //----------------------------------------------------------------------------- -class WXDLLEXPORT wxPlotOnOff +class WXDLLIMPEXP_PLOT wxPlotOnOff { public: wxPlotOnOff() { } @@ -156,9 +167,10 @@ public: void *m_clientData; }; -WX_DECLARE_EXPORTED_OBJARRAY(wxPlotOnOff, wxArrayPlotOnOff); +WX_DECLARE_OBJARRAY_WITH_DECL(wxPlotOnOff, wxArrayPlotOnOff, + class WXDLLIMPEXP_PLOT); -class WXDLLEXPORT wxPlotOnOffCurve: public wxObject +class WXDLLIMPEXP_PLOT wxPlotOnOffCurve: public wxObject { public: wxPlotOnOffCurve( int offsetY ); @@ -198,7 +210,7 @@ private: // wxPlotArea //----------------------------------------------------------------------------- -class WXDLLEXPORT wxPlotArea: public wxWindow +class WXDLLIMPEXP_PLOT wxPlotArea: public wxWindow { public: wxPlotArea() {} @@ -225,7 +237,7 @@ private: // wxPlotXAxisArea //----------------------------------------------------------------------------- -class WXDLLEXPORT wxPlotXAxisArea: public wxWindow +class WXDLLIMPEXP_PLOT wxPlotXAxisArea: public wxWindow { public: wxPlotXAxisArea() {} @@ -245,7 +257,7 @@ private: // wxPlotYAxisArea //----------------------------------------------------------------------------- -class WXDLLEXPORT wxPlotYAxisArea: public wxWindow +class WXDLLIMPEXP_PLOT wxPlotYAxisArea: public wxWindow { public: wxPlotYAxisArea() {} @@ -265,7 +277,7 @@ private: // wxPlotWindow //----------------------------------------------------------------------------- -class WXDLLEXPORT wxPlotWindow: public wxScrolledWindow +class WXDLLIMPEXP_PLOT wxPlotWindow: public wxScrolledWindow { public: wxPlotWindow() {} diff --git a/contrib/src/deprecated/Makefile.in b/contrib/src/deprecated/Makefile.in index 497a1b65ff..e7f3f030da 100644 --- a/contrib/src/deprecated/Makefile.in +++ b/contrib/src/deprecated/Makefile.in @@ -1,53 +1,286 @@ -# $Id$ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= -top_srcdir = @top_srcdir@/.. -top_builddir = ../../.. -libsrc_dir = contrib/src/deprecated -TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_wxdeprecated-@WX_RELEASE@ +@MAKE_SET@ -LIBVERSION_CURRENT=@WX_CURRENT@ -LIBVERSION_REVISION=@WX_REVISION@ -LIBVERSION_AGE=@WX_AGE@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +INSTALL = @INSTALL@ +AR = @AR@ +CC = @CC@ +CFLAGS = @CFLAGS@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXFLAGS = @CXXFLAGS@ +DLLPREFIX = @DLLPREFIX@ +EXTRALIBS = @EXTRALIBS@ +EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_DIR = @INSTALL_DIR@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LN_S = @LN_S@ +PIC_FLAG = @PIC_FLAG@ +RANLIB = @RANLIB@ +SHARED_LD_CXX = @SHARED_LD_CXX@ +SONAME_FLAG = @SONAME_FLAG@ +SO_SUFFIX = @SO_SUFFIX@ +STRIP = @STRIP@ +TOOLKIT = @TOOLKIT@ +TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ +TOOLKIT_VERSION = @TOOLKIT_VERSION@ +VENDOR = @VENDOR@ +includedir = @includedir@ +libdir = @libdir@ +srcdir = @srcdir@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ -HEADER_PATH=$(top_srcdir)/contrib/include/wx -HEADER_SUBDIR=deprecated +### Variables: ### -HEADERS=prop.h propform.h proplist.h resource.h treelay.h wxexpr.h treelay.h +DEPRECATEDDLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED $(CFLAGS) \ + $(PIC_FLAG) +DEPRECATEDDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED $(CXXFLAGS) \ + $(PIC_FLAG) +DEPRECATEDDLL_OBJECTS = \ + deprecateddll_prop.o \ + deprecateddll_propform.o \ + deprecateddll_proplist.o \ + deprecateddll_resource.o \ + deprecateddll_treelay.o \ + deprecateddll_wxexpr.o \ + deprecateddll_dosyacc.o +DEPRECATEDLIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -I$(srcdir)/../../include $(CFLAGS) +DEPRECATEDLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -I$(srcdir)/../../include $(CXXFLAGS) +DEPRECATEDLIB_OBJECTS = \ + deprecatedlib_prop.o \ + deprecatedlib_propform.o \ + deprecatedlib_proplist.o \ + deprecatedlib_resource.o \ + deprecatedlib_treelay.o \ + deprecatedlib_wxexpr.o \ + deprecatedlib_dosyacc.o +LIBDIRNAME = $(top_builddir)lib -OBJECTS=prop.o propform.o proplist.o wxexpr.o parser.o resource.o treelay.o -DEPFILES=$(OBJECTS:.o=.d) +### Conditionally set variables: ### -APPEXTRADEFS=-I$(top_srcdir)/contrib/include +@COND_DEPS_TRACKING_0@CCC = $(CC) +@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC) +@COND_DEPS_TRACKING_0@CXXC = $(CXX) +@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR) +@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = +@COND_TOOLKIT_MAC@WXBASEPORT = _carbon +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d +@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) +@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)250 +@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5 +@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = +@COND_UNICODE_1@WXUNICODEFLAG = u +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p = -I$(top_srcdir)/src/expat/lib +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib +@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ +@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +COND_MONOLITHIC_0___WXLIB_CORE_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) +COND_MONOLITHIC_1___WXLIB_MONO_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +COND_SHARED_1___deprecateddll___depname = \ + $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) +@COND_SHARED_1@__deprecateddll___depname = $(COND_SHARED_1___deprecateddll___depname) +COND_PLATFORM_WIN32_1___deprecateddll___importlib = \ + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_WIN32_1@__deprecateddll___importlib = $(COND_PLATFORM_WIN32_1___deprecateddll___importlib) +COND_PLATFORM_MACOSX_1___deprecateddll___macinstnamecmd = -install_name \ + $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2) +@COND_PLATFORM_MACOSX_1@__deprecateddll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___deprecateddll___macinstnamecmd) +@COND_PLATFORM_MACOSX_1@__deprecateddll___macver = \ +@COND_PLATFORM_MACOSX_1@ -compatibility_version 2.5 -current_version 2.5.0 +COND_USE_SOSYMLINKS_1___deprecateddll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; \ + rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) +@COND_USE_SOSYMLINKS_1@__deprecateddll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___deprecateddll___so_symlinks_cmd) +COND_USE_SOSYMLINKS_1___deprecateddll___so_symlinks_inst_cmd = rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOSYMLINKS_1@__deprecateddll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___deprecateddll___so_symlinks_inst_cmd) +COND_USE_SOVERLINUX_1___deprecateddll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2) +@COND_USE_SOVERLINUX_1@__deprecateddll___soname_flags = $(COND_USE_SOVERLINUX_1___deprecateddll___soname_flags) +COND_USE_SOVERSOLARIS_1___deprecateddll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) +@COND_USE_SOVERSOLARIS_1@__deprecateddll___soname_flags = $(COND_USE_SOVERSOLARIS_1___deprecateddll___soname_flags) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__deprecateddll___targetsuf2 \ +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__deprecateddll___targetsuf2 \ +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.$(SO_SUFFIX) +@COND_USE_SOVERSION_0@__deprecateddll___targetsuf2 = .$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__deprecateddll___targetsuf3 \ +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0.0.0 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__deprecateddll___targetsuf3 \ +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) +@COND_USE_SOVERSION_0@__deprecateddll___targetsuf3 = .$(SO_SUFFIX) +COND_SHARED_0___deprecatedlib___depname = \ + $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX).a +@COND_SHARED_0@__deprecatedlib___depname = $(COND_SHARED_0___deprecatedlib___depname) +@COND_SHARED_1@__install_deprecateddll___depname = install_deprecateddll +@COND_SHARED_0@__install_deprecatedlib___depname = install_deprecatedlib -include $(top_builddir)/src/makelib.env +### Targets: ### --include $(DEPFILES) +all: $(__deprecateddll___depname) $(__deprecatedlib___depname) -WXDIR = $(top_srcdir) +clean: + rm -rf ./.deps + rm -f ./*.o + rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX).a -SRCDIR = $(WXDIR)/src -GENDIR = $(WXDIR)/src/generic -COMMDIR = $(WXDIR)/src/common +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3): $(DEPRECATEDDLL_OBJECTS) +@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__deprecateddll___macinstnamecmd) $(__deprecateddll___importlib) $(__deprecateddll___soname_flags) $(__deprecateddll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) +@COND_SHARED_1@ $(__deprecateddll___so_symlinks_cmd) -parser.o: parser.c lexer.c - $(CCLEX) -c $(CFLAGS) -I. $(PICFLAGS) -o $@ parser.c +deprecateddll_dosyacc.o: $(srcdir)/dosyacc.c + $(CCC) -c -o $@ $(DEPRECATEDDLL_CFLAGS) $< -parser.c: $(COMMDIR)/parser.y lexer.c - $(YACC) $(COMMDIR)/parser.y - @sed -e "s;$(COMMDIR)/y.tab.c;parser.y;g" < y.tab.c | \ - sed -e "s/BUFSIZ/5000/g" | \ - sed -e "s/YYLMAX 200/YYLMAX 5000/g" | \ - sed -e "s/yy/PROIO_yy/g" | \ - sed -e "s/input/PROIO_input/g" | \ - sed -e "s/unput/PROIO_unput/g" > parser.c - @$(RM) y.tab.c +deprecateddll_prop.o: $(srcdir)/prop.cpp + $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< -lexer.c: $(COMMDIR)/lexer.l - $(LEX) $(COMMDIR)/lexer.l - @sed -e "s;$(COMMDIR)/@LEX_STEM@.c;lexer.l;g" < @LEX_STEM@.c | \ - sed -e "s/yy/PROIO_yy/g" | \ - sed -e "s/input/PROIO_input/g" | \ - sed -e "s/unput/PROIO_unput/g" > lexer.c - @$(RM) @LEX_STEM@.c +deprecateddll_propform.o: $(srcdir)/propform.cpp + $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< +deprecateddll_proplist.o: $(srcdir)/proplist.cpp + $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< + +deprecateddll_resource.o: $(srcdir)/resource.cpp + $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< + +deprecateddll_treelay.o: $(srcdir)/treelay.cpp + $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< + +deprecateddll_wxexpr.o: $(srcdir)/wxexpr.cpp + $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< + +@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX).a: $(DEPRECATEDLIB_OBJECTS) +@COND_SHARED_0@ rm -f $@ +@COND_SHARED_0@ $(AR) rcu $@ $(DEPRECATEDLIB_OBJECTS) +@COND_SHARED_0@ $(RANLIB) $@ + +deprecatedlib_dosyacc.o: $(srcdir)/dosyacc.c + $(CCC) -c -o $@ $(DEPRECATEDLIB_CFLAGS) $< + +deprecatedlib_prop.o: $(srcdir)/prop.cpp + $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< + +deprecatedlib_propform.o: $(srcdir)/propform.cpp + $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< + +deprecatedlib_proplist.o: $(srcdir)/proplist.cpp + $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< + +deprecatedlib_resource.o: $(srcdir)/resource.cpp + $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< + +deprecatedlib_treelay.o: $(srcdir)/treelay.cpp + $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< + +deprecatedlib_wxexpr.o: $(srcdir)/wxexpr.cpp + $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< + +distclean: clean + rm -f configure config.cache config.log config.status + rm -f bk-deps shared-ld-sh + +install: all $(__install_deprecateddll___depname) $(__install_deprecatedlib___depname) + $(INSTALL_DIR) $(includedir) + for f in wx/deprecated/expr.h wx/deprecated/prop.h wx/deprecated/propform.h wx/deprecated/proplist.h wx/deprecated/resource.h wx/deprecated/setup.h wx/deprecated/treelay.h wx/deprecated/wxexpr.h; do \ + if test ! -d $(includedir)/`dirname $$f` ; then \ + $(INSTALL_DIR) $(includedir)/`dirname $$f`; \ + fi; \ + $(INSTALL_DATA) $(srcdir)/../../include//$$f $(includedir)/$$f; \ + done + +install-strip: install + $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) + +@COND_SHARED_1@install_deprecateddll: +@COND_SHARED_1@ $(INSTALL_DIR) $(libdir) +@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) +@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) $(libdir) +@COND_SHARED_1@ (cd $(libdir) ; $(__deprecateddll___so_symlinks_inst_cmd)) + +@COND_SHARED_0@install_deprecatedlib: +@COND_SHARED_0@ $(INSTALL_DIR) $(libdir) +@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX).a $(libdir) + +uninstall: + + +# Include dependency info, if present: +@IF_GNU_MAKE@-include .deps/*.d + +.PHONY: all clean distclean install install_deprecateddll install_deprecatedlib uninstall diff --git a/contrib/src/deprecated/dosyacc.c b/contrib/src/deprecated/dosyacc.c index 22b03cd48c..f4545a071b 100644 --- a/contrib/src/deprecated/dosyacc.c +++ b/contrib/src/deprecated/dosyacc.c @@ -1,11 +1,7 @@ /* include platform.h first to get __WIN32__ definition */ #include "wx/platform.h" -#if defined(__WIN32__) || defined(__GNUWIN32__) -/* all Win32 compilers can handle C++ comments, and C++ comments - is the only C++ in setup.h */ #include "wx/setup.h" #include "wx/deprecated/setup.h" -#endif #if !defined(wxUSE_PROLOGIO) || wxUSE_PROLOGIO @@ -219,11 +215,7 @@ YYSTYPE yyvs[YYSTACKSIZE]; #define yystacksize YYSTACKSIZE #line 118 "parser.y" -#ifdef IDE_INVOKED #include "doslex.c" -#else -#include "lex_yy.c" -#endif /* void yyerror(s) @@ -252,6 +244,7 @@ void yyerror(char *s) * to test */ +#if 0 /* VS: doesn't work... */ #ifndef __SC__ #ifdef USE_DEFINE #ifndef yywrap @@ -264,6 +257,8 @@ void yyerror(char *s) # endif #endif #endif +#endif + #line 247 "y_tab.c" #define YYABORT goto yyabort #define YYACCEPT goto yyaccept diff --git a/contrib/src/deprecated/resource.cpp b/contrib/src/deprecated/resource.cpp index 74dd99e7e9..a179f370d2 100644 --- a/contrib/src/deprecated/resource.cpp +++ b/contrib/src/deprecated/resource.cpp @@ -70,6 +70,9 @@ #include "wx/combobox.h" #endif +#include "wx/splitter.h" +#include "wx/toolbar.h" + #include "wx/validate.h" #include "wx/log.h" #include "wx/module.h" diff --git a/contrib/src/deprecated/wxexpr.cpp b/contrib/src/deprecated/wxexpr.cpp index bc2d40f850..e97f0cbbd8 100644 --- a/contrib/src/deprecated/wxexpr.cpp +++ b/contrib/src/deprecated/wxexpr.cpp @@ -104,8 +104,8 @@ extern "C" void LexFromString(char *buf); #define yytext PROIO_yytext #endif -extern "C" WXDLLEXPORT_DATA(FILE*) yyin; -extern "C" WXDLLEXPORT int yyparse(void); +extern "C" WXDLLIMPEXP_DATA_DEPRECATED(FILE*) yyin; +extern "C" WXDLLIMPEXP_DEPRECATED int yyparse(void); wxExprDatabase *thewxExprDatabase = NULL; diff --git a/contrib/src/mmedia/Makefile.in b/contrib/src/mmedia/Makefile.in index aed8a229d5..579543b3ed 100644 --- a/contrib/src/mmedia/Makefile.in +++ b/contrib/src/mmedia/Makefile.in @@ -1,32 +1,415 @@ -# $Id$ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= -top_srcdir = @top_srcdir@/.. -top_builddir = ../../.. -libsrc_dir = contrib/src/mmedia -TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_mmedia-@WX_RELEASE@ +@MAKE_SET@ -LIBVERSION_CURRENT=@WX_CURRENT@ -LIBVERSION_REVISION=@WX_REVISION@ -LIBVERSION_AGE=@WX_AGE@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +INSTALL = @INSTALL@ +AR = @AR@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXFLAGS = @CXXFLAGS@ +DLLPREFIX = @DLLPREFIX@ +EXTRALIBS = @EXTRALIBS@ +EXTRALIBS_ESD = @EXTRALIBS_ESD@ +EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_DIR = @INSTALL_DIR@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LN_S = @LN_S@ +PIC_FLAG = @PIC_FLAG@ +RANLIB = @RANLIB@ +SHARED_LD_CXX = @SHARED_LD_CXX@ +SONAME_FLAG = @SONAME_FLAG@ +SO_SUFFIX = @SO_SUFFIX@ +STRIP = @STRIP@ +TOOLKIT = @TOOLKIT@ +TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ +TOOLKIT_VERSION = @TOOLKIT_VERSION@ +VENDOR = @VENDOR@ +includedir = @includedir@ +libdir = @libdir@ +srcdir = @srcdir@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +### Variables: ### -HEADER_PATH=$(top_srcdir)/contrib/include/wx -HEADER_SUBDIR=mmedia +LIBDIRNAME = $(top_builddir)lib +MMEDIADLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_MMEDIA $(CXXFLAGS) \ + $(PIC_FLAG) +MMEDIADLL_OBJECTS = \ + $(__MMEDIA_PLATFORM_SRC_OBJECTS) \ + mmediadll_cdbase.o \ + mmediadll_g711.o \ + mmediadll_g721.o \ + mmediadll_g723_24.o \ + mmediadll_g723_40.o \ + mmediadll_g72x.o \ + mmediadll_sndaiff.o \ + mmediadll_sndbase.o \ + mmediadll_sndcodec.o \ + mmediadll_sndcpcm.o \ + mmediadll_sndfile.o \ + mmediadll_sndg72x.o \ + mmediadll_sndmsad.o \ + mmediadll_sndpcm.o \ + mmediadll_sndulaw.o \ + mmediadll_sndwav.o \ + mmediadll_vidbase.o +MMEDIALIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -I$(srcdir)/../../include $(CXXFLAGS) +MMEDIALIB_OBJECTS = \ + $(__MMEDIA_PLATFORM_SRC_OBJECTS_1) \ + mmedialib_cdbase.o \ + mmedialib_g711.o \ + mmedialib_g721.o \ + mmedialib_g723_24.o \ + mmedialib_g723_40.o \ + mmedialib_g72x.o \ + mmedialib_sndaiff.o \ + mmedialib_sndbase.o \ + mmedialib_sndcodec.o \ + mmedialib_sndcpcm.o \ + mmedialib_sndfile.o \ + mmedialib_sndg72x.o \ + mmedialib_sndmsad.o \ + mmedialib_sndpcm.o \ + mmedialib_sndulaw.o \ + mmedialib_sndwav.o \ + mmedialib_vidbase.o -HEADERS=cdbase.h cdunix.h cdwin.h sndaiff.h sndbase.h sndcodec.h \ - sndcpcm.h sndesd.h sndfile.h sndg72x.h sndmsad.h sndoss.h \ - sndpcm.h sndulaw.h sndwav.h sndwin.h vidbase.h vidwin.h \ - vidxanm.h +### Conditionally set variables: ### -OBJECTS=cdbase.o cdunix.o cdwin.o g711.o g721.o g723_24.o \ - g723_40.o g72x.o sndaiff.o sndbase.o sndcodec.o \ - sndcpcm.o sndesd.o sndfile.o sndg72x.o sndmsad.o sndoss.o \ - sndpcm.o sndulaw.o sndwav.o sndwin.o vidbase.o vidwin.o vidxanm.o -DEPFILES=$(OBJECTS:.o=.d) +@COND_DEPS_TRACKING_0@CXXC = $(CXX) +@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR) +@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = +@COND_TOOLKIT_MAC@WXBASEPORT = _carbon +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d +@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) +@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)250 +@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5 +@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = +@COND_UNICODE_1@WXUNICODEFLAG = u +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p = -I$(top_srcdir)/src/expat/lib +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib +@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ +@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +COND_PLATFORM_UNIX_1___MMEDIA_PLATFORM_SRC_OBJECTS = \ + mmediadll_cdunix.o \ + mmediadll_sndesd.o \ + mmediadll_sndoss.o \ + mmediadll_vidxanm.o +@COND_PLATFORM_UNIX_1@__MMEDIA_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_UNIX_1___MMEDIA_PLATFORM_SRC_OBJECTS) +@COND_PLATFORM_WIN32_1@__MMEDIA_PLATFORM_SRC_OBJECTS \ +@COND_PLATFORM_WIN32_1@ = mmediadll_cdwin.o mmediadll_sndwin.o \ +@COND_PLATFORM_WIN32_1@ mmediadll_vidwin.o +COND_PLATFORM_UNIX_1___MMEDIA_PLATFORM_SRC_OBJECTS_1 = \ + mmedialib_cdunix.o \ + mmedialib_sndesd.o \ + mmedialib_sndoss.o \ + mmedialib_vidxanm.o +@COND_PLATFORM_UNIX_1@__MMEDIA_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_UNIX_1___MMEDIA_PLATFORM_SRC_OBJECTS_1) +@COND_PLATFORM_WIN32_1@__MMEDIA_PLATFORM_SRC_OBJECTS_1 \ +@COND_PLATFORM_WIN32_1@ = mmedialib_cdwin.o mmedialib_sndwin.o \ +@COND_PLATFORM_WIN32_1@ mmedialib_vidwin.o +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +COND_MONOLITHIC_0___WXLIB_CORE_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) +COND_MONOLITHIC_1___WXLIB_MONO_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_SHARED_1@__install_mmediadll___depname = install_mmediadll +@COND_SHARED_0@__install_mmedialib___depname = install_mmedialib +COND_SHARED_1___mmediadll___depname = \ + $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) +@COND_SHARED_1@__mmediadll___depname = $(COND_SHARED_1___mmediadll___depname) +COND_PLATFORM_WIN32_1___mmediadll___importlib = \ + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_WIN32_1@__mmediadll___importlib = $(COND_PLATFORM_WIN32_1___mmediadll___importlib) +COND_PLATFORM_MACOSX_1___mmediadll___macinstnamecmd = -install_name \ + $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) +@COND_PLATFORM_MACOSX_1@__mmediadll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___mmediadll___macinstnamecmd) +@COND_PLATFORM_MACOSX_1@__mmediadll___macver = \ +@COND_PLATFORM_MACOSX_1@ -compatibility_version 2.5 -current_version 2.5.0 +COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) +@COND_USE_SOSYMLINKS_1@__mmediadll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_cmd) +COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_inst_cmd = rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOSYMLINKS_1@__mmediadll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_inst_cmd) +COND_USE_SOVERLINUX_1___mmediadll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) +@COND_USE_SOVERLINUX_1@__mmediadll___soname_flags = $(COND_USE_SOVERLINUX_1___mmediadll___soname_flags) +COND_USE_SOVERSOLARIS_1___mmediadll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) +@COND_USE_SOVERSOLARIS_1@__mmediadll___soname_flags = $(COND_USE_SOVERSOLARIS_1___mmediadll___soname_flags) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__mmediadll___targetsuf2 \ +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__mmediadll___targetsuf2 \ +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.$(SO_SUFFIX) +@COND_USE_SOVERSION_0@__mmediadll___targetsuf2 = .$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__mmediadll___targetsuf3 \ +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0.0.0 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__mmediadll___targetsuf3 \ +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) +@COND_USE_SOVERSION_0@__mmediadll___targetsuf3 = .$(SO_SUFFIX) +COND_SHARED_0___mmedialib___depname = \ + $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).a +@COND_SHARED_0@__mmedialib___depname = $(COND_SHARED_0___mmedialib___depname) -APPEXTRADEFS=-I$(top_srcdir)/contrib/include +### Targets: ### -include $(top_builddir)/src/makelib.env +all: $(__mmediadll___depname) $(__mmedialib___depname) --include $(DEPFILES) +clean: + rm -rf ./.deps + rm -f ./*.o + rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).a + +distclean: clean + rm -f configure config.cache config.log config.status + rm -f bk-deps shared-ld-sh + +install: all $(__install_mmediadll___depname) $(__install_mmedialib___depname) + $(INSTALL_DIR) $(includedir) + for f in wx/mmedia/cdbase.h wx/mmedia/cdunix.h wx/mmedia/cdwin.h wx/mmedia/sndaiff.h wx/mmedia/sndbase.h wx/mmedia/sndcodec.h wx/mmedia/sndcpcm.h wx/mmedia/sndesd.h wx/mmedia/sndfile.h wx/mmedia/sndg72x.h wx/mmedia/sndmsad.h wx/mmedia/sndoss.h wx/mmedia/sndpcm.h wx/mmedia/sndulaw.h wx/mmedia/sndwav.h wx/mmedia/sndwin.h wx/mmedia/vidbase.h wx/mmedia/vidwin.h wx/mmedia/vidxanm.h; do \ + if test ! -d $(includedir)/`dirname $$f` ; then \ + $(INSTALL_DIR) $(includedir)/`dirname $$f`; \ + fi; \ + $(INSTALL_DATA) $(srcdir)/../../include//$$f $(includedir)/$$f; \ + done + +install-strip: install + $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) + +@COND_SHARED_1@install_mmediadll: +@COND_SHARED_1@ $(INSTALL_DIR) $(libdir) +@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) +@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) $(libdir) +@COND_SHARED_1@ (cd $(libdir) ; $(__mmediadll___so_symlinks_inst_cmd)) + +@COND_SHARED_0@install_mmedialib: +@COND_SHARED_0@ $(INSTALL_DIR) $(libdir) +@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).a $(libdir) + +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3): $(MMEDIADLL_OBJECTS) +@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__mmediadll___macinstnamecmd) $(__mmediadll___importlib) $(__mmediadll___soname_flags) $(__mmediadll___macver) $(EXTRALIBS_ESD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) +@COND_SHARED_1@ $(__mmediadll___so_symlinks_cmd) + +mmediadll_cdbase.o: $(srcdir)/cdbase.cpp + $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +mmediadll_cdunix.o: $(srcdir)/cdunix.cpp + $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +mmediadll_cdwin.o: $(srcdir)/cdwin.cpp + $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +mmediadll_g711.o: $(srcdir)/g711.cpp + $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +mmediadll_g721.o: $(srcdir)/g721.cpp + $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +mmediadll_g723_24.o: $(srcdir)/g723_24.cpp + $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +mmediadll_g723_40.o: $(srcdir)/g723_40.cpp + $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +mmediadll_g72x.o: $(srcdir)/g72x.cpp + $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +mmediadll_sndaiff.o: $(srcdir)/sndaiff.cpp + $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +mmediadll_sndbase.o: $(srcdir)/sndbase.cpp + $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +mmediadll_sndcodec.o: $(srcdir)/sndcodec.cpp + $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +mmediadll_sndcpcm.o: $(srcdir)/sndcpcm.cpp + $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +mmediadll_sndesd.o: $(srcdir)/sndesd.cpp + $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +mmediadll_sndfile.o: $(srcdir)/sndfile.cpp + $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +mmediadll_sndg72x.o: $(srcdir)/sndg72x.cpp + $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +mmediadll_sndmsad.o: $(srcdir)/sndmsad.cpp + $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +mmediadll_sndoss.o: $(srcdir)/sndoss.cpp + $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +mmediadll_sndpcm.o: $(srcdir)/sndpcm.cpp + $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +mmediadll_sndulaw.o: $(srcdir)/sndulaw.cpp + $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +mmediadll_sndwav.o: $(srcdir)/sndwav.cpp + $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +mmediadll_sndwin.o: $(srcdir)/sndwin.cpp + $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +mmediadll_vidbase.o: $(srcdir)/vidbase.cpp + $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +mmediadll_vidwin.o: $(srcdir)/vidwin.cpp + $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +mmediadll_vidxanm.o: $(srcdir)/vidxanm.cpp + $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< + +@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).a: $(MMEDIALIB_OBJECTS) +@COND_SHARED_0@ rm -f $@ +@COND_SHARED_0@ $(AR) rcu $@ $(MMEDIALIB_OBJECTS) +@COND_SHARED_0@ $(RANLIB) $@ + +mmedialib_cdbase.o: $(srcdir)/cdbase.cpp + $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +mmedialib_cdunix.o: $(srcdir)/cdunix.cpp + $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +mmedialib_cdwin.o: $(srcdir)/cdwin.cpp + $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +mmedialib_g711.o: $(srcdir)/g711.cpp + $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +mmedialib_g721.o: $(srcdir)/g721.cpp + $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +mmedialib_g723_24.o: $(srcdir)/g723_24.cpp + $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +mmedialib_g723_40.o: $(srcdir)/g723_40.cpp + $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +mmedialib_g72x.o: $(srcdir)/g72x.cpp + $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +mmedialib_sndaiff.o: $(srcdir)/sndaiff.cpp + $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +mmedialib_sndbase.o: $(srcdir)/sndbase.cpp + $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +mmedialib_sndcodec.o: $(srcdir)/sndcodec.cpp + $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +mmedialib_sndcpcm.o: $(srcdir)/sndcpcm.cpp + $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +mmedialib_sndesd.o: $(srcdir)/sndesd.cpp + $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +mmedialib_sndfile.o: $(srcdir)/sndfile.cpp + $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +mmedialib_sndg72x.o: $(srcdir)/sndg72x.cpp + $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +mmedialib_sndmsad.o: $(srcdir)/sndmsad.cpp + $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +mmedialib_sndoss.o: $(srcdir)/sndoss.cpp + $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +mmedialib_sndpcm.o: $(srcdir)/sndpcm.cpp + $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +mmedialib_sndulaw.o: $(srcdir)/sndulaw.cpp + $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +mmedialib_sndwav.o: $(srcdir)/sndwav.cpp + $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +mmedialib_sndwin.o: $(srcdir)/sndwin.cpp + $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +mmedialib_vidbase.o: $(srcdir)/vidbase.cpp + $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +mmedialib_vidwin.o: $(srcdir)/vidwin.cpp + $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +mmedialib_vidxanm.o: $(srcdir)/vidxanm.cpp + $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< + +uninstall: + + +# Include dependency info, if present: +@IF_GNU_MAKE@-include .deps/*.d + +.PHONY: all clean distclean install install_mmediadll install_mmedialib uninstall diff --git a/contrib/src/mmedia/cdwin.cpp b/contrib/src/mmedia/cdwin.cpp index f99b691a83..6d3d7af530 100644 --- a/contrib/src/mmedia/cdwin.cpp +++ b/contrib/src/mmedia/cdwin.cpp @@ -43,6 +43,8 @@ // Implementation // --------------------------------------------------------------------------- +IMPLEMENT_DYNAMIC_CLASS(wxCDAudioWin, wxCDAudio) + wxCDAudioWin::wxCDAudioWin(void) : wxCDAudio(), m_trksize(NULL), m_trkpos(NULL), m_ok(TRUE), m_toc(NULL) { diff --git a/contrib/src/mmedia/sndcpcm.cpp b/contrib/src/mmedia/sndcpcm.cpp index 8142931644..8dc836e5e8 100644 --- a/contrib/src/mmedia/sndcpcm.cpp +++ b/contrib/src/mmedia/sndcpcm.cpp @@ -51,7 +51,7 @@ wxUint32 wxSoundStreamPcm::GetBestSize() const // ----------------------------------------------------------------------- #define DEFINE_CONV(name, input_type, output_type, convert) \ -static void Convert_##name##(const void *buf_in, void *buf_out, wxUint32 len) \ +static void Convert_##name(const void *buf_in, void *buf_out, wxUint32 len) \ {\ register input_type src; \ register const input_type *t_buf_in = (input_type *)buf_in; \ diff --git a/contrib/src/mmedia/sndesd.cpp b/contrib/src/mmedia/sndesd.cpp index 74a55b63c2..e3d6860253 100644 --- a/contrib/src/mmedia/sndesd.cpp +++ b/contrib/src/mmedia/sndesd.cpp @@ -20,6 +20,8 @@ #pragma hdrstop #endif +#ifdef HAVE_ESD_H + // -------------------------------------------------------------------------- // MMedia headers // -------------------------------------------------------------------------- @@ -317,3 +319,5 @@ void wxSoundStreamESD::DetectBest(wxSoundFormatPcm *pcm) // Finally recopy the new format *pcm = best_pcm; } + +#endif // HAVE_ESD_H diff --git a/contrib/src/mmedia/sndwin.cpp b/contrib/src/mmedia/sndwin.cpp index 538f7e1813..467b53db9e 100644 --- a/contrib/src/mmedia/sndwin.cpp +++ b/contrib/src/mmedia/sndwin.cpp @@ -121,11 +121,7 @@ wxSoundStreamWin::~wxSoundStreamWin() // ----------------------------------------------------------------------- // _wxSoundHandlerWndProc: Window callback to handle buffer completion // ----------------------------------------------------------------------- -/* -LRESULT APIENTRY _EXPORT -*/ - -LRESULT WXDLLEXPORT APIENTRY _EXPORT +LRESULT APIENTRY _EXPORT _wxSoundHandlerWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) @@ -160,7 +156,9 @@ void wxSoundStreamWin::CreateSndWindow() wxGetInstance()); int error; - m_internal->m_sndWin = ::CreateWindow(wxCanvasClassName, NULL, 0, + // NB: class name must be kept in sync with wxCanvasClassName in + // src/msw/app.cpp! + m_internal->m_sndWin = ::CreateWindow(wxT("wxWindowClass"), NULL, 0, 0, 0, 0, 0, NULL, (HMENU) NULL, wxGetInstance(), NULL); @@ -764,7 +762,7 @@ bool wxSoundStreamWin::QueueFilled() const // wxSoundWinModule // -------------------------------------------------------------------------- -class WXDLLEXPORT wxSoundWinModule : public wxModule { +class wxSoundWinModule : public wxModule { DECLARE_DYNAMIC_CLASS(wxSoundWinModule) public: bool OnInit(); diff --git a/contrib/src/mmedia/vidxanm.cpp b/contrib/src/mmedia/vidxanm.cpp index 9da2da3403..b0d061854d 100644 --- a/contrib/src/mmedia/vidxanm.cpp +++ b/contrib/src/mmedia/vidxanm.cpp @@ -372,7 +372,7 @@ bool wxVideoXANIM::CollectInfo() wxInputStream *infoStream = xanimProcess->GetInputStream(); wxString totalOutput; - while (infoStream->LastError() == wxSTREAM_NOERROR) { + while (infoStream->GetLastError() == wxSTREAM_NO_ERROR) { char line[100]; infoStream->Read(line, sizeof(line)-1); @@ -468,8 +468,7 @@ bool wxVideoXANIM::RestartXANIM() GtkPizza *pizza = GTK_PIZZA( m_video_output->m_wxwindow ); GdkWindow *window = pizza->bin_window; - m_internal->xanim_window = - ((GdkWindowPrivate *)window)->xwindow; + m_internal->xanim_window = GDK_WINDOW_XWINDOW(window); #endif // Get the XANIM atom m_internal->xanim_atom = XInternAtom(m_internal->xanim_dpy, diff --git a/contrib/src/net/Makefile.in b/contrib/src/net/Makefile.in index 5d9bce041c..03a217321c 100644 --- a/contrib/src/net/Makefile.in +++ b/contrib/src/net/Makefile.in @@ -1,26 +1,241 @@ -# $Id$ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= -top_srcdir = @top_srcdir@/.. -top_builddir = ../../.. -libsrc_dir = contrib/src/net -TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_net-@WX_RELEASE@ +@MAKE_SET@ -LIBVERSION_CURRENT=@WX_CURRENT@ -LIBVERSION_REVISION=@WX_REVISION@ -LIBVERSION_AGE=@WX_AGE@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +INSTALL = @INSTALL@ +AR = @AR@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXFLAGS = @CXXFLAGS@ +DLLPREFIX = @DLLPREFIX@ +EXTRALIBS = @EXTRALIBS@ +EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_DIR = @INSTALL_DIR@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LN_S = @LN_S@ +PIC_FLAG = @PIC_FLAG@ +RANLIB = @RANLIB@ +SHARED_LD_CXX = @SHARED_LD_CXX@ +SONAME_FLAG = @SONAME_FLAG@ +SO_SUFFIX = @SO_SUFFIX@ +STRIP = @STRIP@ +TOOLKIT = @TOOLKIT@ +TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ +TOOLKIT_VERSION = @TOOLKIT_VERSION@ +VENDOR = @VENDOR@ +includedir = @includedir@ +libdir = @libdir@ +srcdir = @srcdir@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +### Variables: ### -HEADER_PATH=$(top_srcdir)/contrib/include/wx -HEADER_SUBDIR=net +LIBDIRNAME = $(top_builddir)lib +NETUTILSDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_NETUTILS $(CXXFLAGS) \ + $(PIC_FLAG) +NETUTILSDLL_OBJECTS = \ + netutilsdll_email.o \ + netutilsdll_smapi.o \ + netutilsdll_web.o +NETUTILSLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -I$(srcdir)/../../include $(CXXFLAGS) +NETUTILSLIB_OBJECTS = \ + netutilslib_email.o \ + netutilslib_smapi.o \ + netutilslib_web.o -HEADERS=msg.h email.h web.h +### Conditionally set variables: ### -OBJECTS=email.o web.o -DEPFILES=$(OBJECTS:.o=.d) +@COND_DEPS_TRACKING_0@CXXC = $(CXX) +@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR) +@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = +@COND_TOOLKIT_MAC@WXBASEPORT = _carbon +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d +@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) +@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)250 +@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5 +@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = +@COND_UNICODE_1@WXUNICODEFLAG = u +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p = -I$(top_srcdir)/src/expat/lib +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib +@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ +@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +COND_MONOLITHIC_0___WXLIB_CORE_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) +COND_MONOLITHIC_1___WXLIB_MONO_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_SHARED_1@__install_netutilsdll___depname = install_netutilsdll +@COND_SHARED_0@__install_netutilslib___depname = install_netutilslib +COND_SHARED_1___netutilsdll___depname = \ + $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) +@COND_SHARED_1@__netutilsdll___depname = $(COND_SHARED_1___netutilsdll___depname) +COND_PLATFORM_WIN32_1___netutilsdll___importlib = \ + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_WIN32_1@__netutilsdll___importlib = $(COND_PLATFORM_WIN32_1___netutilsdll___importlib) +COND_PLATFORM_MACOSX_1___netutilsdll___macinstnamecmd = -install_name \ + $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2) +@COND_PLATFORM_MACOSX_1@__netutilsdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___netutilsdll___macinstnamecmd) +@COND_PLATFORM_MACOSX_1@__netutilsdll___macver = \ +@COND_PLATFORM_MACOSX_1@ -compatibility_version 2.5 -current_version 2.5.0 +COND_USE_SOSYMLINKS_1___netutilsdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm \ + -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) +@COND_USE_SOSYMLINKS_1@__netutilsdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___netutilsdll___so_symlinks_cmd) +COND_USE_SOSYMLINKS_1___netutilsdll___so_symlinks_inst_cmd = rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOSYMLINKS_1@__netutilsdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___netutilsdll___so_symlinks_inst_cmd) +COND_USE_SOVERLINUX_1___netutilsdll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2) +@COND_USE_SOVERLINUX_1@__netutilsdll___soname_flags = $(COND_USE_SOVERLINUX_1___netutilsdll___soname_flags) +COND_USE_SOVERSOLARIS_1___netutilsdll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) +@COND_USE_SOVERSOLARIS_1@__netutilsdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___netutilsdll___soname_flags) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__netutilsdll___targetsuf2 \ +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__netutilsdll___targetsuf2 \ +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.$(SO_SUFFIX) +@COND_USE_SOVERSION_0@__netutilsdll___targetsuf2 = .$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__netutilsdll___targetsuf3 \ +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0.0.0 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__netutilsdll___targetsuf3 \ +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) +@COND_USE_SOVERSION_0@__netutilsdll___targetsuf3 = .$(SO_SUFFIX) +COND_SHARED_0___netutilslib___depname = \ + $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).a +@COND_SHARED_0@__netutilslib___depname = $(COND_SHARED_0___netutilslib___depname) -APPEXTRADEFS=-I$(top_srcdir)/contrib/include +### Targets: ### -include $(top_builddir)/src/makelib.env +all: $(__netutilsdll___depname) $(__netutilslib___depname) --include $(DEPFILES) +clean: + rm -rf ./.deps + rm -f ./*.o + rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).a + +distclean: clean + rm -f configure config.cache config.log config.status + rm -f bk-deps shared-ld-sh + +install: all $(__install_netutilsdll___depname) $(__install_netutilslib___depname) + $(INSTALL_DIR) $(includedir) + for f in wx/net/email.h wx/net/msg.h wx/net/smapi.h wx/net/web.h; do \ + if test ! -d $(includedir)/`dirname $$f` ; then \ + $(INSTALL_DIR) $(includedir)/`dirname $$f`; \ + fi; \ + $(INSTALL_DATA) $(srcdir)/../../include//$$f $(includedir)/$$f; \ + done + +install-strip: install + $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) + +@COND_SHARED_1@install_netutilsdll: +@COND_SHARED_1@ $(INSTALL_DIR) $(libdir) +@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) +@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) $(libdir) +@COND_SHARED_1@ (cd $(libdir) ; $(__netutilsdll___so_symlinks_inst_cmd)) + +@COND_SHARED_0@install_netutilslib: +@COND_SHARED_0@ $(INSTALL_DIR) $(libdir) +@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).a $(libdir) + +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3): $(NETUTILSDLL_OBJECTS) +@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(NETUTILSDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__netutilsdll___macinstnamecmd) $(__netutilsdll___importlib) $(__netutilsdll___soname_flags) $(__netutilsdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) +@COND_SHARED_1@ $(__netutilsdll___so_symlinks_cmd) + +netutilsdll_email.o: $(srcdir)/email.cpp + $(CXXC) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $< + +netutilsdll_smapi.o: $(srcdir)/smapi.cpp + $(CXXC) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $< + +netutilsdll_web.o: $(srcdir)/web.cpp + $(CXXC) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $< + +@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).a: $(NETUTILSLIB_OBJECTS) +@COND_SHARED_0@ rm -f $@ +@COND_SHARED_0@ $(AR) rcu $@ $(NETUTILSLIB_OBJECTS) +@COND_SHARED_0@ $(RANLIB) $@ + +netutilslib_email.o: $(srcdir)/email.cpp + $(CXXC) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $< + +netutilslib_smapi.o: $(srcdir)/smapi.cpp + $(CXXC) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $< + +netutilslib_web.o: $(srcdir)/web.cpp + $(CXXC) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $< + +uninstall: + + +# Include dependency info, if present: +@IF_GNU_MAKE@-include .deps/*.d + +.PHONY: all clean distclean install install_netutilsdll install_netutilslib uninstall diff --git a/contrib/src/net/smapi.cpp b/contrib/src/net/smapi.cpp index 43421b8ebd..5423c2e220 100644 --- a/contrib/src/net/smapi.cpp +++ b/contrib/src/net/smapi.cpp @@ -31,7 +31,7 @@ #include "wx/net/smapi.h" -class wxMapiData +class WXDLLIMPEXP_NETUTILS wxMapiData { public: wxMapiData() diff --git a/contrib/src/plot/Makefile.in b/contrib/src/plot/Makefile.in index f5435cd265..e6c5be3f85 100644 --- a/contrib/src/plot/Makefile.in +++ b/contrib/src/plot/Makefile.in @@ -1,25 +1,224 @@ -# $Id$ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= -top_srcdir = @top_srcdir@/.. -top_builddir = ../../.. -libsrc_dir = contrib/src/plot -TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_plot-@WX_RELEASE@ +@MAKE_SET@ -LIBVERSION_CURRENT=@WX_CURRENT@ -LIBVERSION_REVISION=@WX_REVISION@ -LIBVERSION_AGE=@WX_AGE@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +INSTALL = @INSTALL@ +AR = @AR@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXFLAGS = @CXXFLAGS@ +DLLPREFIX = @DLLPREFIX@ +EXTRALIBS = @EXTRALIBS@ +EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_DIR = @INSTALL_DIR@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LN_S = @LN_S@ +PIC_FLAG = @PIC_FLAG@ +RANLIB = @RANLIB@ +SHARED_LD_CXX = @SHARED_LD_CXX@ +SONAME_FLAG = @SONAME_FLAG@ +SO_SUFFIX = @SO_SUFFIX@ +STRIP = @STRIP@ +TOOLKIT = @TOOLKIT@ +TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ +TOOLKIT_VERSION = @TOOLKIT_VERSION@ +VENDOR = @VENDOR@ +includedir = @includedir@ +libdir = @libdir@ +srcdir = @srcdir@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ -HEADER_PATH=$(top_srcdir)/contrib/include/wx -HEADER_SUBDIR=plot +### Variables: ### -HEADERS=plot.h +LIBDIRNAME = $(top_builddir)lib +PLOTDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_PLOT $(CXXFLAGS) \ + $(PIC_FLAG) +PLOTDLL_OBJECTS = \ + plotdll_plot.o +PLOTLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -I$(srcdir)/../../include $(CXXFLAGS) +PLOTLIB_OBJECTS = \ + plotlib_plot.o -OBJECTS=plot.o -DEPFILES=$(OBJECTS:.o=.d) +### Conditionally set variables: ### -APPEXTRADEFS=-I$(top_srcdir)/contrib/include +@COND_DEPS_TRACKING_0@CXXC = $(CXX) +@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR) +@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = +@COND_TOOLKIT_MAC@WXBASEPORT = _carbon +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d +@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) +@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)250 +@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5 +@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = +@COND_UNICODE_1@WXUNICODEFLAG = u +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p = -I$(top_srcdir)/src/expat/lib +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib +@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ +@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +COND_MONOLITHIC_0___WXLIB_CORE_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) +COND_MONOLITHIC_1___WXLIB_MONO_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_SHARED_1@__install_plotdll___depname = install_plotdll +@COND_SHARED_0@__install_plotlib___depname = install_plotlib +COND_SHARED_1___plotdll___depname = \ + $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3) +@COND_SHARED_1@__plotdll___depname = $(COND_SHARED_1___plotdll___depname) +COND_PLATFORM_WIN32_1___plotdll___importlib = \ + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_WIN32_1@__plotdll___importlib = $(COND_PLATFORM_WIN32_1___plotdll___importlib) +COND_PLATFORM_MACOSX_1___plotdll___macinstnamecmd = -install_name \ + $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2) +@COND_PLATFORM_MACOSX_1@__plotdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___plotdll___macinstnamecmd) +@COND_PLATFORM_MACOSX_1@__plotdll___macver = \ +@COND_PLATFORM_MACOSX_1@ -compatibility_version 2.5 -current_version 2.5.0 +COND_USE_SOSYMLINKS_1___plotdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) +@COND_USE_SOSYMLINKS_1@__plotdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___plotdll___so_symlinks_cmd) +COND_USE_SOSYMLINKS_1___plotdll___so_symlinks_inst_cmd = rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOSYMLINKS_1@__plotdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___plotdll___so_symlinks_inst_cmd) +COND_USE_SOVERLINUX_1___plotdll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2) +@COND_USE_SOVERLINUX_1@__plotdll___soname_flags = $(COND_USE_SOVERLINUX_1___plotdll___soname_flags) +COND_USE_SOVERSOLARIS_1___plotdll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3) +@COND_USE_SOVERSOLARIS_1@__plotdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___plotdll___soname_flags) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__plotdll___targetsuf2 \ +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__plotdll___targetsuf2 \ +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.$(SO_SUFFIX) +@COND_USE_SOVERSION_0@__plotdll___targetsuf2 = .$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__plotdll___targetsuf3 \ +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0.0.0 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__plotdll___targetsuf3 \ +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) +@COND_USE_SOVERSION_0@__plotdll___targetsuf3 = .$(SO_SUFFIX) +COND_SHARED_0___plotlib___depname = \ + $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX).a +@COND_SHARED_0@__plotlib___depname = $(COND_SHARED_0___plotlib___depname) -include $(top_builddir)/src/makelib.env +### Targets: ### --include $(DEPFILES) +all: $(__plotdll___depname) $(__plotlib___depname) + +clean: + rm -rf ./.deps + rm -f ./*.o + rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX).a + +distclean: clean + rm -f configure config.cache config.log config.status + rm -f bk-deps shared-ld-sh + +install: all $(__install_plotdll___depname) $(__install_plotlib___depname) + $(INSTALL_DIR) $(includedir) + for f in wx/plot/plot.h wx/plot/plot_dwn.bmp wx/plot/plot_enl.bmp wx/plot/plot_shr.bmp wx/plot/plot_up.bmp wx/plot/plot_zin.bmp wx/plot/plot_zot.bmp wx/plot/wxplot.rc; do \ + if test ! -d $(includedir)/`dirname $$f` ; then \ + $(INSTALL_DIR) $(includedir)/`dirname $$f`; \ + fi; \ + $(INSTALL_DATA) $(srcdir)/../../include//$$f $(includedir)/$$f; \ + done + +install-strip: install + $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3) + +@COND_SHARED_1@install_plotdll: +@COND_SHARED_1@ $(INSTALL_DIR) $(libdir) +@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) +@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3) $(libdir) +@COND_SHARED_1@ (cd $(libdir) ; $(__plotdll___so_symlinks_inst_cmd)) + +@COND_SHARED_0@install_plotlib: +@COND_SHARED_0@ $(INSTALL_DIR) $(libdir) +@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX).a $(libdir) + +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3): $(PLOTDLL_OBJECTS) +@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(PLOTDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__plotdll___macinstnamecmd) $(__plotdll___importlib) $(__plotdll___soname_flags) $(__plotdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) +@COND_SHARED_1@ $(__plotdll___so_symlinks_cmd) + +plotdll_plot.o: $(srcdir)/plot.cpp + $(CXXC) -c -o $@ $(PLOTDLL_CXXFLAGS) $< + +@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX).a: $(PLOTLIB_OBJECTS) +@COND_SHARED_0@ rm -f $@ +@COND_SHARED_0@ $(AR) rcu $@ $(PLOTLIB_OBJECTS) +@COND_SHARED_0@ $(RANLIB) $@ + +plotlib_plot.o: $(srcdir)/plot.cpp + $(CXXC) -c -o $@ $(PLOTLIB_CXXFLAGS) $< + +uninstall: + + +# Include dependency info, if present: +@IF_GNU_MAKE@-include .deps/*.d + +.PHONY: all clean distclean install install_plotdll install_plotlib uninstall diff --git a/contrib/src/xrc/Makefile.in b/contrib/src/xrc/Makefile.in index 31332a0c94..20d4c214e0 100644 --- a/contrib/src/xrc/Makefile.in +++ b/contrib/src/xrc/Makefile.in @@ -173,6 +173,9 @@ XRCLIB_OBJECTS = \ @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +COND_MONOLITHIC_0___WXLIB_ADV_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) COND_MONOLITHIC_0___WXLIB_CORE_p = \ @@ -281,7 +284,7 @@ install-strip: install uninstall: @COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3): $(XRCDLL_OBJECTS) -@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(XRCDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(__xrcdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) +@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(XRCDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(__xrcdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ $(__xrcdll___so_symlinks_cmd) xrcdll_xh_bmp.o: $(srcdir)/xh_bmp.cpp diff --git a/src/xrc/Makefile.in b/src/xrc/Makefile.in index 31332a0c94..20d4c214e0 100644 --- a/src/xrc/Makefile.in +++ b/src/xrc/Makefile.in @@ -173,6 +173,9 @@ XRCLIB_OBJECTS = \ @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +COND_MONOLITHIC_0___WXLIB_ADV_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) COND_MONOLITHIC_0___WXLIB_CORE_p = \ @@ -281,7 +284,7 @@ install-strip: install uninstall: @COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3): $(XRCDLL_OBJECTS) -@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(XRCDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(__xrcdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) +@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(XRCDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(__xrcdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ $(__xrcdll___so_symlinks_cmd) xrcdll_xh_bmp.o: $(srcdir)/xh_bmp.cpp -- 2.45.2