From: Vadim Zeitlin Date: Fri, 23 Oct 2009 17:48:21 +0000 (+0000) Subject: Rebaked using post-0.2.7 svn version of bakefile. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8c9833d09e4488206c1c6947486cd9289e0dbbb9 Rebaked using post-0.2.7 svn version of bakefile. Unfortunately 0.2.7 release contained a bug in msvc backend which resulted in warnings generated for each file compiled. Apply the fix from bakefile svn to fix this (and test if no other problems are found). Also update all makefile.unx after changes of r62477. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 8e6d797eab..1cefca8652 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -39,8 +39,8 @@ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \ - $(__DEBUGINFO_2) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \ - /DNDEBUG /I..\..\include /I$(SETUPHDIR) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \ + /I..\..\include /I$(SETUPHDIR) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CFLAGS) WXREGEX_OBJECTS = \ $(OBJS)\wxregex_regcomp.obj \ @@ -48,9 +48,8 @@ WXREGEX_OBJECTS = \ $(OBJS)\wxregex_regerror.obj \ $(OBJS)\wxregex_regfree.obj WXZLIB_CFLAGS = /M$(__RUNTIME_LIBS_25)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb $(__DEBUGINFO_17) \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \ - $(CPPFLAGS) $(CFLAGS) + /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \ + $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG $(CPPFLAGS) $(CFLAGS) WXZLIB_OBJECTS = \ $(OBJS)\wxzlib_adler32.obj \ $(OBJS)\wxzlib_compress.obj \ @@ -65,9 +64,9 @@ WXZLIB_OBJECTS = \ $(OBJS)\wxzlib_inftrees.obj \ $(OBJS)\wxzlib_inffast.obj WXPNG_CFLAGS = /M$(__RUNTIME_LIBS_40)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb $(__DEBUGINFO_32) \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \ - /I..\..\src\zlib $(CPPFLAGS) $(CFLAGS) + /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \ + $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG /I..\..\src\zlib $(CPPFLAGS) \ + $(CFLAGS) WXPNG_OBJECTS = \ $(OBJS)\wxpng_png.obj \ $(OBJS)\wxpng_pngerror.obj \ @@ -87,9 +86,9 @@ WXPNG_OBJECTS = \ $(OBJS)\wxpng_pngwtran.obj \ $(OBJS)\wxpng_pngwutil.obj WXJPEG_CFLAGS = /M$(__RUNTIME_LIBS_55)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb $(__DEBUGINFO_47) \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \ - /I$(SETUPHDIR) $(CPPFLAGS) $(CFLAGS) + /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \ + $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG /I$(SETUPHDIR) $(CPPFLAGS) \ + $(CFLAGS) WXJPEG_OBJECTS = \ $(OBJS)\wxjpeg_jcomapi.obj \ $(OBJS)\wxjpeg_jutils.obj \ @@ -138,10 +137,9 @@ WXJPEG_OBJECTS = \ $(OBJS)\wxjpeg_jquant2.obj \ $(OBJS)\wxjpeg_jdmerge.obj WXTIFF_CFLAGS = /M$(__RUNTIME_LIBS_70)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(__DEBUGINFO_62) \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \ - /I..\..\src\zlib /I..\..\src\jpeg /I..\..\src\tiff\libtiff $(CPPFLAGS) \ - $(CFLAGS) + /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \ + $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG /I..\..\src\zlib \ + /I..\..\src\jpeg /I..\..\src\tiff\libtiff $(CPPFLAGS) $(CFLAGS) WXTIFF_OBJECTS = \ $(OBJS)\wxtiff_tif_win32.obj \ $(OBJS)\wxtiff_tif_aux.obj \ @@ -181,18 +179,18 @@ WXTIFF_OBJECTS = \ $(OBJS)\wxtiff_tif_zip.obj WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS_85)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \ - $(__DEBUGINFO_77) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \ - /DNDEBUG /I$(LIBDIRNAME) /DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \ + /I$(LIBDIRNAME) /DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS) WXEXPAT_OBJECTS = \ $(OBJS)\wxexpat_xmlparse.obj \ $(OBJS)\wxexpat_xmlrole.obj \ $(OBJS)\wxexpat_xmltok.obj WXSCINTILLA_CXXFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).pdb \ - $(__DEBUGINFO_92) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \ - /DNDEBUG /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src \ - /D__WX__ /DSCI_LEXER /DLINK_LEXERS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \ + /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \ + /DSCI_LEXER /DLINK_LEXERS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \ + $(CXXFLAGS) WXSCINTILLA_OBJECTS = \ $(OBJS)\wxscintilla_AutoComplete.obj \ $(OBJS)\wxscintilla_CallTip.obj \ @@ -289,27 +287,27 @@ WXSCINTILLA_OBJECTS = \ MONODLL_CFLAGS = /M$(__RUNTIME_LIBS_116)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \ - $(__DEBUGINFO_108) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib /DwxUSE_BASE=1 /DWXMAKINGDLL \ - /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \ - /DSCI_LEXER /DLINK_LEXERS $(CPPFLAGS) $(CFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 \ + /DWXMAKINGDLL /I..\..\src\stc\scintilla\include \ + /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS $(CPPFLAGS) \ + $(CFLAGS) MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS_116)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \ - $(__DEBUGINFO_108) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib /DwxUSE_BASE=1 /DWXMAKINGDLL \ - /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \ - /DSCI_LEXER /DLINK_LEXERS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 \ + /DWXMAKINGDLL /I..\..\src\stc\scintilla\include \ + /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \ + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ /Fp"$(OBJS)\wxprec_monodll.pch" $(CPPFLAGS) $(CXXFLAGS) MONODLL_OBJECTS = \ $(OBJS)\monodll_dummy.obj \ @@ -441,27 +439,25 @@ MONODLL_RESOURCES = \ MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS_131)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \ - $(__DEBUGINFO_123) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib /DwxUSE_BASE=1 /I..\..\src\stc\scintilla\include \ - /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS $(CPPFLAGS) \ - $(CFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 \ + /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \ + /DSCI_LEXER /DLINK_LEXERS $(CPPFLAGS) $(CFLAGS) MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_131)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \ - $(__DEBUGINFO_123) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib /DwxUSE_BASE=1 /I..\..\src\stc\scintilla\include \ - /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 \ + /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \ + /DSCI_LEXER /DLINK_LEXERS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ /Fp"$(OBJS)\wxprec_monolib.pch" $(CPPFLAGS) $(CXXFLAGS) MONOLIB_OBJECTS = \ $(OBJS)\monolib_dummy.obj \ @@ -591,26 +587,24 @@ MONOLIB_OBJECTS = \ BASEDLL_CFLAGS = /M$(__RUNTIME_LIBS_147)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \ - $(__DEBUGINFO_139) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 \ - $(CPPFLAGS) $(CFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \ + /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_147)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \ - $(__DEBUGINFO_139) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_basedll.pch" $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \ + /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_basedll.pch" $(CPPFLAGS) $(CXXFLAGS) BASEDLL_OBJECTS = \ $(OBJS)\basedll_dummy.obj \ $(OBJS)\basedll_any.obj \ @@ -726,25 +720,24 @@ BASEDLL_RESOURCES = \ BASELIB_CFLAGS = /M$(__RUNTIME_LIBS_162)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \ - $(__DEBUGINFO_154) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib /DwxUSE_GUI=0 /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \ + /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_162)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \ - $(__DEBUGINFO_154) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib /DwxUSE_GUI=0 /DwxUSE_BASE=1 $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_baselib.pch" \ - $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \ + /DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_baselib.pch" $(CPPFLAGS) $(CXXFLAGS) BASELIB_OBJECTS = \ $(OBJS)\baselib_dummy.obj \ $(OBJS)\baselib_any.obj \ @@ -858,15 +851,14 @@ BASELIB_OBJECTS = \ NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_178)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb \ - $(__DEBUGINFO_170) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_NET \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_netdll.pch" $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \ + /DWXUSINGDLL /DWXMAKINGDLL_NET $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netdll.pch" $(CPPFLAGS) $(CXXFLAGS) NETDLL_OBJECTS = \ $(OBJS)\netdll_dummy.obj \ $(OBJS)\netdll_fs_inet.obj \ @@ -886,14 +878,14 @@ NETDLL_RESOURCES = \ NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_193)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.pdb \ - $(__DEBUGINFO_185) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netlib.pch" $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \ + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_netlib.pch" $(CPPFLAGS) $(CXXFLAGS) NETLIB_OBJECTS = \ $(OBJS)\netlib_dummy.obj \ $(OBJS)\netlib_fs_inet.obj \ @@ -911,15 +903,14 @@ NETLIB_OBJECTS = \ COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_209)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb \ - $(__DEBUGINFO_201) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_CORE /DwxUSE_BASE=0 \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_coredll.pch" $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ + /DWXMAKINGDLL_CORE /DwxUSE_BASE=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_coredll.pch" $(CPPFLAGS) $(CXXFLAGS) COREDLL_OBJECTS = \ $(OBJS)\coredll_dummy.obj \ $(OBJS)\coredll_event.obj \ @@ -936,14 +927,14 @@ COREDLL_RESOURCES = \ CORELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_224)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.pdb \ - $(__DEBUGINFO_216) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib /DwxUSE_BASE=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_corelib.pch" $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=0 \ + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_corelib.pch" $(CPPFLAGS) $(CXXFLAGS) CORELIB_OBJECTS = \ $(OBJS)\corelib_dummy.obj \ $(OBJS)\corelib_event.obj \ @@ -958,15 +949,14 @@ CORELIB_OBJECTS = \ ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_240)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb \ - $(__DEBUGINFO_232) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_ADV $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_advdll.pch" \ - $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ + /DWXMAKINGDLL_ADV $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_advdll.pch" $(CPPFLAGS) $(CXXFLAGS) ADVDLL_OBJECTS = \ $(OBJS)\advdll_dummy.obj \ $(____ADVANCED_SRC_FILENAMES_2_OBJECTS) @@ -975,29 +965,28 @@ ADVDLL_RESOURCES = \ ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_255)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.pdb \ - $(__DEBUGINFO_247) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_advlib.pch" $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_advlib.pch" \ + $(CPPFLAGS) $(CXXFLAGS) ADVLIB_OBJECTS = \ $(OBJS)\advlib_dummy.obj \ $(____ADVANCED_SRC_FILENAMES_3_OBJECTS) MEDIADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_271)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb \ - $(__DEBUGINFO_263) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_MEDIA $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_mediadll.pch" \ - $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ + /DWXMAKINGDLL_MEDIA $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_mediadll.pch" $(CPPFLAGS) $(CXXFLAGS) MEDIADLL_OBJECTS = \ $(OBJS)\mediadll_dummy.obj \ $(OBJS)\mediadll_mediactrlcmn.obj \ @@ -1009,14 +998,14 @@ MEDIADLL_RESOURCES = \ MEDIALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_286)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.pdb \ - $(__DEBUGINFO_278) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_medialib.pch" $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_medialib.pch" \ + $(CPPFLAGS) $(CXXFLAGS) MEDIALIB_OBJECTS = \ $(OBJS)\medialib_dummy.obj \ $(OBJS)\medialib_mediactrlcmn.obj \ @@ -1026,15 +1015,14 @@ MEDIALIB_OBJECTS = \ HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_302)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb \ - $(__DEBUGINFO_294) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_HTML $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_htmldll.pch" \ - $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ + /DWXMAKINGDLL_HTML $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_htmldll.pch" $(CPPFLAGS) $(CXXFLAGS) HTMLDLL_OBJECTS = \ $(OBJS)\htmldll_dummy.obj \ $(OBJS)\htmldll_helpbest.obj \ @@ -1066,14 +1054,14 @@ HTMLDLL_RESOURCES = \ HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_317)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.pdb \ - $(__DEBUGINFO_309) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_htmllib.pch" $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_htmllib.pch" \ + $(CPPFLAGS) $(CXXFLAGS) HTMLLIB_OBJECTS = \ $(OBJS)\htmllib_dummy.obj \ $(OBJS)\htmllib_helpbest.obj \ @@ -1103,15 +1091,14 @@ HTMLLIB_OBJECTS = \ QADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_333)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb \ - $(__DEBUGINFO_325) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_QA $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_qadll.pch" \ - $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ + /DWXMAKINGDLL_QA $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_qadll.pch" $(CPPFLAGS) $(CXXFLAGS) QADLL_OBJECTS = \ $(OBJS)\qadll_dummy.obj \ $(OBJS)\qadll_debugrpt.obj \ @@ -1121,14 +1108,14 @@ QADLL_RESOURCES = \ QALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_348)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.pdb \ - $(__DEBUGINFO_340) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_qalib.pch" $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_qalib.pch" \ + $(CPPFLAGS) $(CXXFLAGS) QALIB_OBJECTS = \ $(OBJS)\qalib_dummy.obj \ $(OBJS)\qalib_debugrpt.obj \ @@ -1136,15 +1123,14 @@ QALIB_OBJECTS = \ XMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_364)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb \ - $(__DEBUGINFO_356) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_XML \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_xmldll.pch" $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \ + /DWXUSINGDLL /DWXMAKINGDLL_XML $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmldll.pch" $(CPPFLAGS) $(CXXFLAGS) XMLDLL_OBJECTS = \ $(OBJS)\xmldll_dummy.obj \ $(OBJS)\xmldll_xml.obj \ @@ -1154,14 +1140,14 @@ XMLDLL_RESOURCES = \ XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_379)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.pdb \ - $(__DEBUGINFO_371) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmllib.pch" $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \ + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_xmllib.pch" $(CPPFLAGS) $(CXXFLAGS) XMLLIB_OBJECTS = \ $(OBJS)\xmllib_dummy.obj \ $(OBJS)\xmllib_xml.obj \ @@ -1169,15 +1155,14 @@ XMLLIB_OBJECTS = \ XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_395)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb \ - $(__DEBUGINFO_387) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_XRC $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xrcdll.pch" \ - $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ + /DWXMAKINGDLL_XRC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_xrcdll.pch" $(CPPFLAGS) $(CXXFLAGS) XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_dummy.obj \ $(OBJS)\xrcdll_xh_animatctrl.obj \ @@ -1246,14 +1231,14 @@ XRCDLL_RESOURCES = \ XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_410)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.pdb \ - $(__DEBUGINFO_402) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_xrclib.pch" $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xrclib.pch" \ + $(CPPFLAGS) $(CXXFLAGS) XRCLIB_OBJECTS = \ $(OBJS)\xrclib_dummy.obj \ $(OBJS)\xrclib_xh_animatctrl.obj \ @@ -1320,15 +1305,14 @@ XRCLIB_OBJECTS = \ AUIDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_426)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb \ - $(__DEBUGINFO_418) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_AUI $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_auidll.pch" \ - $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ + /DWXMAKINGDLL_AUI $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_auidll.pch" $(CPPFLAGS) $(CXXFLAGS) AUIDLL_OBJECTS = \ $(OBJS)\auidll_dummy.obj \ $(OBJS)\auidll_framemanager.obj \ @@ -1342,14 +1326,14 @@ AUIDLL_RESOURCES = \ AUILIB_CXXFLAGS = /M$(__RUNTIME_LIBS_441)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.pdb \ - $(__DEBUGINFO_433) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_auilib.pch" $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_auilib.pch" \ + $(CPPFLAGS) $(CXXFLAGS) AUILIB_OBJECTS = \ $(OBJS)\auilib_dummy.obj \ $(OBJS)\auilib_framemanager.obj \ @@ -1361,15 +1345,14 @@ AUILIB_OBJECTS = \ RIBBONDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_457)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).pdb \ - $(__DEBUGINFO_449) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_RIBBON $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_ribbondll.pch" \ - $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ + /DWXMAKINGDLL_RIBBON $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_ribbondll.pch" $(CPPFLAGS) $(CXXFLAGS) RIBBONDLL_OBJECTS = \ $(OBJS)\ribbondll_dummy.obj \ $(OBJS)\ribbondll_art_internal.obj \ @@ -1387,14 +1370,14 @@ RIBBONDLL_RESOURCES = \ RIBBONLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_472)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.pdb \ - $(__DEBUGINFO_464) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_ribbonlib.pch" $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_ribbonlib.pch" \ + $(CPPFLAGS) $(CXXFLAGS) RIBBONLIB_OBJECTS = \ $(OBJS)\ribbonlib_dummy.obj \ $(OBJS)\ribbonlib_art_internal.obj \ @@ -1410,15 +1393,14 @@ RIBBONLIB_OBJECTS = \ PROPGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_488)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb \ - $(__DEBUGINFO_480) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_PROPGRID $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_propgriddll.pch" \ - $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ + /DWXMAKINGDLL_PROPGRID $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_propgriddll.pch" $(CPPFLAGS) $(CXXFLAGS) PROPGRIDDLL_OBJECTS = \ $(OBJS)\propgriddll_dummy.obj \ $(OBJS)\propgriddll_advprops.obj \ @@ -1434,14 +1416,14 @@ PROPGRIDDLL_RESOURCES = \ PROPGRIDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_503)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.pdb \ - $(__DEBUGINFO_495) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_propgridlib.pch" $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_propgridlib.pch" \ + $(CPPFLAGS) $(CXXFLAGS) PROPGRIDLIB_OBJECTS = \ $(OBJS)\propgridlib_dummy.obj \ $(OBJS)\propgridlib_advprops.obj \ @@ -1455,15 +1437,14 @@ PROPGRIDLIB_OBJECTS = \ RICHTEXTDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_519)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb \ - $(__DEBUGINFO_511) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_RICHTEXT $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_richtextdll.pch" \ - $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ + /DWXMAKINGDLL_RICHTEXT $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_richtextdll.pch" $(CPPFLAGS) $(CXXFLAGS) RICHTEXTDLL_OBJECTS = \ $(OBJS)\richtextdll_dummy.obj \ $(OBJS)\richtextdll_richtextctrl.obj \ @@ -1480,14 +1461,14 @@ RICHTEXTDLL_RESOURCES = \ RICHTEXTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_534)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.pdb \ - $(__DEBUGINFO_526) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_richtextlib.pch" $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_richtextlib.pch" \ + $(CPPFLAGS) $(CXXFLAGS) RICHTEXTLIB_OBJECTS = \ $(OBJS)\richtextlib_dummy.obj \ $(OBJS)\richtextlib_richtextctrl.obj \ @@ -1502,16 +1483,16 @@ RICHTEXTLIB_OBJECTS = \ STCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_550)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).pdb \ - $(__DEBUGINFO_542) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib /I..\..\src\stc\scintilla\include \ - /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \ - /DWXUSINGDLL /DWXMAKINGDLL_STC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_stcdll.pch" $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ + /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \ + /DSCI_LEXER /DLINK_LEXERS /DWXUSINGDLL /DWXMAKINGDLL_STC $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_stcdll.pch" \ + $(CPPFLAGS) $(CXXFLAGS) STCDLL_OBJECTS = \ $(OBJS)\stcdll_dummy.obj \ $(OBJS)\stcdll_stc.obj \ @@ -1522,15 +1503,14 @@ STCDLL_RESOURCES = \ STCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_565)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.pdb \ - $(__DEBUGINFO_557) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib /I..\..\src\stc\scintilla\include \ - /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ + /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \ + /DSCI_LEXER /DLINK_LEXERS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ /Fp"$(OBJS)\wxprec_stclib.pch" $(CPPFLAGS) $(CXXFLAGS) STCLIB_OBJECTS = \ $(OBJS)\stclib_dummy.obj \ @@ -1540,15 +1520,14 @@ STCLIB_OBJECTS = \ GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_581)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb \ - $(__DEBUGINFO_573) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_GL $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gldll.pch" \ - $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ + /DWXMAKINGDLL_GL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_gldll.pch" $(CPPFLAGS) $(CXXFLAGS) GLDLL_OBJECTS = \ $(OBJS)\gldll_dummy.obj \ $(OBJS)\gldll_glcmn.obj \ @@ -1558,14 +1537,14 @@ GLDLL_RESOURCES = \ GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_596)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.pdb \ - $(__DEBUGINFO_588) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ - /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ - /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_gllib.pch" $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ + /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ + /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gllib.pch" \ + $(CPPFLAGS) $(CXXFLAGS) GLLIB_OBJECTS = \ $(OBJS)\gllib_dummy.obj \ $(OBJS)\gllib_glcmn.obj \ @@ -1631,36 +1610,12 @@ LINK_TARGET_CPU = /MACHINE:AMD64 !if "$(TARGET_CPU)" == "ia64" LINK_TARGET_CPU = /MACHINE:IA64 !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_2 = $(__DEBUGRUNTIME_40) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_2 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_2 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_2 = $(__DEBUGRUNTIME_40) -!endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_10 = D !endif !if "$(RUNTIME_LIBS)" == "static" __RUNTIME_LIBS_10 = $(__THREADSFLAG) !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_17 = $(__DEBUGRUNTIME_40) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_17 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_17 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_17 = $(__DEBUGRUNTIME_40) -!endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_25 = D !endif @@ -1670,18 +1625,6 @@ __RUNTIME_LIBS_25 = $(__THREADSFLAG) !if "$(USE_GUI)" == "1" __wxpng___depname = $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_32 = $(__DEBUGRUNTIME_40) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_32 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_32 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_32 = $(__DEBUGRUNTIME_40) -!endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_40 = D !endif @@ -1691,18 +1634,6 @@ __RUNTIME_LIBS_40 = $(__THREADSFLAG) !if "$(USE_GUI)" == "1" __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_47 = $(__DEBUGRUNTIME_40) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_47 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_47 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_47 = $(__DEBUGRUNTIME_40) -!endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_55 = D !endif @@ -1712,54 +1643,18 @@ __RUNTIME_LIBS_55 = $(__THREADSFLAG) !if "$(USE_GUI)" == "1" __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_62 = $(__DEBUGRUNTIME_40) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_62 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_62 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_62 = $(__DEBUGRUNTIME_40) -!endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_70 = D !endif !if "$(RUNTIME_LIBS)" == "static" __RUNTIME_LIBS_70 = $(__THREADSFLAG) !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_77 = $(__DEBUGRUNTIME_40) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_77 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_77 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_77 = $(__DEBUGRUNTIME_40) -!endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_85 = D !endif !if "$(RUNTIME_LIBS)" == "static" __RUNTIME_LIBS_85 = $(__THREADSFLAG) !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_92 = $(__DEBUGRUNTIME_40) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_92 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_92 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_92 = $(__DEBUGRUNTIME_40) -!endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_100 = D !endif @@ -1777,7 +1672,7 @@ __monodll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_108 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_108 = $(__DEBUGRUNTIME_10) !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" __DEBUGINFO_108 = @@ -1786,7 +1681,7 @@ __DEBUGINFO_108 = __DEBUGINFO_108 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_108 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_108 = $(__DEBUGRUNTIME_10) !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_116 = D @@ -2492,18 +2387,6 @@ __wxscintilla_library_link_DEP = $(__wxscintilla) __monolib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_123 = $(__DEBUGRUNTIME_40) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_123 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_123 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_123 = $(__DEBUGRUNTIME_40) -!endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_131 = D !endif @@ -3206,7 +3089,7 @@ __basedll___depname = \ $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_139 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_139 = $(__DEBUGRUNTIME_10) !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" __DEBUGINFO_139 = @@ -3215,7 +3098,7 @@ __DEBUGINFO_139 = __DEBUGINFO_139 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_139 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_139 = $(__DEBUGRUNTIME_10) !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_147 = D @@ -3227,18 +3110,6 @@ __RUNTIME_LIBS_147 = $(__THREADSFLAG) __baselib___depname = \ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_154 = $(__DEBUGRUNTIME_40) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_154 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_154 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_154 = $(__DEBUGRUNTIME_40) -!endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_162 = D !endif @@ -3256,7 +3127,7 @@ __netdll___depname = \ $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_170 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_170 = $(__DEBUGRUNTIME_10) !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" __DEBUGINFO_170 = @@ -3265,7 +3136,7 @@ __DEBUGINFO_170 = __DEBUGINFO_170 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_170 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_170 = $(__DEBUGRUNTIME_10) !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_178 = D @@ -3277,18 +3148,6 @@ __RUNTIME_LIBS_178 = $(__THREADSFLAG) __netlib___depname = \ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_185 = $(__DEBUGRUNTIME_40) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_185 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_185 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_185 = $(__DEBUGRUNTIME_40) -!endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_193 = D !endif @@ -3306,7 +3165,7 @@ __coredll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_201 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_201 = $(__DEBUGRUNTIME_10) !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" __DEBUGINFO_201 = @@ -3315,7 +3174,7 @@ __DEBUGINFO_201 = __DEBUGINFO_201 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_201 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_201 = $(__DEBUGRUNTIME_10) !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_209 = D @@ -3810,18 +3669,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ __corelib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_216 = $(__DEBUGRUNTIME_40) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_216 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_216 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_216 = $(__DEBUGRUNTIME_40) -!endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_224 = D !endif @@ -4322,7 +4169,7 @@ __advdll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_232 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_232 = $(__DEBUGRUNTIME_10) !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" __DEBUGINFO_232 = @@ -4331,7 +4178,7 @@ __DEBUGINFO_232 = __DEBUGINFO_232 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_232 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_232 = $(__DEBUGRUNTIME_10) !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_240 = D @@ -4419,18 +4266,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ __advlib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_247 = $(__DEBUGRUNTIME_40) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_247 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_247 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_247 = $(__DEBUGRUNTIME_40) -!endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_255 = D !endif @@ -4524,7 +4359,7 @@ __mediadll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_263 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_263 = $(__DEBUGRUNTIME_10) !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" __DEBUGINFO_263 = @@ -4533,7 +4368,7 @@ __DEBUGINFO_263 = __DEBUGINFO_263 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_263 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_263 = $(__DEBUGRUNTIME_10) !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_271 = D @@ -4545,18 +4380,6 @@ __RUNTIME_LIBS_271 = $(__THREADSFLAG) __medialib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_278 = $(__DEBUGRUNTIME_40) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_278 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_278 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_278 = $(__DEBUGRUNTIME_40) -!endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_286 = D !endif @@ -4574,7 +4397,7 @@ __htmldll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_294 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_294 = $(__DEBUGRUNTIME_10) !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" __DEBUGINFO_294 = @@ -4583,7 +4406,7 @@ __DEBUGINFO_294 = __DEBUGINFO_294 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_294 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_294 = $(__DEBUGRUNTIME_10) !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_302 = D @@ -4595,18 +4418,6 @@ __RUNTIME_LIBS_302 = $(__THREADSFLAG) __htmllib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_309 = $(__DEBUGRUNTIME_40) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_309 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_309 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_309 = $(__DEBUGRUNTIME_40) -!endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_317 = D !endif @@ -4624,7 +4435,7 @@ __qadll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_325 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_325 = $(__DEBUGRUNTIME_10) !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" __DEBUGINFO_325 = @@ -4633,7 +4444,7 @@ __DEBUGINFO_325 = __DEBUGINFO_325 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_325 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_325 = $(__DEBUGRUNTIME_10) !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_333 = D @@ -4645,18 +4456,6 @@ __RUNTIME_LIBS_333 = $(__THREADSFLAG) __qalib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_340 = $(__DEBUGRUNTIME_40) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_340 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_340 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_340 = $(__DEBUGRUNTIME_40) -!endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_348 = D !endif @@ -4674,7 +4473,7 @@ __xmldll___depname = \ $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_356 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_356 = $(__DEBUGRUNTIME_10) !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" __DEBUGINFO_356 = @@ -4683,7 +4482,7 @@ __DEBUGINFO_356 = __DEBUGINFO_356 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_356 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_356 = $(__DEBUGRUNTIME_10) !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_364 = D @@ -4695,18 +4494,6 @@ __RUNTIME_LIBS_364 = $(__THREADSFLAG) __xmllib___depname = \ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_371 = $(__DEBUGRUNTIME_40) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_371 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_371 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_371 = $(__DEBUGRUNTIME_40) -!endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_379 = D !endif @@ -4724,7 +4511,7 @@ __xrcdll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_387 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_387 = $(__DEBUGRUNTIME_10) !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" __DEBUGINFO_387 = @@ -4733,7 +4520,7 @@ __DEBUGINFO_387 = __DEBUGINFO_387 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_387 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_387 = $(__DEBUGRUNTIME_10) !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_395 = D @@ -4745,18 +4532,6 @@ __RUNTIME_LIBS_395 = $(__THREADSFLAG) __xrclib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_402 = $(__DEBUGRUNTIME_40) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_402 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_402 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_402 = $(__DEBUGRUNTIME_40) -!endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_410 = D !endif @@ -4774,7 +4549,7 @@ __auidll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_418 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_418 = $(__DEBUGRUNTIME_10) !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" __DEBUGINFO_418 = @@ -4783,7 +4558,7 @@ __DEBUGINFO_418 = __DEBUGINFO_418 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_418 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_418 = $(__DEBUGRUNTIME_10) !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_426 = D @@ -4795,18 +4570,6 @@ __RUNTIME_LIBS_426 = $(__THREADSFLAG) __auilib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_433 = $(__DEBUGRUNTIME_40) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_433 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_433 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_433 = $(__DEBUGRUNTIME_40) -!endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_441 = D !endif @@ -4824,7 +4587,7 @@ __ribbondll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).dll !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_449 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_449 = $(__DEBUGRUNTIME_10) !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" __DEBUGINFO_449 = @@ -4833,7 +4596,7 @@ __DEBUGINFO_449 = __DEBUGINFO_449 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_449 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_449 = $(__DEBUGRUNTIME_10) !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_457 = D @@ -4845,18 +4608,6 @@ __RUNTIME_LIBS_457 = $(__THREADSFLAG) __ribbonlib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_464 = $(__DEBUGRUNTIME_40) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_464 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_464 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_464 = $(__DEBUGRUNTIME_40) -!endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_472 = D !endif @@ -4874,7 +4625,7 @@ __propgriddll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).dll !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_480 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_480 = $(__DEBUGRUNTIME_10) !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" __DEBUGINFO_480 = @@ -4883,7 +4634,7 @@ __DEBUGINFO_480 = __DEBUGINFO_480 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_480 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_480 = $(__DEBUGRUNTIME_10) !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_488 = D @@ -4895,18 +4646,6 @@ __RUNTIME_LIBS_488 = $(__THREADSFLAG) __propgridlib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_495 = $(__DEBUGRUNTIME_40) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_495 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_495 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_495 = $(__DEBUGRUNTIME_40) -!endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_503 = D !endif @@ -4924,7 +4663,7 @@ __richtextdll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_511 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_511 = $(__DEBUGRUNTIME_10) !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" __DEBUGINFO_511 = @@ -4933,7 +4672,7 @@ __DEBUGINFO_511 = __DEBUGINFO_511 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_511 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_511 = $(__DEBUGRUNTIME_10) !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_519 = D @@ -4945,18 +4684,6 @@ __RUNTIME_LIBS_519 = $(__THREADSFLAG) __richtextlib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_526 = $(__DEBUGRUNTIME_40) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_526 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_526 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_526 = $(__DEBUGRUNTIME_40) -!endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_534 = D !endif @@ -4974,7 +4701,7 @@ __stcdll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).dll !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_542 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_542 = $(__DEBUGRUNTIME_10) !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" __DEBUGINFO_542 = @@ -4983,7 +4710,7 @@ __DEBUGINFO_542 = __DEBUGINFO_542 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_542 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_542 = $(__DEBUGRUNTIME_10) !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_550 = D @@ -4995,18 +4722,6 @@ __RUNTIME_LIBS_550 = $(__THREADSFLAG) __stclib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_557 = $(__DEBUGRUNTIME_40) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_557 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_557 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_557 = $(__DEBUGRUNTIME_40) -!endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_565 = D !endif @@ -5024,7 +4739,7 @@ __gldll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_573 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_573 = $(__DEBUGRUNTIME_10) !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" __DEBUGINFO_573 = @@ -5033,7 +4748,7 @@ __DEBUGINFO_573 = __DEBUGINFO_573 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_573 = $(__DEBUGRUNTIME_40) +__DEBUGINFO_573 = $(__DEBUGRUNTIME_10) !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_581 = D @@ -5057,18 +4772,6 @@ __WXLIB_MONO_p = \ __gllib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_588 = $(__DEBUGRUNTIME_40) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_588 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_588 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_588 = $(__DEBUGRUNTIME_40) -!endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_596 = D !endif @@ -5092,16 +4795,16 @@ __htmldll_library_link_LIBR = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_16 = /DEBUG +__DEBUGINFO_5 = /DEBUG !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_16 = +__DEBUGINFO_5 = !endif !if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_16 = +__DEBUGINFO_5 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_16 = /DEBUG +__DEBUGINFO_5 = /DEBUG !endif !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" ____DEBUGRUNTIME_5 = /d _DEBUG @@ -5115,6 +4818,18 @@ ____DEBUGRUNTIME_5 = !if "$(DEBUG_RUNTIME_LIBS)" == "1" ____DEBUGRUNTIME_5 = /d _DEBUG !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_10 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_10 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_10 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_10 = +!endif !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" __NO_VC_CRTDBG_p_68 = /d __NO_VC_CRTDBG__ !endif @@ -5199,18 +4914,6 @@ __DEBUGRUNTIME = !if "$(DEBUG_RUNTIME_LIBS)" == "1" __DEBUGRUNTIME = d !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_40 = -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_40 = /opt:ref /opt:icf -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_40 = /opt:ref /opt:icf -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_40 = -!endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG = /Od !endif @@ -5433,7 +5136,7 @@ $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib: $(WXSCINTILLA_OBJECTS) !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\monodll_version.res $(__wxscintilla_library_link_DEP) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb" $(__DEBUGINFO_108) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(MONODLL_OBJECTS) $(MONODLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__wxscintilla) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib << !endif @@ -5448,7 +5151,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\basedll_version.res - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb" $(__DEBUGINFO_139) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(BASEDLL_OBJECTS) $(BASEDLL_RESOURCES) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib << !endif @@ -5467,7 +5170,7 @@ wxbase: $(____wxbase_namedll_DEP) $(____wxbase_namelib_DEP) !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\netdll_version.res $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb" $(__DEBUGINFO_170) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(NETDLL_OBJECTS) $(NETDLL_RESOURCES) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib << !endif @@ -5486,7 +5189,7 @@ wxnet: $(____wxnet_namedll_DEP) $(____wxnet_namelib_DEP) !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\coredll_version.res $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb" $(__DEBUGINFO_201) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(COREDLL_OBJECTS) $(COREDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib << !endif @@ -5505,7 +5208,7 @@ wxcore: $(____wxcore_namedll_DEP) $(____wxcore_namelib_DEP) !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\advdll_version.res $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb" $(__DEBUGINFO_232) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(ADVDLL_OBJECTS) $(ADVDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib << !endif @@ -5524,7 +5227,7 @@ wxadv: $(____wxadv_namedll_DEP) $(____wxadv_namelib_DEP) !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll: $(OBJS)\mediadll_dummy.obj $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\mediadll_version.res $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb" $(__DEBUGINFO_263) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(MEDIADLL_OBJECTS) $(MEDIADLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib << !endif @@ -5543,7 +5246,7 @@ wxmedia: $(____wxmedia_namedll_DEP) $(____wxmedia_namelib_DEP) !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\htmldll_version.res $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb" $(__DEBUGINFO_294) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(HTMLDLL_OBJECTS) $(HTMLDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib << !endif @@ -5562,7 +5265,7 @@ wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP) !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\qadll_version.res $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb" $(__DEBUGINFO_325) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(QADLL_OBJECTS) $(QADLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib << !endif @@ -5581,7 +5284,7 @@ wxqa: $(____wxqa_namedll_DEP) $(____wxqa_namelib_DEP) !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xmldll_version.res $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb" $(__DEBUGINFO_356) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(XMLDLL_OBJECTS) $(XMLDLL_RESOURCES) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib << !endif @@ -5600,7 +5303,7 @@ wxxml: $(____wxxml_namedll_DEP) $(____wxxml_namelib_DEP) !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xrcdll_version.res $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb" $(__DEBUGINFO_387) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(XRCDLL_OBJECTS) $(XRCDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib << !endif @@ -5619,7 +5322,7 @@ wxxrc: $(____wxxrc_namedll_DEP) $(____wxxrc_namelib_DEP) !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll: $(OBJS)\auidll_dummy.obj $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\auidll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb" $(__DEBUGINFO_418) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(AUIDLL_OBJECTS) $(AUIDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib << !endif @@ -5638,7 +5341,7 @@ wxaui: $(____wxaui_namedll_DEP) $(____wxaui_namelib_DEP) !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RIBBON)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).dll: $(OBJS)\ribbondll_dummy.obj $(RIBBONDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\ribbondll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).pdb" $(__DEBUGINFO_449) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(RIBBONDLL_OBJECTS) $(RIBBONDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib << !endif @@ -5657,7 +5360,7 @@ wxribbon: $(____wxribbon_namedll_DEP) $(____wxribbon_namelib_DEP) !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_PROPGRID)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).dll: $(OBJS)\propgriddll_dummy.obj $(PROPGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\propgriddll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb" $(__DEBUGINFO_480) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(PROPGRIDDLL_OBJECTS) $(PROPGRIDDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib << !endif @@ -5676,7 +5379,7 @@ wxpropgrid: $(____wxpropgrid_namedll_DEP) $(____wxpropgrid_namelib_DEP) !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll: $(OBJS)\richtextdll_dummy.obj $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\richtextdll_version.res $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb" $(__DEBUGINFO_511) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(RICHTEXTDLL_OBJECTS) $(RICHTEXTDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib << !endif @@ -5695,7 +5398,7 @@ wxrichtext: $(____wxrichtext_namedll_DEP) $(____wxrichtext_namelib_DEP) !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_STC)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).dll: $(OBJS)\stcdll_dummy.obj $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__wxscintilla) $(OBJS)\stcdll_version.res $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).pdb" $(__DEBUGINFO_542) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(STCDLL_OBJECTS) $(STCDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib << !endif @@ -5714,7 +5417,7 @@ wxstc: $(____wxstc_namedll_DEP) $(____wxstc_namelib_DEP) !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\gldll_version.res $(__basedll___depname) $(__coredll___depname) $(__monodll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb" $(__DEBUGINFO_573) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(GLDLL_OBJECTS) $(GLDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib << !endif diff --git a/demos/bombs/makefile.vc b/demos/bombs/makefile.vc index 518c10426b..4539d60277 100644 --- a/demos/bombs/makefile.vc +++ b/demos/bombs/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) BOMBS_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\bombs.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\bombs.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) BOMBS_OBJECTS = \ $(OBJS)\bombs_bombs.obj \ $(OBJS)\bombs_bombs1.obj \ @@ -326,7 +326,7 @@ clean: -if exist $(OBJS)\bombs.pdb del $(OBJS)\bombs.pdb $(OBJS)\bombs.exe: $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\bombs.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\bombs.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(BOMBS_OBJECTS) $(BOMBS_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/demos/forty/makefile.vc b/demos/forty/makefile.vc index 6d8bdf7b0c..32fc87a03d 100644 --- a/demos/forty/makefile.vc +++ b/demos/forty/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) FORTY_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\forty.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\forty.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) FORTY_OBJECTS = \ $(OBJS)\forty_forty.obj \ $(OBJS)\forty_canvas.obj \ @@ -343,7 +343,7 @@ clean: -if exist $(OBJS)\forty.pdb del $(OBJS)\forty.pdb $(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\forty.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\forty.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(FORTY_OBJECTS) $(FORTY_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/demos/fractal/makefile.vc b/demos/fractal/makefile.vc index 2e6e97ef28..2b77b91092 100644 --- a/demos/fractal/makefile.vc +++ b/demos/fractal/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) FRACTAL_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\fractal.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\fractal.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) FRACTAL_OBJECTS = \ $(OBJS)\fractal_fractal.obj FRACTAL_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\fractal.pdb del $(OBJS)\fractal.pdb $(OBJS)\fractal.exe: $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\fractal.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\fractal.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(FRACTAL_OBJECTS) $(FRACTAL_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/demos/life/makefile.vc b/demos/life/makefile.vc index 2b578658c9..bd683c8e89 100644 --- a/demos/life/makefile.vc +++ b/demos/life/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) LIFE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\life.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\life.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) LIFE_OBJECTS = \ $(OBJS)\life_life.obj \ $(OBJS)\life_dialogs.obj \ @@ -327,7 +327,7 @@ clean: -if exist $(OBJS)\life.pdb del $(OBJS)\life.pdb $(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\life.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\life.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(LIFE_OBJECTS) $(LIFE_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/demos/poem/makefile.vc b/demos/poem/makefile.vc index 1fae9bca85..7c2a1cb211 100644 --- a/demos/poem/makefile.vc +++ b/demos/poem/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) WXPOEM_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\wxpoem.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\wxpoem.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) WXPOEM_OBJECTS = \ $(OBJS)\wxpoem_wxpoem.obj WXPOEM_RESOURCES = \ @@ -328,7 +328,7 @@ clean: -if exist $(OBJS)\wxpoem.pdb del $(OBJS)\wxpoem.pdb $(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxpoem.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxpoem.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(WXPOEM_OBJECTS) $(WXPOEM_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/access/makefile.unx b/samples/access/makefile.unx index 20490d864c..2017b85c3d 100644 --- a/samples/access/makefile.unx +++ b/samples/access/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/access/makefile.vc b/samples/access/makefile.vc index dff74ac77f..e36bbdc50b 100644 --- a/samples/access/makefile.vc +++ b/samples/access/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) ACCESSTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\accesstest.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\accesstest.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) ACCESSTEST_OBJECTS = \ $(OBJS)\accesstest_accesstest.obj ACCESSTEST_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\accesstest.pdb del $(OBJS)\accesstest.pdb $(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\accesstest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\accesstest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(ACCESSTEST_OBJECTS) $(ACCESSTEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/animate/makefile.unx b/samples/animate/makefile.unx index edc4428e58..61a1d30e05 100644 --- a/samples/animate/makefile.unx +++ b/samples/animate/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/animate/makefile.vc b/samples/animate/makefile.vc index 7b7174492d..b8932fafec 100644 --- a/samples/animate/makefile.vc +++ b/samples/animate/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) ANITEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\anitest.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\anitest.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) ANITEST_OBJECTS = \ $(OBJS)\anitest_anitest.obj ANITEST_RESOURCES = \ @@ -328,7 +328,7 @@ clean: -if exist $(OBJS)\anitest.pdb del $(OBJS)\anitest.pdb $(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\anitest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\anitest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(ANITEST_OBJECTS) $(ANITEST_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/artprov/makefile.unx b/samples/artprov/makefile.unx index 7989b8930b..72d75f5974 100644 --- a/samples/artprov/makefile.unx +++ b/samples/artprov/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/artprov/makefile.vc b/samples/artprov/makefile.vc index d2902e0b48..121fa36940 100644 --- a/samples/artprov/makefile.vc +++ b/samples/artprov/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) ARTTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\arttest.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\arttest.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) ARTTEST_OBJECTS = \ $(OBJS)\arttest_arttest.obj \ $(OBJS)\arttest_artbrows.obj @@ -325,7 +325,7 @@ clean: -if exist $(OBJS)\arttest.pdb del $(OBJS)\arttest.pdb $(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\arttest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\arttest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(ARTTEST_OBJECTS) $(ARTTEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/aui/makefile.unx b/samples/aui/makefile.unx index 82dd2e6d2b..cd6cf637a5 100644 --- a/samples/aui/makefile.unx +++ b/samples/aui/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/aui/makefile.vc b/samples/aui/makefile.vc index dd05eab13c..fab7ef5c16 100644 --- a/samples/aui/makefile.vc +++ b/samples/aui/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) AUIDEMO_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\auidemo.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\auidemo.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) AUIDEMO_OBJECTS = \ $(OBJS)\auidemo_auidemo.obj AUIDEMO_RESOURCES = \ @@ -340,7 +340,7 @@ clean: -if exist $(OBJS)\auidemo.pdb del $(OBJS)\auidemo.pdb $(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\auidemo.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\auidemo.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(AUIDEMO_OBJECTS) $(AUIDEMO_RESOURCES) $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/calendar/makefile.unx b/samples/calendar/makefile.unx index 498d3b37cd..cd5c6df8e4 100644 --- a/samples/calendar/makefile.unx +++ b/samples/calendar/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/calendar/makefile.vc b/samples/calendar/makefile.vc index 8a14e75e11..c77c14e89b 100644 --- a/samples/calendar/makefile.vc +++ b/samples/calendar/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) CALENDAR_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\calendar.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\calendar.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) CALENDAR_OBJECTS = \ $(OBJS)\calendar_calendar.obj CALENDAR_RESOURCES = \ @@ -328,7 +328,7 @@ clean: -if exist $(OBJS)\calendar.pdb del $(OBJS)\calendar.pdb $(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\calendar.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\calendar.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(CALENDAR_OBJECTS) $(CALENDAR_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/caret/makefile.unx b/samples/caret/makefile.unx index 736e57ab68..75c917af8d 100644 --- a/samples/caret/makefile.unx +++ b/samples/caret/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/caret/makefile.vc b/samples/caret/makefile.vc index e5b056ac6f..86d3cea308 100644 --- a/samples/caret/makefile.vc +++ b/samples/caret/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) CARET_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\caret.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\caret.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) CARET_OBJECTS = \ $(OBJS)\caret_caret.obj CARET_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\caret.pdb del $(OBJS)\caret.pdb $(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_caret.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\caret.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\caret.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(CARET_OBJECTS) $(CARET_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/clipboard/makefile.unx b/samples/clipboard/makefile.unx index ddaa00c81e..dfb2ee66cc 100644 --- a/samples/clipboard/makefile.unx +++ b/samples/clipboard/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/clipboard/makefile.vc b/samples/clipboard/makefile.vc index 4f53b7389d..74368224b2 100644 --- a/samples/clipboard/makefile.vc +++ b/samples/clipboard/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) CLIPBOARD_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\clipboard.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\clipboard.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) CLIPBOARD_OBJECTS = \ $(OBJS)\clipboard_clipboard.obj CLIPBOARD_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\clipboard.pdb del $(OBJS)\clipboard.pdb $(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_clipboard.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\clipboard.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\clipboard.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(CLIPBOARD_OBJECTS) $(CLIPBOARD_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/collpane/makefile.unx b/samples/collpane/makefile.unx index f0cf2e18d2..dfea84faeb 100644 --- a/samples/collpane/makefile.unx +++ b/samples/collpane/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/collpane/makefile.vc b/samples/collpane/makefile.vc index 5ad4939972..e6b61e8d2e 100644 --- a/samples/collpane/makefile.vc +++ b/samples/collpane/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) COLLPANE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\collpane.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\collpane.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) COLLPANE_OBJECTS = \ $(OBJS)\collpane_collpane.obj COLLPANE_RESOURCES = \ @@ -328,7 +328,7 @@ clean: -if exist $(OBJS)\collpane.pdb del $(OBJS)\collpane.pdb $(OBJS)\collpane.exe: $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\collpane.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\collpane.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(COLLPANE_OBJECTS) $(COLLPANE_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/combo/makefile.unx b/samples/combo/makefile.unx index c1fc5ed20f..f0e58114d1 100644 --- a/samples/combo/makefile.unx +++ b/samples/combo/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/combo/makefile.vc b/samples/combo/makefile.vc index df439e92d6..69c8e623d9 100644 --- a/samples/combo/makefile.vc +++ b/samples/combo/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) COMBO_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\combo.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\combo.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) COMBO_OBJECTS = \ $(OBJS)\combo_combo.obj COMBO_RESOURCES = \ @@ -328,7 +328,7 @@ clean: -if exist $(OBJS)\combo.pdb del $(OBJS)\combo.pdb $(OBJS)\combo.exe: $(COMBO_OBJECTS) $(OBJS)\combo_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\combo.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\combo.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(COMBO_OBJECTS) $(COMBO_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/config/makefile.unx b/samples/config/makefile.unx index e0de55947a..ee5c4b599c 100644 --- a/samples/config/makefile.unx +++ b/samples/config/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/config/makefile.vc b/samples/config/makefile.vc index 4c28278ce6..1e444759e2 100644 --- a/samples/config/makefile.vc +++ b/samples/config/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) CONFTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\conftest.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\conftest.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) CONFTEST_OBJECTS = \ $(OBJS)\conftest_conftest.obj CONFTEST_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\conftest.pdb del $(OBJS)\conftest.pdb $(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\conftest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\conftest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(CONFTEST_OBJECTS) $(CONFTEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/console/makefile.unx b/samples/console/makefile.unx index a65920aa03..a08ba6dc9e 100644 --- a/samples/console/makefile.unx +++ b/samples/console/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/console/makefile.vc b/samples/console/makefile.vc index 373af60d7d..d993618e15 100644 --- a/samples/console/makefile.vc +++ b/samples/console/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) CONSOLE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\console.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\console.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) \ + $(CXXFLAGS) CONSOLE_OBJECTS = \ $(OBJS)\console_console.obj @@ -265,7 +265,7 @@ clean: -if exist $(OBJS)\console.pdb del $(OBJS)\console.pdb $(OBJS)\console.exe: $(CONSOLE_OBJECTS) - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\console.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\console.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< $(CONSOLE_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/controls/makefile.unx b/samples/controls/makefile.unx index 98f42ebfc7..2c6cd01db8 100644 --- a/samples/controls/makefile.unx +++ b/samples/controls/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/controls/makefile.vc b/samples/controls/makefile.vc index 6546f6ef70..cf78231ed6 100644 --- a/samples/controls/makefile.vc +++ b/samples/controls/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) CONTROLS_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\controls.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\controls.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) CONTROLS_OBJECTS = \ $(OBJS)\controls_controls.obj CONTROLS_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\controls.pdb del $(OBJS)\controls.pdb $(OBJS)\controls.exe: $(CONTROLS_OBJECTS) $(OBJS)\controls_controls.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\controls.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\controls.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(CONTROLS_OBJECTS) $(CONTROLS_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/dataview/makefile.unx b/samples/dataview/makefile.unx index 7428bff7c2..715fa1ade2 100644 --- a/samples/dataview/makefile.unx +++ b/samples/dataview/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/dataview/makefile.vc b/samples/dataview/makefile.vc index 1534b2a595..fdb75b09af 100644 --- a/samples/dataview/makefile.vc +++ b/samples/dataview/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) DATAVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\dataview.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\dataview.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) DATAVIEW_OBJECTS = \ $(OBJS)\dataview_dataview.obj \ $(OBJS)\dataview_mymodels.obj @@ -329,7 +329,7 @@ clean: -if exist $(OBJS)\dataview.pdb del $(OBJS)\dataview.pdb $(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dataview.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dataview.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(DATAVIEW_OBJECTS) $(DATAVIEW_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/debugrpt/makefile.unx b/samples/debugrpt/makefile.unx index 5f95b14410..5c13771366 100644 --- a/samples/debugrpt/makefile.unx +++ b/samples/debugrpt/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/debugrpt/makefile.vc b/samples/debugrpt/makefile.vc index 1a1ee7bbdc..73148d911c 100644 --- a/samples/debugrpt/makefile.vc +++ b/samples/debugrpt/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) DEBUGRPT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\debugrpt.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\debugrpt.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) DEBUGRPT_OBJECTS = \ $(OBJS)\debugrpt_debugrpt.obj DEBUGRPT_RESOURCES = \ @@ -332,7 +332,7 @@ clean: -if exist $(OBJS)\debugrpt.pdb del $(OBJS)\debugrpt.pdb $(OBJS)\debugrpt.exe: $(DEBUGRPT_OBJECTS) $(OBJS)\debugrpt_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\debugrpt.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\debugrpt.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(DEBUGRPT_OBJECTS) $(DEBUGRPT_RESOURCES) $(__WXLIB_QA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/dialogs/makefile.unx b/samples/dialogs/makefile.unx index 958db2af56..4974ebc4b9 100644 --- a/samples/dialogs/makefile.unx +++ b/samples/dialogs/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/dialogs/makefile.vc b/samples/dialogs/makefile.vc index 7b9c5c06d4..e00b29a307 100644 --- a/samples/dialogs/makefile.vc +++ b/samples/dialogs/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) DIALOGS_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\dialogs.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\dialogs.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) DIALOGS_OBJECTS = \ $(OBJS)\dialogs_dialogs.obj \ $(____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS) @@ -336,7 +336,7 @@ clean: -if exist $(OBJS)\dialogs.pdb del $(OBJS)\dialogs.pdb $(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dialogs.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dialogs.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(DIALOGS_OBJECTS) $(DIALOGS_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/dialup/makefile.unx b/samples/dialup/makefile.unx index 75191aacf4..ee60e64dba 100644 --- a/samples/dialup/makefile.unx +++ b/samples/dialup/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/dialup/makefile.vc b/samples/dialup/makefile.vc index 857162bcc0..bcf3029c9b 100644 --- a/samples/dialup/makefile.vc +++ b/samples/dialup/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) NETTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\nettest.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\nettest.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) NETTEST_OBJECTS = \ $(OBJS)\nettest_nettest.obj NETTEST_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\nettest.pdb del $(OBJS)\nettest.pdb $(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\nettest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\nettest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(NETTEST_OBJECTS) $(NETTEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/display/makefile.unx b/samples/display/makefile.unx index e01ea3567e..afe649b674 100644 --- a/samples/display/makefile.unx +++ b/samples/display/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/display/makefile.vc b/samples/display/makefile.vc index 894a1e2d0b..1dddd7c193 100644 --- a/samples/display/makefile.vc +++ b/samples/display/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) DISPLAY_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\display.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\display.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) DISPLAY_OBJECTS = \ $(OBJS)\display_display.obj DISPLAY_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\display.pdb del $(OBJS)\display.pdb $(OBJS)\display.exe: $(DISPLAY_OBJECTS) $(OBJS)\display_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\display.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\display.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(DISPLAY_OBJECTS) $(DISPLAY_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/dnd/makefile.unx b/samples/dnd/makefile.unx index 2377649e22..a5e97944a4 100644 --- a/samples/dnd/makefile.unx +++ b/samples/dnd/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/dnd/makefile.vc b/samples/dnd/makefile.vc index c1eb5a5dc8..ee3e798377 100644 --- a/samples/dnd/makefile.vc +++ b/samples/dnd/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) DND_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\dnd.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\dnd.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) DND_OBJECTS = \ $(OBJS)\dnd_dnd.obj DND_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\dnd.pdb del $(OBJS)\dnd.pdb $(OBJS)\dnd.exe: $(DND_OBJECTS) $(OBJS)\dnd_dnd.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dnd.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dnd.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(DND_OBJECTS) $(DND_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/docview/makefile.unx b/samples/docview/makefile.unx index 26172bee3f..25bca15556 100644 --- a/samples/docview/makefile.unx +++ b/samples/docview/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/docview/makefile.vc b/samples/docview/makefile.vc index 882e0ee2d7..e7edd2df8a 100644 --- a/samples/docview/makefile.vc +++ b/samples/docview/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) DOCVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\docview.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\docview.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) DOCVIEW_OBJECTS = \ $(OBJS)\docview_docview.obj \ $(OBJS)\docview_doc.obj \ @@ -326,7 +326,7 @@ clean: -if exist $(OBJS)\docview.pdb del $(OBJS)\docview.pdb $(OBJS)\docview.exe: $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\docview.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\docview.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(DOCVIEW_OBJECTS) $(DOCVIEW_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/dragimag/makefile.unx b/samples/dragimag/makefile.unx index f164fcc8b2..91eb485ade 100644 --- a/samples/dragimag/makefile.unx +++ b/samples/dragimag/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/dragimag/makefile.vc b/samples/dragimag/makefile.vc index 193fdf5d0b..97c5d64c9a 100644 --- a/samples/dragimag/makefile.vc +++ b/samples/dragimag/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) DRAGIMAG_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\dragimag.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\dragimag.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) DRAGIMAG_OBJECTS = \ $(OBJS)\dragimag_dragimag.obj DRAGIMAG_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\dragimag.pdb del $(OBJS)\dragimag.pdb $(OBJS)\dragimag.exe: $(DRAGIMAG_OBJECTS) $(OBJS)\dragimag_dragimag.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dragimag.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dragimag.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(DRAGIMAG_OBJECTS) $(DRAGIMAG_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/drawing/makefile.unx b/samples/drawing/makefile.unx index 31b36ebc7b..5961d22094 100644 --- a/samples/drawing/makefile.unx +++ b/samples/drawing/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/drawing/makefile.vc b/samples/drawing/makefile.vc index d133ac00da..2e499ffe82 100644 --- a/samples/drawing/makefile.vc +++ b/samples/drawing/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) DRAWING_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\drawing.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\drawing.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) DRAWING_OBJECTS = \ $(OBJS)\drawing_drawing.obj DRAWING_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\drawing.pdb del $(OBJS)\drawing.pdb $(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\drawing.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\drawing.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(DRAWING_OBJECTS) $(DRAWING_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/erase/makefile.unx b/samples/erase/makefile.unx index 3ac512d7c7..978ce58331 100644 --- a/samples/erase/makefile.unx +++ b/samples/erase/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/erase/makefile.vc b/samples/erase/makefile.vc index c6d12835cd..e9e66b5302 100644 --- a/samples/erase/makefile.vc +++ b/samples/erase/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) ERASE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\erase.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\erase.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) ERASE_OBJECTS = \ $(OBJS)\erase_erase.obj ERASE_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\erase.pdb del $(OBJS)\erase.pdb $(OBJS)\erase.exe: $(ERASE_OBJECTS) $(OBJS)\erase_erase.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\erase.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\erase.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(ERASE_OBJECTS) $(ERASE_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/event/makefile.unx b/samples/event/makefile.unx index 5f965f2877..b2210d1276 100644 --- a/samples/event/makefile.unx +++ b/samples/event/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/event/makefile.vc b/samples/event/makefile.vc index 94d635fc77..02a5bb3c31 100644 --- a/samples/event/makefile.vc +++ b/samples/event/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) EVENT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\event.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\event.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) EVENT_OBJECTS = \ $(OBJS)\event_event.obj EVENT_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\event.pdb del $(OBJS)\event.pdb $(OBJS)\event.exe: $(EVENT_OBJECTS) $(OBJS)\event_event.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\event.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\event.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(EVENT_OBJECTS) $(EVENT_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/except/makefile.unx b/samples/except/makefile.unx index 00f9fb6bd2..3c01d6a4e6 100644 --- a/samples/except/makefile.unx +++ b/samples/except/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/except/makefile.vc b/samples/except/makefile.vc index ab927c2b4d..f1b6378a9d 100644 --- a/samples/except/makefile.vc +++ b/samples/except/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) EXCEPT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\except.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\except.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) EXCEPT_OBJECTS = \ $(OBJS)\except_except.obj EXCEPT_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\except.pdb del $(OBJS)\except.pdb $(OBJS)\except.exe: $(EXCEPT_OBJECTS) $(OBJS)\except_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\except.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\except.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(EXCEPT_OBJECTS) $(EXCEPT_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/exec/makefile.unx b/samples/exec/makefile.unx index 501a0ecc97..481b0f2235 100644 --- a/samples/exec/makefile.unx +++ b/samples/exec/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/exec/makefile.vc b/samples/exec/makefile.vc index ceaa72d6dd..98ba645e5f 100644 --- a/samples/exec/makefile.vc +++ b/samples/exec/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) EXEC_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\exec.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\exec.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) EXEC_OBJECTS = \ $(OBJS)\exec_exec.obj EXEC_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\exec.pdb del $(OBJS)\exec.pdb $(OBJS)\exec.exe: $(EXEC_OBJECTS) $(OBJS)\exec_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\exec.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\exec.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(EXEC_OBJECTS) $(EXEC_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/flash/makefile.vc b/samples/flash/makefile.vc index b7882911d4..f7bc8037b3 100644 --- a/samples/flash/makefile.vc +++ b/samples/flash/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) FLASH_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\flash.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\flash.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) FLASH_OBJECTS = \ $(OBJS)\flash_flash.obj FLASH_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\flash.pdb del $(OBJS)\flash.pdb $(OBJS)\flash.exe: $(FLASH_OBJECTS) $(OBJS)\flash_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\flash.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\flash.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(FLASH_OBJECTS) $(FLASH_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/font/makefile.unx b/samples/font/makefile.unx index d732c1a362..dc63374602 100644 --- a/samples/font/makefile.unx +++ b/samples/font/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/font/makefile.vc b/samples/font/makefile.vc index 02261ce63c..b7ecef176a 100644 --- a/samples/font/makefile.vc +++ b/samples/font/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) FONT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\font.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\font.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) FONT_OBJECTS = \ $(OBJS)\font_font.obj FONT_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\font.pdb del $(OBJS)\font.pdb $(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_font.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\font.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\font.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(FONT_OBJECTS) $(FONT_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/fswatcher/makefile.unx b/samples/fswatcher/makefile.unx index e15cb429df..8786fb6bec 100644 --- a/samples/fswatcher/makefile.unx +++ b/samples/fswatcher/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/fswatcher/makefile.vc b/samples/fswatcher/makefile.vc index be8d9b06d4..33766d2272 100644 --- a/samples/fswatcher/makefile.vc +++ b/samples/fswatcher/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) FSWATCHER_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\fswatcher.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\fswatcher.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) FSWATCHER_OBJECTS = \ $(OBJS)\fswatcher_fswatcher.obj FSWATCHER_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\fswatcher.pdb del $(OBJS)\fswatcher.pdb $(OBJS)\fswatcher.exe: $(FSWATCHER_OBJECTS) $(OBJS)\fswatcher_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\fswatcher.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\fswatcher.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(FSWATCHER_OBJECTS) $(FSWATCHER_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/grid/makefile.unx b/samples/grid/makefile.unx index d1b5f0a702..3437b01ff0 100644 --- a/samples/grid/makefile.unx +++ b/samples/grid/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/grid/makefile.vc b/samples/grid/makefile.vc index 1710819052..b6e66924e7 100644 --- a/samples/grid/makefile.vc +++ b/samples/grid/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) GRID_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\grid.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\grid.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) GRID_OBJECTS = \ $(OBJS)\grid_griddemo.obj GRID_RESOURCES = \ @@ -328,7 +328,7 @@ clean: -if exist $(OBJS)\grid.pdb del $(OBJS)\grid.pdb $(OBJS)\grid.exe: $(GRID_OBJECTS) $(OBJS)\grid_griddemo.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\grid.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\grid.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(GRID_OBJECTS) $(GRID_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/help/makefile.unx b/samples/help/makefile.unx index 35c95f90d1..e6f7e1db8d 100644 --- a/samples/help/makefile.unx +++ b/samples/help/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/help/makefile.vc b/samples/help/makefile.vc index 8f03846d14..37ce08f8ff 100644 --- a/samples/help/makefile.vc +++ b/samples/help/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) HELP_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\help.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\help.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) HELP_OBJECTS = \ $(OBJS)\help_demo.obj HELP_RESOURCES = \ @@ -332,7 +332,7 @@ clean: -if exist $(OBJS)\help.pdb del $(OBJS)\help.pdb $(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_demo.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\help.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\help.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(HELP_OBJECTS) $(HELP_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/htlbox/makefile.unx b/samples/htlbox/makefile.unx index 0d18b9902c..10499c20eb 100644 --- a/samples/htlbox/makefile.unx +++ b/samples/htlbox/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/htlbox/makefile.vc b/samples/htlbox/makefile.vc index 1c053b78ad..27a9455175 100644 --- a/samples/htlbox/makefile.vc +++ b/samples/htlbox/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) HTLBOX_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\htlbox.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\htlbox.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) HTLBOX_OBJECTS = \ $(OBJS)\htlbox_htlbox.obj HTLBOX_RESOURCES = \ @@ -328,7 +328,7 @@ clean: -if exist $(OBJS)\htlbox.pdb del $(OBJS)\htlbox.pdb $(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\htlbox.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\htlbox.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(HTLBOX_OBJECTS) $(HTLBOX_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/html/about/makefile.unx b/samples/html/about/makefile.unx index 6a5da8bfa0..9bbb8fff38 100644 --- a/samples/html/about/makefile.unx +++ b/samples/html/about/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/html/about/makefile.vc b/samples/html/about/makefile.vc index 678cd8bbad..67455ba3ce 100644 --- a/samples/html/about/makefile.vc +++ b/samples/html/about/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) ABOUT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\about.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \ - $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\about.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ + $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) ABOUT_OBJECTS = \ $(OBJS)\about_about.obj ABOUT_RESOURCES = \ @@ -328,7 +328,7 @@ clean: -if exist $(OBJS)\about.pdb del $(OBJS)\about.pdb $(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_about.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\about.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\about.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(ABOUT_OBJECTS) $(ABOUT_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/html/help/makefile.unx b/samples/html/help/makefile.unx index 4b920a551a..19032f48c2 100644 --- a/samples/html/help/makefile.unx +++ b/samples/html/help/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/html/help/makefile.vc b/samples/html/help/makefile.vc index 9f479f50ac..23b5955e5d 100644 --- a/samples/html/help/makefile.vc +++ b/samples/html/help/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) HTMLHELP_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\htmlhelp.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \ - $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\htmlhelp.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ + $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) HTMLHELP_OBJECTS = \ $(OBJS)\htmlhelp_help.obj HTMLHELP_RESOURCES = \ @@ -328,7 +328,7 @@ clean: -if exist $(OBJS)\htmlhelp.pdb del $(OBJS)\htmlhelp.pdb $(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\htmlhelp.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\htmlhelp.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(HTMLHELP_OBJECTS) $(HTMLHELP_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/html/helpview/makefile.unx b/samples/html/helpview/makefile.unx index e18f8dbc5a..58576bab45 100644 --- a/samples/html/helpview/makefile.unx +++ b/samples/html/helpview/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/html/helpview/makefile.vc b/samples/html/helpview/makefile.vc index bc89f2fdd3..a7b17ecfba 100644 --- a/samples/html/helpview/makefile.vc +++ b/samples/html/helpview/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) HELPVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\helpview.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \ - $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\helpview.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ + $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) HELPVIEW_OBJECTS = \ $(OBJS)\helpview_helpview.obj HELPVIEW_RESOURCES = \ @@ -328,7 +328,7 @@ clean: -if exist $(OBJS)\helpview.pdb del $(OBJS)\helpview.pdb $(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\helpview.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\helpview.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(HELPVIEW_OBJECTS) $(HELPVIEW_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/html/htmlctrl/makefile.unx b/samples/html/htmlctrl/makefile.unx index 2544522717..cbb8e8ff91 100644 --- a/samples/html/htmlctrl/makefile.unx +++ b/samples/html/htmlctrl/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/html/printing/makefile.unx b/samples/html/printing/makefile.unx index 5d7df30a98..072f7127e1 100644 --- a/samples/html/printing/makefile.unx +++ b/samples/html/printing/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/html/printing/makefile.vc b/samples/html/printing/makefile.vc index 6be603836f..23afa6bf39 100644 --- a/samples/html/printing/makefile.vc +++ b/samples/html/printing/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) HTMLPRINTING_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\htmlprinting.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \ - $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\htmlprinting.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ + $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) HTMLPRINTING_OBJECTS = \ $(OBJS)\htmlprinting_printing.obj HTMLPRINTING_RESOURCES = \ @@ -328,7 +328,7 @@ clean: -if exist $(OBJS)\htmlprinting.pdb del $(OBJS)\htmlprinting.pdb $(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\htmlprinting.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\htmlprinting.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(HTMLPRINTING_OBJECTS) $(HTMLPRINTING_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/html/test/makefile.unx b/samples/html/test/makefile.unx index 8b2dab361e..72a438ac5d 100644 --- a/samples/html/test/makefile.unx +++ b/samples/html/test/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/html/test/makefile.vc b/samples/html/test/makefile.vc index 108002a225..819ecfeb6d 100644 --- a/samples/html/test/makefile.vc +++ b/samples/html/test/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\test.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \ - $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\test.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ + $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) TEST_OBJECTS = \ $(OBJS)\test_test.obj TEST_RESOURCES = \ @@ -332,7 +332,7 @@ clean: -if exist $(OBJS)\test.pdb del $(OBJS)\test.pdb $(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_test.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\test.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\test.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(TEST_OBJECTS) $(TEST_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/html/virtual/makefile.unx b/samples/html/virtual/makefile.unx index 94b0e97717..be9126dcf3 100644 --- a/samples/html/virtual/makefile.unx +++ b/samples/html/virtual/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/html/virtual/makefile.vc b/samples/html/virtual/makefile.vc index b0f4a7e4ce..418c199ea2 100644 --- a/samples/html/virtual/makefile.vc +++ b/samples/html/virtual/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) VIRTUAL_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\virtual.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \ - $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\virtual.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ + $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) VIRTUAL_OBJECTS = \ $(OBJS)\virtual_virtual.obj VIRTUAL_RESOURCES = \ @@ -328,7 +328,7 @@ clean: -if exist $(OBJS)\virtual.pdb del $(OBJS)\virtual.pdb $(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\virtual.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\virtual.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(VIRTUAL_OBJECTS) $(VIRTUAL_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/html/widget/makefile.unx b/samples/html/widget/makefile.unx index 3f38aac980..9032a44eb6 100644 --- a/samples/html/widget/makefile.unx +++ b/samples/html/widget/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/html/widget/makefile.vc b/samples/html/widget/makefile.vc index 199d5d25e2..12b2d54fd1 100644 --- a/samples/html/widget/makefile.vc +++ b/samples/html/widget/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) WIDGET_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\widget.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \ - $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\widget.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ + $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) WIDGET_OBJECTS = \ $(OBJS)\widget_widget.obj WIDGET_RESOURCES = \ @@ -328,7 +328,7 @@ clean: -if exist $(OBJS)\widget.pdb del $(OBJS)\widget.pdb $(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\widget.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\widget.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(WIDGET_OBJECTS) $(WIDGET_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/html/zip/makefile.unx b/samples/html/zip/makefile.unx index 9139463d87..2c31729054 100644 --- a/samples/html/zip/makefile.unx +++ b/samples/html/zip/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/html/zip/makefile.vc b/samples/html/zip/makefile.vc index 2a9243bf8c..4bb1e6dfd9 100644 --- a/samples/html/zip/makefile.vc +++ b/samples/html/zip/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) ZIP_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\zip.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \ - $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\zip.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ + $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) ZIP_OBJECTS = \ $(OBJS)\zip_zip.obj ZIP_RESOURCES = \ @@ -328,7 +328,7 @@ clean: -if exist $(OBJS)\zip.pdb del $(OBJS)\zip.pdb $(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_zip.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\zip.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\zip.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(ZIP_OBJECTS) $(ZIP_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/image/makefile.unx b/samples/image/makefile.unx index 7d19408d34..12dc8f83fd 100644 --- a/samples/image/makefile.unx +++ b/samples/image/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/image/makefile.vc b/samples/image/makefile.vc index 299d73aa93..59acc6ceba 100644 --- a/samples/image/makefile.vc +++ b/samples/image/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) IMAGE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\image.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\image.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) IMAGE_OBJECTS = \ $(OBJS)\image_image.obj \ $(OBJS)\image_canvas.obj @@ -325,7 +325,7 @@ clean: -if exist $(OBJS)\image.pdb del $(OBJS)\image.pdb $(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_image.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\image.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\image.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(IMAGE_OBJECTS) $(IMAGE_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/internat/makefile.unx b/samples/internat/makefile.unx index b3df1f213d..7218f09d90 100644 --- a/samples/internat/makefile.unx +++ b/samples/internat/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/internat/makefile.vc b/samples/internat/makefile.vc index 6433f683bb..241fd5f743 100644 --- a/samples/internat/makefile.vc +++ b/samples/internat/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) INTERNAT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\internat.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\internat.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) INTERNAT_OBJECTS = \ $(OBJS)\internat_internat.obj INTERNAT_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\internat.pdb del $(OBJS)\internat.pdb $(OBJS)\internat.exe: $(INTERNAT_OBJECTS) $(OBJS)\internat_internat.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\internat.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\internat.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(INTERNAT_OBJECTS) $(INTERNAT_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/ipc/makefile.unx b/samples/ipc/makefile.unx index 200a623026..2c71be4ce8 100644 --- a/samples/ipc/makefile.unx +++ b/samples/ipc/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/ipc/makefile.vc b/samples/ipc/makefile.vc index 5ff2ccc062..400b64c3fc 100644 --- a/samples/ipc/makefile.vc +++ b/samples/ipc/makefile.vc @@ -21,47 +21,47 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) IPCCLIENT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) /Fd$(OBJS)\ipcclient.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO) /Fd$(OBJS)\ipcclient.pdb $(____DEBUGRUNTIME) \ + $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + $(CPPFLAGS) $(CXXFLAGS) IPCCLIENT_OBJECTS = \ $(OBJS)\ipcclient_client.obj IPCCLIENT_RESOURCES = \ $(OBJS)\ipcclient_sample.res IPCSERVER_CXXFLAGS = /M$(__RUNTIME_LIBS_26)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) /Fd$(OBJS)\ipcserver.pdb $(__DEBUGINFO_18) \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO) /Fd$(OBJS)\ipcserver.pdb $(____DEBUGRUNTIME) \ + $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + $(CPPFLAGS) $(CXXFLAGS) IPCSERVER_OBJECTS = \ $(OBJS)\ipcserver_server.obj IPCSERVER_RESOURCES = \ $(OBJS)\ipcserver_sample.res BASEIPCCLIENT_CXXFLAGS = /M$(__RUNTIME_LIBS_42)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) /Fd$(OBJS)\baseipcclient.pdb $(__DEBUGINFO_34) \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO) /Fd$(OBJS)\baseipcclient.pdb $(____DEBUGRUNTIME) \ + $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \ + $(CXXFLAGS) BASEIPCCLIENT_OBJECTS = \ $(OBJS)\baseipcclient_baseclient.obj BASEIPCSERVER_CXXFLAGS = /M$(__RUNTIME_LIBS_58)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) /Fd$(OBJS)\baseipcserver.pdb $(__DEBUGINFO_50) \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO) /Fd$(OBJS)\baseipcserver.pdb $(____DEBUGRUNTIME) \ + $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \ + $(CXXFLAGS) BASEIPCSERVER_OBJECTS = \ $(OBJS)\baseipcserver_baseserver.obj @@ -430,25 +430,25 @@ clean: !if "$(USE_GUI)" == "1" $(OBJS)\ipcclient.exe: $(IPCCLIENT_OBJECTS) $(OBJS)\ipcclient_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\ipcclient.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\ipcclient.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(IPCCLIENT_OBJECTS) $(IPCCLIENT_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << !endif !if "$(USE_GUI)" == "1" $(OBJS)\ipcserver.exe: $(IPCSERVER_OBJECTS) $(OBJS)\ipcserver_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\ipcserver.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\ipcserver.pdb" $(__DEBUGINFO_18) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(IPCSERVER_OBJECTS) $(IPCSERVER_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << !endif $(OBJS)\baseipcclient.exe: $(BASEIPCCLIENT_OBJECTS) - link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\baseipcclient.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\baseipcclient.pdb" $(__DEBUGINFO_34) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< $(BASEIPCCLIENT_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << $(OBJS)\baseipcserver.exe: $(BASEIPCSERVER_OBJECTS) - link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\baseipcserver.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\baseipcserver.pdb" $(__DEBUGINFO_50) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< $(BASEIPCSERVER_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/joytest/makefile.unx b/samples/joytest/makefile.unx index 858adda8d3..0e7c6fa9a6 100644 --- a/samples/joytest/makefile.unx +++ b/samples/joytest/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/joytest/makefile.vc b/samples/joytest/makefile.vc index 1c683d69a2..88b4b0b6b7 100644 --- a/samples/joytest/makefile.vc +++ b/samples/joytest/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) JOYTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\joytest.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\joytest.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) JOYTEST_OBJECTS = \ $(OBJS)\joytest_joytest.obj JOYTEST_RESOURCES = \ @@ -328,7 +328,7 @@ clean: -if exist $(OBJS)\joytest.pdb del $(OBJS)\joytest.pdb $(OBJS)\joytest.exe: $(JOYTEST_OBJECTS) $(OBJS)\joytest_joytest.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\joytest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\joytest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(JOYTEST_OBJECTS) $(JOYTEST_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/keyboard/makefile.unx b/samples/keyboard/makefile.unx index 8faf3e044d..ef07860f1e 100644 --- a/samples/keyboard/makefile.unx +++ b/samples/keyboard/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/keyboard/makefile.vc b/samples/keyboard/makefile.vc index b0edc4414e..b284f9e4c6 100644 --- a/samples/keyboard/makefile.vc +++ b/samples/keyboard/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) KEYBOARD_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\keyboard.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\keyboard.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) KEYBOARD_OBJECTS = \ $(OBJS)\keyboard_keyboard.obj KEYBOARD_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\keyboard.pdb del $(OBJS)\keyboard.pdb $(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\keyboard.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\keyboard.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(KEYBOARD_OBJECTS) $(KEYBOARD_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/layout/makefile.unx b/samples/layout/makefile.unx index 35e95632e4..f238a21de2 100644 --- a/samples/layout/makefile.unx +++ b/samples/layout/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/layout/makefile.vc b/samples/layout/makefile.vc index 3460cd3b03..3c467edb36 100644 --- a/samples/layout/makefile.vc +++ b/samples/layout/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) LAYOUT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\layout.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\layout.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) LAYOUT_OBJECTS = \ $(OBJS)\layout_layout.obj LAYOUT_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\layout.pdb del $(OBJS)\layout.pdb $(OBJS)\layout.exe: $(LAYOUT_OBJECTS) $(OBJS)\layout_layout.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\layout.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\layout.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(LAYOUT_OBJECTS) $(LAYOUT_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/listctrl/makefile.unx b/samples/listctrl/makefile.unx index 656c0a8bd3..86cb94c997 100644 --- a/samples/listctrl/makefile.unx +++ b/samples/listctrl/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/listctrl/makefile.vc b/samples/listctrl/makefile.vc index f08f0e212e..d7bf563126 100644 --- a/samples/listctrl/makefile.vc +++ b/samples/listctrl/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) LISTCTRL_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\listctrl.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\listctrl.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) LISTCTRL_OBJECTS = \ $(OBJS)\listctrl_listtest.obj LISTCTRL_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\listctrl.pdb del $(OBJS)\listctrl.pdb $(OBJS)\listctrl.exe: $(LISTCTRL_OBJECTS) $(OBJS)\listctrl_listtest.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\listctrl.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\listctrl.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(LISTCTRL_OBJECTS) $(LISTCTRL_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/mdi/makefile.unx b/samples/mdi/makefile.unx index eabe74ec96..fd48fc3432 100644 --- a/samples/mdi/makefile.unx +++ b/samples/mdi/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/mdi/makefile.vc b/samples/mdi/makefile.vc index 4e758f64de..a28af0e6af 100644 --- a/samples/mdi/makefile.vc +++ b/samples/mdi/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) MDI_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\mdi.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\mdi.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) MDI_OBJECTS = \ $(OBJS)\mdi_mdi.obj MDI_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\mdi.pdb del $(OBJS)\mdi.pdb $(OBJS)\mdi.exe: $(MDI_OBJECTS) $(OBJS)\mdi_mdi.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\mdi.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\mdi.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(MDI_OBJECTS) $(MDI_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/mediaplayer/makefile.unx b/samples/mediaplayer/makefile.unx index cf54f372e0..77285acf2d 100644 --- a/samples/mediaplayer/makefile.unx +++ b/samples/mediaplayer/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/mediaplayer/makefile.vc b/samples/mediaplayer/makefile.vc index 26aaa30f93..303d43ff44 100644 --- a/samples/mediaplayer/makefile.vc +++ b/samples/mediaplayer/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) MEDIAPLAYER_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\mediaplayer.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\mediaplayer.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) MEDIAPLAYER_OBJECTS = \ $(OBJS)\mediaplayer_mediaplayer.obj MEDIAPLAYER_RESOURCES = \ @@ -328,7 +328,7 @@ clean: -if exist $(OBJS)\mediaplayer.pdb del $(OBJS)\mediaplayer.pdb $(OBJS)\mediaplayer.exe: $(MEDIAPLAYER_OBJECTS) $(OBJS)\mediaplayer_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\mediaplayer.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\mediaplayer.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(MEDIAPLAYER_OBJECTS) $(MEDIAPLAYER_RESOURCES) $(__WXLIB_MEDIA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/memcheck/makefile.unx b/samples/memcheck/makefile.unx index 181db3aafe..739da8bc46 100644 --- a/samples/memcheck/makefile.unx +++ b/samples/memcheck/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/memcheck/makefile.vc b/samples/memcheck/makefile.vc index ed738e80d4..c97ecd55a5 100644 --- a/samples/memcheck/makefile.vc +++ b/samples/memcheck/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) MEMCHECK_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\memcheck.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\memcheck.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) MEMCHECK_OBJECTS = \ $(OBJS)\memcheck_memcheck.obj MEMCHECK_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\memcheck.pdb del $(OBJS)\memcheck.pdb $(OBJS)\memcheck.exe: $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_memcheck.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\memcheck.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\memcheck.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(MEMCHECK_OBJECTS) $(MEMCHECK_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/menu/makefile.unx b/samples/menu/makefile.unx index ad32bf6a9d..3c50ea64b1 100644 --- a/samples/menu/makefile.unx +++ b/samples/menu/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/menu/makefile.vc b/samples/menu/makefile.vc index b4c7835d3a..07002fb635 100644 --- a/samples/menu/makefile.vc +++ b/samples/menu/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) MENU_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\menu.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\menu.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) MENU_OBJECTS = \ $(OBJS)\menu_menu.obj MENU_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\menu.pdb del $(OBJS)\menu.pdb $(OBJS)\menu.exe: $(MENU_OBJECTS) $(OBJS)\menu_menu.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\menu.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\menu.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(MENU_OBJECTS) $(MENU_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/mfc/makefile.vc b/samples/mfc/makefile.vc index 6167de5666..f5f88364bc 100644 --- a/samples/mfc/makefile.vc +++ b/samples/mfc/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) MFCTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\mfctest.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\mfctest.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) MFCTEST_OBJECTS = \ $(OBJS)\mfctest_mfctest.obj MFCTEST_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\mfctest.pdb del $(OBJS)\mfctest.pdb $(OBJS)\mfctest.exe: $(MFCTEST_OBJECTS) $(OBJS)\mfctest_mfctest.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\mfctest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\mfctest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(MFCTEST_OBJECTS) $(MFCTEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/minimal/makefile.unx b/samples/minimal/makefile.unx index f5c52ddb7d..1003573109 100644 --- a/samples/minimal/makefile.unx +++ b/samples/minimal/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/minimal/makefile.vc b/samples/minimal/makefile.vc index 44826af797..7020032f17 100644 --- a/samples/minimal/makefile.vc +++ b/samples/minimal/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) MINIMAL_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\minimal.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\minimal.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) MINIMAL_OBJECTS = \ $(OBJS)\minimal_minimal.obj MINIMAL_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\minimal.pdb del $(OBJS)\minimal.pdb $(OBJS)\minimal.exe: $(MINIMAL_OBJECTS) $(OBJS)\minimal_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\minimal.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\minimal.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(MINIMAL_OBJECTS) $(MINIMAL_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/nativdlg/makefile.unx b/samples/nativdlg/makefile.unx index b7afa1cfd5..d0c8783ae1 100644 --- a/samples/nativdlg/makefile.unx +++ b/samples/nativdlg/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/nativdlg/makefile.vc b/samples/nativdlg/makefile.vc index 4d1fde3585..1d102a632f 100644 --- a/samples/nativdlg/makefile.vc +++ b/samples/nativdlg/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) NATIVDLG_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\nativdlg.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\nativdlg.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) NATIVDLG_OBJECTS = \ $(OBJS)\nativdlg_nativdlg.obj NATIVDLG_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\nativdlg.pdb del $(OBJS)\nativdlg.pdb $(OBJS)\nativdlg.exe: $(NATIVDLG_OBJECTS) $(OBJS)\nativdlg_nativdlg.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\nativdlg.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\nativdlg.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(NATIVDLG_OBJECTS) $(NATIVDLG_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/notebook/makefile.unx b/samples/notebook/makefile.unx index 8397de9b21..d3d8773513 100644 --- a/samples/notebook/makefile.unx +++ b/samples/notebook/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/notebook/makefile.vc b/samples/notebook/makefile.vc index 2edf2ee837..12249f009d 100644 --- a/samples/notebook/makefile.vc +++ b/samples/notebook/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) NOTEBOOK_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\notebook.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\notebook.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) NOTEBOOK_OBJECTS = \ $(OBJS)\notebook_notebook.obj NOTEBOOK_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\notebook.pdb del $(OBJS)\notebook.pdb $(OBJS)\notebook.exe: $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\notebook.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\notebook.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(NOTEBOOK_OBJECTS) $(NOTEBOOK_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/oleauto/makefile.unx b/samples/oleauto/makefile.unx index 42f7b708d6..d52ec1cd49 100644 --- a/samples/oleauto/makefile.unx +++ b/samples/oleauto/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/oleauto/makefile.vc b/samples/oleauto/makefile.vc index 036a2c25c5..5b8455fd18 100644 --- a/samples/oleauto/makefile.vc +++ b/samples/oleauto/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) OLEAUTO_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\oleauto.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\oleauto.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) OLEAUTO_OBJECTS = \ $(OBJS)\oleauto_oleauto.obj OLEAUTO_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\oleauto.pdb del $(OBJS)\oleauto.pdb $(OBJS)\oleauto.exe: $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_oleauto.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\oleauto.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\oleauto.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(OLEAUTO_OBJECTS) $(OLEAUTO_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/opengl/cube/makefile.unx b/samples/opengl/cube/makefile.unx index af8c79fd21..1e21f92243 100644 --- a/samples/opengl/cube/makefile.unx +++ b/samples/opengl/cube/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/opengl/cube/makefile.vc b/samples/opengl/cube/makefile.vc index c5687e40f7..83027769c2 100644 --- a/samples/opengl/cube/makefile.vc +++ b/samples/opengl/cube/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) CUBE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\cube.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \ - $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\cube.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ + $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) CUBE_OBJECTS = \ $(OBJS)\cube_cube.obj CUBE_RESOURCES = \ @@ -328,7 +328,7 @@ clean: !if "$(USE_OPENGL)" == "1" $(OBJS)\cube.exe: $(CUBE_OBJECTS) $(OBJS)\cube_cube.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\cube.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\cube.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(CUBE_OBJECTS) $(CUBE_RESOURCES) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << !endif diff --git a/samples/opengl/isosurf/makefile.unx b/samples/opengl/isosurf/makefile.unx index e45b847055..8de8a43116 100644 --- a/samples/opengl/isosurf/makefile.unx +++ b/samples/opengl/isosurf/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/opengl/isosurf/makefile.vc b/samples/opengl/isosurf/makefile.vc index f7abf8124b..53500b9f89 100644 --- a/samples/opengl/isosurf/makefile.vc +++ b/samples/opengl/isosurf/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) ISOSURF_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\isosurf.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \ - $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\isosurf.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ + $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) ISOSURF_OBJECTS = \ $(OBJS)\isosurf_isosurf.obj ISOSURF_RESOURCES = \ @@ -328,7 +328,7 @@ clean: !if "$(USE_OPENGL)" == "1" $(OBJS)\isosurf.exe: $(ISOSURF_OBJECTS) $(OBJS)\isosurf_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\isosurf.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\isosurf.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(ISOSURF_OBJECTS) $(ISOSURF_RESOURCES) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << !endif diff --git a/samples/opengl/penguin/makefile.unx b/samples/opengl/penguin/makefile.unx index 0c010e9fe6..f9278099c0 100644 --- a/samples/opengl/penguin/makefile.unx +++ b/samples/opengl/penguin/makefile.unx @@ -31,7 +31,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/opengl/penguin/makefile.vc b/samples/opengl/penguin/makefile.vc index 492d4b16a8..5066b48c3d 100644 --- a/samples/opengl/penguin/makefile.vc +++ b/samples/opengl/penguin/makefile.vc @@ -21,21 +21,20 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) PENGUIN_CFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\penguin.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(CPPFLAGS) \ - $(CFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\penguin.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ + $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(CPPFLAGS) $(CFLAGS) PENGUIN_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\penguin.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \ - $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\penguin.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ + $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) PENGUIN_OBJECTS = \ $(OBJS)\penguin_penguin.obj \ $(OBJS)\penguin_dxfrenderer.obj \ @@ -338,7 +337,7 @@ clean: !if "$(USE_OPENGL)" == "1" $(OBJS)\penguin.exe: $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\penguin.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\penguin.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(PENGUIN_OBJECTS) $(PENGUIN_RESOURCES) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << !endif diff --git a/samples/ownerdrw/makefile.unx b/samples/ownerdrw/makefile.unx index 05e4737b86..a371135711 100644 --- a/samples/ownerdrw/makefile.unx +++ b/samples/ownerdrw/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/ownerdrw/makefile.vc b/samples/ownerdrw/makefile.vc index b811224c92..0d357c9cb5 100644 --- a/samples/ownerdrw/makefile.vc +++ b/samples/ownerdrw/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) OWNERDRW_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\ownerdrw.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\ownerdrw.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) OWNERDRW_OBJECTS = \ $(OBJS)\ownerdrw_ownerdrw.obj OWNERDRW_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\ownerdrw.pdb del $(OBJS)\ownerdrw.pdb $(OBJS)\ownerdrw.exe: $(OWNERDRW_OBJECTS) $(OBJS)\ownerdrw_ownerdrw.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\ownerdrw.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\ownerdrw.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(OWNERDRW_OBJECTS) $(OWNERDRW_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/popup/makefile.unx b/samples/popup/makefile.unx index f6c7617c20..2695a9bf6c 100644 --- a/samples/popup/makefile.unx +++ b/samples/popup/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/popup/makefile.vc b/samples/popup/makefile.vc index a7f917b0a1..776d476710 100644 --- a/samples/popup/makefile.vc +++ b/samples/popup/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) POPUP_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\popup.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\popup.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) POPUP_OBJECTS = \ $(OBJS)\popup_popup.obj POPUP_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\popup.pdb del $(OBJS)\popup.pdb $(OBJS)\popup.exe: $(POPUP_OBJECTS) $(OBJS)\popup_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\popup.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\popup.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(POPUP_OBJECTS) $(POPUP_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/power/makefile.unx b/samples/power/makefile.unx index 7faee9b9fe..857a4399c2 100644 --- a/samples/power/makefile.unx +++ b/samples/power/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/power/makefile.vc b/samples/power/makefile.vc index 94a19f9963..30b27cb00f 100644 --- a/samples/power/makefile.vc +++ b/samples/power/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) POWER_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\power.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\power.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) POWER_OBJECTS = \ $(OBJS)\power_power.obj POWER_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\power.pdb del $(OBJS)\power.pdb $(OBJS)\power.exe: $(POWER_OBJECTS) $(OBJS)\power_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\power.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\power.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(POWER_OBJECTS) $(POWER_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/printing/makefile.unx b/samples/printing/makefile.unx index f1bf72f6a4..6f65bdeb94 100644 --- a/samples/printing/makefile.unx +++ b/samples/printing/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/printing/makefile.vc b/samples/printing/makefile.vc index f9842b665f..b4f41dc03b 100644 --- a/samples/printing/makefile.vc +++ b/samples/printing/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) PRINTING_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\printing.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\printing.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) PRINTING_OBJECTS = \ $(OBJS)\printing_printing.obj PRINTING_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\printing.pdb del $(OBJS)\printing.pdb $(OBJS)\printing.exe: $(PRINTING_OBJECTS) $(OBJS)\printing_printing.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\printing.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\printing.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(PRINTING_OBJECTS) $(PRINTING_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/propgrid/makefile.unx b/samples/propgrid/makefile.unx index 364e956551..cda84bf537 100644 --- a/samples/propgrid/makefile.unx +++ b/samples/propgrid/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/propgrid/makefile.vc b/samples/propgrid/makefile.vc index 64f2baa56e..1d8a61684e 100644 --- a/samples/propgrid/makefile.vc +++ b/samples/propgrid/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) PROPGRID_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\propgrid.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\propgrid.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) PROPGRID_OBJECTS = \ $(OBJS)\propgrid_propgrid.obj \ $(OBJS)\propgrid_propgrid_minimal.obj \ @@ -335,7 +335,7 @@ clean: -if exist $(OBJS)\propgrid.pdb del $(OBJS)\propgrid.pdb $(OBJS)\propgrid.exe: $(PROPGRID_OBJECTS) $(OBJS)\propgrid_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\propgrid.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\propgrid.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(PROPGRID_OBJECTS) $(PROPGRID_RESOURCES) $(__WXLIB_PROPGRID_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/regtest/makefile.unx b/samples/regtest/makefile.unx index fc700cf736..2260916b6e 100644 --- a/samples/regtest/makefile.unx +++ b/samples/regtest/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/regtest/makefile.vc b/samples/regtest/makefile.vc index bcb840f7f9..309de1c6ae 100644 --- a/samples/regtest/makefile.vc +++ b/samples/regtest/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) REGTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\regtest.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\regtest.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) REGTEST_OBJECTS = \ $(OBJS)\regtest_regtest.obj REGTEST_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\regtest.pdb del $(OBJS)\regtest.pdb $(OBJS)\regtest.exe: $(REGTEST_OBJECTS) $(OBJS)\regtest_regtest.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\regtest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\regtest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(REGTEST_OBJECTS) $(REGTEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/render/makefile.unx b/samples/render/makefile.unx index 55287809ce..6163491e50 100644 --- a/samples/render/makefile.unx +++ b/samples/render/makefile.unx @@ -28,7 +28,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/render/makefile.vc b/samples/render/makefile.vc index b7d6640143..84f871a749 100644 --- a/samples/render/makefile.vc +++ b/samples/render/makefile.vc @@ -22,13 +22,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) RENDER_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) /Fd$(OBJS)\render.pdb $(__DEBUGINFO_2) $(____DEBUGRUNTIME) \ - $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO) /Fd$(OBJS)\render.pdb $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \ + /I.\..\..\samples /DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \ + $(CXXFLAGS) RENDER_OBJECTS = \ $(OBJS)\render_render.obj RENDER_RESOURCES = \ @@ -36,12 +36,11 @@ RENDER_RESOURCES = \ RENDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_27)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.pdb \ - $(__DEBUGINFO_19) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \ - /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I.\..\..\include /W4 /DWXUSINGDLL $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /DWXUSINGDLL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) RENDDLL_OBJECTS = \ $(OBJS)\renddll_renddll.obj @@ -361,13 +360,13 @@ clean: -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.pdb del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.pdb $(OBJS)\render.exe: $(RENDER_OBJECTS) $(OBJS)\render_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\render.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\render.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(RENDER_OBJECTS) $(RENDER_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << !if "$(SHARED)" == "1" $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.dll: $(RENDDLL_OBJECTS) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.pdb" $(__DEBUGINFO_19) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(RENDDLL_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << !endif diff --git a/samples/ribbon/makefile.unx b/samples/ribbon/makefile.unx index 75c6ae4add..ce32399f7b 100644 --- a/samples/ribbon/makefile.unx +++ b/samples/ribbon/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/ribbon/makefile.vc b/samples/ribbon/makefile.vc index d5fff9f856..405242ec7c 100644 --- a/samples/ribbon/makefile.vc +++ b/samples/ribbon/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) RIBBON_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\ribbon.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\ribbon.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) RIBBON_OBJECTS = \ $(OBJS)\ribbon_ribbondemo.obj RIBBON_RESOURCES = \ @@ -332,7 +332,7 @@ clean: -if exist $(OBJS)\ribbon.pdb del $(OBJS)\ribbon.pdb $(OBJS)\ribbon.exe: $(RIBBON_OBJECTS) $(OBJS)\ribbon_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\ribbon.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\ribbon.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(RIBBON_OBJECTS) $(RIBBON_RESOURCES) $(__WXLIB_RIBBON_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/richtext/makefile.unx b/samples/richtext/makefile.unx index f769a83933..77efef281e 100644 --- a/samples/richtext/makefile.unx +++ b/samples/richtext/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/richtext/makefile.vc b/samples/richtext/makefile.vc index 939c354885..8c20574568 100644 --- a/samples/richtext/makefile.vc +++ b/samples/richtext/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) RICHTEXT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\richtext.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\richtext.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) RICHTEXT_OBJECTS = \ $(OBJS)\richtext_richtext.obj RICHTEXT_RESOURCES = \ @@ -340,7 +340,7 @@ clean: -if exist $(OBJS)\richtext.pdb del $(OBJS)\richtext.pdb $(OBJS)\richtext.exe: $(RICHTEXT_OBJECTS) $(OBJS)\richtext_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\richtext.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\richtext.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(RICHTEXT_OBJECTS) $(RICHTEXT_RESOURCES) $(__WXLIB_RICHTEXT_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/sashtest/makefile.unx b/samples/sashtest/makefile.unx index f8c80412d9..b471cc876d 100644 --- a/samples/sashtest/makefile.unx +++ b/samples/sashtest/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/sashtest/makefile.vc b/samples/sashtest/makefile.vc index 389519dce2..a6eb109f28 100644 --- a/samples/sashtest/makefile.vc +++ b/samples/sashtest/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) SASHTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\sashtest.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\sashtest.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) SASHTEST_OBJECTS = \ $(OBJS)\sashtest_sashtest.obj SASHTEST_RESOURCES = \ @@ -328,7 +328,7 @@ clean: -if exist $(OBJS)\sashtest.pdb del $(OBJS)\sashtest.pdb $(OBJS)\sashtest.exe: $(SASHTEST_OBJECTS) $(OBJS)\sashtest_sashtest.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\sashtest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\sashtest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(SASHTEST_OBJECTS) $(SASHTEST_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/scroll/makefile.unx b/samples/scroll/makefile.unx index f5e3793c13..b8989d17d0 100644 --- a/samples/scroll/makefile.unx +++ b/samples/scroll/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/scroll/makefile.vc b/samples/scroll/makefile.vc index 6fa5531438..4f9c82a208 100644 --- a/samples/scroll/makefile.vc +++ b/samples/scroll/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) SCROLL_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\scroll.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\scroll.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) SCROLL_OBJECTS = \ $(OBJS)\scroll_scroll.obj SCROLL_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\scroll.pdb del $(OBJS)\scroll.pdb $(OBJS)\scroll.exe: $(SCROLL_OBJECTS) $(OBJS)\scroll_scroll.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\scroll.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\scroll.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(SCROLL_OBJECTS) $(SCROLL_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/shaped/makefile.unx b/samples/shaped/makefile.unx index e1df8a94ec..2558413ef3 100644 --- a/samples/shaped/makefile.unx +++ b/samples/shaped/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/shaped/makefile.vc b/samples/shaped/makefile.vc index 3716f20cc6..b062806653 100644 --- a/samples/shaped/makefile.vc +++ b/samples/shaped/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) SHAPED_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\shaped.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\shaped.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) SHAPED_OBJECTS = \ $(OBJS)\shaped_shaped.obj SHAPED_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\shaped.pdb del $(OBJS)\shaped.pdb $(OBJS)\shaped.exe: $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\shaped.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\shaped.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(SHAPED_OBJECTS) $(SHAPED_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/sockets/makefile.unx b/samples/sockets/makefile.unx index 15575217bd..5901479e9a 100644 --- a/samples/sockets/makefile.unx +++ b/samples/sockets/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/sockets/makefile.vc b/samples/sockets/makefile.vc index 273eecac40..e44f453670 100644 --- a/samples/sockets/makefile.vc +++ b/samples/sockets/makefile.vc @@ -21,47 +21,47 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) CLIENT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) /Fd$(OBJS)\client.pdb $(__DEBUGINFO_2) $(____DEBUGRUNTIME) \ - $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO) /Fd$(OBJS)\client.pdb $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \ + /I.\..\..\samples /DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \ + $(CXXFLAGS) CLIENT_OBJECTS = \ $(OBJS)\client_client.obj CLIENT_RESOURCES = \ $(OBJS)\client_client.res SERVER_CXXFLAGS = /M$(__RUNTIME_LIBS_26)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) /Fd$(OBJS)\server.pdb $(__DEBUGINFO_18) $(____DEBUGRUNTIME) \ - $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO) /Fd$(OBJS)\server.pdb $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \ + /I.\..\..\samples /DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \ + $(CXXFLAGS) SERVER_OBJECTS = \ $(OBJS)\server_server.obj SERVER_RESOURCES = \ $(OBJS)\server_server.res BASECLIENT_CXXFLAGS = /M$(__RUNTIME_LIBS_42)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) /Fd$(OBJS)\baseclient.pdb $(__DEBUGINFO_34) \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO) /Fd$(OBJS)\baseclient.pdb $(____DEBUGRUNTIME) \ + $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \ + $(CXXFLAGS) BASECLIENT_OBJECTS = \ $(OBJS)\baseclient_baseclient.obj BASESERVER_CXXFLAGS = /M$(__RUNTIME_LIBS_58)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) /Fd$(OBJS)\baseserver.pdb $(__DEBUGINFO_50) \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO) /Fd$(OBJS)\baseserver.pdb $(____DEBUGRUNTIME) \ + $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \ + $(CXXFLAGS) BASESERVER_OBJECTS = \ $(OBJS)\baseserver_baseserver.obj @@ -430,25 +430,25 @@ clean: !if "$(USE_GUI)" == "1" $(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_client.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\client.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\client.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(CLIENT_OBJECTS) $(CLIENT_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << !endif !if "$(USE_GUI)" == "1" $(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_server.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\server.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\server.pdb" $(__DEBUGINFO_18) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(SERVER_OBJECTS) $(SERVER_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << !endif $(OBJS)\baseclient.exe: $(BASECLIENT_OBJECTS) - link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\baseclient.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\baseclient.pdb" $(__DEBUGINFO_34) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< $(BASECLIENT_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << $(OBJS)\baseserver.exe: $(BASESERVER_OBJECTS) - link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\baseserver.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\baseserver.pdb" $(__DEBUGINFO_50) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< $(BASESERVER_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/sound/makefile.unx b/samples/sound/makefile.unx index 487c4e0831..8d7fa02515 100644 --- a/samples/sound/makefile.unx +++ b/samples/sound/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/sound/makefile.vc b/samples/sound/makefile.vc index 67554d6b44..c261f8cc8f 100644 --- a/samples/sound/makefile.vc +++ b/samples/sound/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) SOUND_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\sound.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\sound.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) SOUND_OBJECTS = \ $(OBJS)\sound_sound.obj SOUND_RESOURCES = \ @@ -328,7 +328,7 @@ clean: -if exist $(OBJS)\sound.pdb del $(OBJS)\sound.pdb $(OBJS)\sound.exe: $(SOUND_OBJECTS) $(OBJS)\sound_sound.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\sound.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\sound.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(SOUND_OBJECTS) $(SOUND_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/splash/makefile.unx b/samples/splash/makefile.unx index 4162c86e2b..e45cc9c327 100644 --- a/samples/splash/makefile.unx +++ b/samples/splash/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/splash/makefile.vc b/samples/splash/makefile.vc index fccb91bf12..2db8a37b23 100644 --- a/samples/splash/makefile.vc +++ b/samples/splash/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) SPLASH_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\splash.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\splash.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) SPLASH_OBJECTS = \ $(OBJS)\splash_splash.obj SPLASH_RESOURCES = \ @@ -332,7 +332,7 @@ clean: -if exist $(OBJS)\splash.pdb del $(OBJS)\splash.pdb $(OBJS)\splash.exe: $(SPLASH_OBJECTS) $(OBJS)\splash_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\splash.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\splash.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(SPLASH_OBJECTS) $(SPLASH_RESOURCES) $(__WXLIB_MEDIA_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/splitter/makefile.unx b/samples/splitter/makefile.unx index 473b3a29d1..87125d750e 100644 --- a/samples/splitter/makefile.unx +++ b/samples/splitter/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/splitter/makefile.vc b/samples/splitter/makefile.vc index 885a9d8680..0d9f75d5ae 100644 --- a/samples/splitter/makefile.vc +++ b/samples/splitter/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) SPLITTER_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\splitter.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\splitter.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) SPLITTER_OBJECTS = \ $(OBJS)\splitter_splitter.obj SPLITTER_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\splitter.pdb del $(OBJS)\splitter.pdb $(OBJS)\splitter.exe: $(SPLITTER_OBJECTS) $(OBJS)\splitter_splitter.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\splitter.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\splitter.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(SPLITTER_OBJECTS) $(SPLITTER_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/statbar/makefile.unx b/samples/statbar/makefile.unx index a530a7eb86..ade0dfb3fb 100644 --- a/samples/statbar/makefile.unx +++ b/samples/statbar/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/statbar/makefile.vc b/samples/statbar/makefile.vc index db81524f04..5deea23e8b 100644 --- a/samples/statbar/makefile.vc +++ b/samples/statbar/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) STATBAR_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\statbar.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\statbar.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) STATBAR_OBJECTS = \ $(OBJS)\statbar_statbar.obj STATBAR_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\statbar.pdb del $(OBJS)\statbar.pdb $(OBJS)\statbar.exe: $(STATBAR_OBJECTS) $(OBJS)\statbar_statbar.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\statbar.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\statbar.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(STATBAR_OBJECTS) $(STATBAR_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/stc/makefile.unx b/samples/stc/makefile.unx index fc9cb8588b..b1e37545f7 100644 --- a/samples/stc/makefile.unx +++ b/samples/stc/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/stc/makefile.vc b/samples/stc/makefile.vc index e514fa85b7..b45d769968 100644 --- a/samples/stc/makefile.vc +++ b/samples/stc/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) STCTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\stctest.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\stctest.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) STCTEST_OBJECTS = \ $(OBJS)\stctest_stctest.obj \ $(OBJS)\stctest_edit.obj \ @@ -330,7 +330,7 @@ clean: -if exist $(OBJS)\stctest.pdb del $(OBJS)\stctest.pdb $(OBJS)\stctest.exe: $(STCTEST_OBJECTS) $(OBJS)\stctest_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\stctest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\stctest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(STCTEST_OBJECTS) $(STCTEST_RESOURCES) $(__WXLIB_STC_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxscintilla$(WXDEBUGFLAG).lib $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/svg/makefile.unx b/samples/svg/makefile.unx index 64da3cfa6f..6871e328cc 100644 --- a/samples/svg/makefile.unx +++ b/samples/svg/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/svg/makefile.vc b/samples/svg/makefile.vc index d4d66f1305..189942e780 100644 --- a/samples/svg/makefile.vc +++ b/samples/svg/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) SVGTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\svgtest.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\svgtest.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) SVGTEST_OBJECTS = \ $(OBJS)\svgtest_svgtest.obj SVGTEST_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\svgtest.pdb del $(OBJS)\svgtest.pdb $(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\svgtest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\svgtest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(SVGTEST_OBJECTS) $(SVGTEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/taborder/makefile.unx b/samples/taborder/makefile.unx index 0f28955eef..5debd4fe35 100644 --- a/samples/taborder/makefile.unx +++ b/samples/taborder/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/taborder/makefile.vc b/samples/taborder/makefile.vc index 7ac7a56a3f..dd9cbe2985 100644 --- a/samples/taborder/makefile.vc +++ b/samples/taborder/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) TABORDER_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\taborder.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\taborder.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) TABORDER_OBJECTS = \ $(OBJS)\taborder_taborder.obj TABORDER_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\taborder.pdb del $(OBJS)\taborder.pdb $(OBJS)\taborder.exe: $(TABORDER_OBJECTS) $(OBJS)\taborder_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\taborder.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\taborder.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(TABORDER_OBJECTS) $(TABORDER_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/taskbar/makefile.unx b/samples/taskbar/makefile.unx index 055427cb30..ab97dd6fb1 100644 --- a/samples/taskbar/makefile.unx +++ b/samples/taskbar/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/taskbar/makefile.vc b/samples/taskbar/makefile.vc index 7ac44380f8..6bf7453b8a 100644 --- a/samples/taskbar/makefile.vc +++ b/samples/taskbar/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) TASKBAR_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\taskbar.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\taskbar.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) TASKBAR_OBJECTS = \ $(OBJS)\taskbar_tbtest.obj TASKBAR_RESOURCES = \ @@ -328,7 +328,7 @@ clean: -if exist $(OBJS)\taskbar.pdb del $(OBJS)\taskbar.pdb $(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS) $(OBJS)\taskbar_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\taskbar.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\taskbar.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(TASKBAR_OBJECTS) $(TASKBAR_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/text/makefile.unx b/samples/text/makefile.unx index 0c7466622f..378009710f 100644 --- a/samples/text/makefile.unx +++ b/samples/text/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/text/makefile.vc b/samples/text/makefile.vc index bbc5531127..82f0be8a63 100644 --- a/samples/text/makefile.vc +++ b/samples/text/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) TEXT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\text.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\text.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) TEXT_OBJECTS = \ $(OBJS)\text_text.obj TEXT_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\text.pdb del $(OBJS)\text.pdb $(OBJS)\text.exe: $(TEXT_OBJECTS) $(OBJS)\text_text.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\text.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\text.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(TEXT_OBJECTS) $(TEXT_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/thread/makefile.unx b/samples/thread/makefile.unx index 3c366064fe..7a14c79e8e 100644 --- a/samples/thread/makefile.unx +++ b/samples/thread/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/thread/makefile.vc b/samples/thread/makefile.vc index 5ef52dc729..99b7f2077b 100644 --- a/samples/thread/makefile.vc +++ b/samples/thread/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) THREAD_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\thread.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\thread.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) THREAD_OBJECTS = \ $(OBJS)\thread_thread.obj THREAD_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\thread.pdb del $(OBJS)\thread.pdb $(OBJS)\thread.exe: $(THREAD_OBJECTS) $(OBJS)\thread_thread.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\thread.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\thread.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(THREAD_OBJECTS) $(THREAD_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/toolbar/makefile.unx b/samples/toolbar/makefile.unx index 5e8c16ec67..2ba15da753 100644 --- a/samples/toolbar/makefile.unx +++ b/samples/toolbar/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/toolbar/makefile.vc b/samples/toolbar/makefile.vc index f6e0767f30..bc44bbe970 100644 --- a/samples/toolbar/makefile.vc +++ b/samples/toolbar/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) TOOLBAR_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\toolbar.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\toolbar.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) TOOLBAR_OBJECTS = \ $(OBJS)\toolbar_toolbar.obj TOOLBAR_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\toolbar.pdb del $(OBJS)\toolbar.pdb $(OBJS)\toolbar.exe: $(TOOLBAR_OBJECTS) $(OBJS)\toolbar_toolbar.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\toolbar.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\toolbar.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(TOOLBAR_OBJECTS) $(TOOLBAR_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/treectrl/makefile.unx b/samples/treectrl/makefile.unx index 80642dd506..d2d968e040 100644 --- a/samples/treectrl/makefile.unx +++ b/samples/treectrl/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/treectrl/makefile.vc b/samples/treectrl/makefile.vc index d06fbe066b..77f8580ea6 100644 --- a/samples/treectrl/makefile.vc +++ b/samples/treectrl/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) TREECTRL_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\treectrl.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\treectrl.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) TREECTRL_OBJECTS = \ $(OBJS)\treectrl_treetest.obj TREECTRL_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\treectrl.pdb del $(OBJS)\treectrl.pdb $(OBJS)\treectrl.exe: $(TREECTRL_OBJECTS) $(OBJS)\treectrl_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\treectrl.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\treectrl.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(TREECTRL_OBJECTS) $(TREECTRL_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/typetest/makefile.unx b/samples/typetest/makefile.unx index 2f315b7ae0..c9dbcd897c 100644 --- a/samples/typetest/makefile.unx +++ b/samples/typetest/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/typetest/makefile.vc b/samples/typetest/makefile.vc index 704fa9348f..e1a85ecb29 100644 --- a/samples/typetest/makefile.vc +++ b/samples/typetest/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) TYPETEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\typetest.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\typetest.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) TYPETEST_OBJECTS = \ $(OBJS)\typetest_typetest.obj TYPETEST_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\typetest.pdb del $(OBJS)\typetest.pdb $(OBJS)\typetest.exe: $(TYPETEST_OBJECTS) $(OBJS)\typetest_typetest.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\typetest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\typetest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(TYPETEST_OBJECTS) $(TYPETEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/validate/makefile.unx b/samples/validate/makefile.unx index 62853f6ed2..3d86f491f1 100644 --- a/samples/validate/makefile.unx +++ b/samples/validate/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/validate/makefile.vc b/samples/validate/makefile.vc index d672f20e66..8c58decc12 100644 --- a/samples/validate/makefile.vc +++ b/samples/validate/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) VALIDATE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\validate.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\validate.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) VALIDATE_OBJECTS = \ $(OBJS)\validate_validate.obj VALIDATE_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\validate.pdb del $(OBJS)\validate.pdb $(OBJS)\validate.exe: $(VALIDATE_OBJECTS) $(OBJS)\validate_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\validate.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\validate.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(VALIDATE_OBJECTS) $(VALIDATE_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/vscroll/makefile.unx b/samples/vscroll/makefile.unx index e86ab9aa9e..63be9756e8 100644 --- a/samples/vscroll/makefile.unx +++ b/samples/vscroll/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/vscroll/makefile.vc b/samples/vscroll/makefile.vc index cc3b6598e4..7045165e28 100644 --- a/samples/vscroll/makefile.vc +++ b/samples/vscroll/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) VSTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\vstest.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\vstest.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) VSTEST_OBJECTS = \ $(OBJS)\vstest_vstest.obj VSTEST_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\vstest.pdb del $(OBJS)\vstest.pdb $(OBJS)\vstest.exe: $(VSTEST_OBJECTS) $(OBJS)\vstest_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\vstest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\vstest.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(VSTEST_OBJECTS) $(VSTEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/widgets/makefile.unx b/samples/widgets/makefile.unx index b2f678fc64..f36b51ccc0 100644 --- a/samples/widgets/makefile.unx +++ b/samples/widgets/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/widgets/makefile.vc b/samples/widgets/makefile.vc index efdbc10e91..5c3fcb6c61 100644 --- a/samples/widgets/makefile.vc +++ b/samples/widgets/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) WIDGETS_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\widgets.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\widgets.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) WIDGETS_OBJECTS = \ $(OBJS)\widgets_bmpcombobox.obj \ $(OBJS)\widgets_button.obj \ @@ -355,7 +355,7 @@ clean: -if exist $(OBJS)\widgets.pdb del $(OBJS)\widgets.pdb $(OBJS)\widgets.exe: $(WIDGETS_OBJECTS) $(OBJS)\widgets_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\widgets.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\widgets.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(WIDGETS_OBJECTS) $(WIDGETS_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/wizard/makefile.unx b/samples/wizard/makefile.unx index 334fdd47c1..56dd240628 100644 --- a/samples/wizard/makefile.unx +++ b/samples/wizard/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/wizard/makefile.vc b/samples/wizard/makefile.vc index d94ba38ed7..4ead8cc58b 100644 --- a/samples/wizard/makefile.vc +++ b/samples/wizard/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) WIZARD_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\wizard.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\wizard.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) WIZARD_OBJECTS = \ $(OBJS)\wizard_wizard.obj WIZARD_RESOURCES = \ @@ -328,7 +328,7 @@ clean: -if exist $(OBJS)\wizard.pdb del $(OBJS)\wizard.pdb $(OBJS)\wizard.exe: $(WIZARD_OBJECTS) $(OBJS)\wizard_wizard.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wizard.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wizard.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(WIZARD_OBJECTS) $(WIZARD_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/wrapsizer/makefile.unx b/samples/wrapsizer/makefile.unx index 1859b64207..8fbddb8fa8 100644 --- a/samples/wrapsizer/makefile.unx +++ b/samples/wrapsizer/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/wrapsizer/makefile.vc b/samples/wrapsizer/makefile.vc index 650336d480..4a49f07e09 100644 --- a/samples/wrapsizer/makefile.vc +++ b/samples/wrapsizer/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) WRAPSIZER_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\wrapsizer.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\wrapsizer.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) WRAPSIZER_OBJECTS = \ $(OBJS)\wrapsizer_wrapsizer.obj WRAPSIZER_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\wrapsizer.pdb del $(OBJS)\wrapsizer.pdb $(OBJS)\wrapsizer.exe: $(WRAPSIZER_OBJECTS) $(OBJS)\wrapsizer_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wrapsizer.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wrapsizer.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(WRAPSIZER_OBJECTS) $(WRAPSIZER_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/samples/xrc/makefile.unx b/samples/xrc/makefile.unx index 4b6dfacc6e..732989fb3e 100644 --- a/samples/xrc/makefile.unx +++ b/samples/xrc/makefile.unx @@ -25,7 +25,7 @@ LDFLAGS ?= # Location and arguments of wx-config script WX_CONFIG ?= wx-config -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] +# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb] WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit) # Use DLL build of wx library to use? [0,1] diff --git a/samples/xrc/makefile.vc b/samples/xrc/makefile.vc index 7f932d6c63..58802e99f3 100644 --- a/samples/xrc/makefile.vc +++ b/samples/xrc/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) XRCDEMO_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\xrcdemo.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\xrcdemo.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) XRCDEMO_OBJECTS = \ $(OBJS)\xrcdemo_xrcdemo.obj \ $(OBJS)\xrcdemo_myframe.obj \ @@ -343,7 +343,7 @@ clean: -if exist $(OBJS)\xrcdemo.pdb del $(OBJS)\xrcdemo.pdb $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\xrcdemo.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\xrcdemo.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(XRCDEMO_OBJECTS) $(XRCDEMO_RESOURCES) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/tests/benchmarks/makefile.vc b/tests/benchmarks/makefile.vc index 3f95f20983..8eedf2f093 100644 --- a/tests/benchmarks/makefile.vc +++ b/tests/benchmarks/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) BENCH_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\bench.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\bench.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) \ + $(CXXFLAGS) BENCH_OBJECTS = \ $(OBJS)\bench_bench.obj \ $(OBJS)\bench_htmlpars.obj \ @@ -272,7 +272,7 @@ clean: -if exist $(OBJS)\bench.pdb del $(OBJS)\bench.pdb $(OBJS)\bench.exe: $(BENCH_OBJECTS) - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\bench.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\bench.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< $(BENCH_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/tests/makefile.vc b/tests/makefile.vc index 547b183bbf..790a39a7eb 100644 --- a/tests/makefile.vc +++ b/tests/makefile.vc @@ -21,7 +21,7 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \ - /Fd$(OBJS)\test.pdb $(__DEBUGINFO_2) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + /Fd$(OBJS)\test.pdb $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ @@ -99,14 +99,14 @@ TEST_OBJECTS = \ $(OBJS)\test_xlocale.obj \ $(OBJS)\test_xmltest.obj TEST_GUI_CXXFLAGS = /M$(__RUNTIME_LIBS_27)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) /Fd$(OBJS)\test_gui.pdb $(__DEBUGINFO_19) \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\include /W4 /I. \ - $(__DLLFLAG_p) /I.\..\samples /DNOPCH $(CPPUNIT_CFLAGS) /D_CONSOLE \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"testprec.h" \ - /Fp"$(OBJS)\testprec_test_gui.pch" $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO) /Fd$(OBJS)\test_gui.pdb $(____DEBUGRUNTIME) \ + $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\include /W4 /I. $(__DLLFLAG_p) \ + /I.\..\samples /DNOPCH $(CPPUNIT_CFLAGS) /D_CONSOLE $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) /Yu"testprec.h" /Fp"$(OBJS)\testprec_test_gui.pch" \ + $(CPPFLAGS) $(CXXFLAGS) TEST_GUI_OBJECTS = \ $(OBJS)\test_gui_dummy.obj \ $(OBJS)\test_gui_test.obj \ @@ -477,13 +477,13 @@ clean: -if exist $(OBJS)\test_gui.pdb del $(OBJS)\test_gui.pdb $(OBJS)\test.exe: $(OBJS)\test_dummy.obj $(TEST_OBJECTS) - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\test.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\test.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) $(LDFLAGS) @<< $(TEST_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << !if "$(USE_GUI)" == "1" $(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\test_gui.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(CPPUNIT_LIBS) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\test_gui.pdb" $(__DEBUGINFO_19) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(CPPUNIT_LIBS) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< $(TEST_GUI_OBJECTS) $(TEST_GUI_RESOURCES) $(__WXLIB_MEDIA_p) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << !endif diff --git a/utils/emulator/src/makefile.vc b/utils/emulator/src/makefile.vc index 6a138f2e1e..a14905a4ca 100644 --- a/utils/emulator/src/makefile.vc +++ b/utils/emulator/src/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) WXEMULATOR_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\wxemulator.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \ - $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\wxemulator.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ + $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) WXEMULATOR_OBJECTS = \ $(OBJS)\wxemulator_emulator.obj WXEMULATOR_RESOURCES = \ @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\wxemulator.pdb del $(OBJS)\wxemulator.pdb $(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxemulator.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxemulator.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(WXEMULATOR_OBJECTS) $(WXEMULATOR_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/utils/execmon/makefile.vc b/utils/execmon/makefile.vc index 0ecdea310b..856e654ac5 100644 --- a/utils/execmon/makefile.vc +++ b/utils/execmon/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) EXECMON_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\execmon.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\execmon.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) \ + $(CXXFLAGS) EXECMON_OBJECTS = \ $(OBJS)\execmon_execmon.obj @@ -265,7 +265,7 @@ clean: !if "$(USE_XRC)" == "1" $(OBJS)\execmon.exe: $(EXECMON_OBJECTS) - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\execmon.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\execmon.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< $(EXECMON_OBJECTS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << !endif diff --git a/utils/helpview/src/makefile.vc b/utils/helpview/src/makefile.vc index 79df8525bd..415b686675 100644 --- a/utils/helpview/src/makefile.vc +++ b/utils/helpview/src/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) HELPVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\helpview.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \ - $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\helpview.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ + $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) HELPVIEW_OBJECTS = \ $(OBJS)\helpview_helpview.obj HELPVIEW_RESOURCES = \ @@ -332,7 +332,7 @@ clean: -if exist $(OBJS)\helpview.pdb del $(OBJS)\helpview.pdb $(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\helpview.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\helpview.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(HELPVIEW_OBJECTS) $(HELPVIEW_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/utils/hhp2cached/makefile.vc b/utils/hhp2cached/makefile.vc index 862a26271a..5e7fb68b8e 100644 --- a/utils/hhp2cached/makefile.vc +++ b/utils/hhp2cached/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) HHP2CACHED_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\hhp2cached.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\hhp2cached.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \ + $(CPPFLAGS) $(CXXFLAGS) HHP2CACHED_OBJECTS = \ $(OBJS)\hhp2cached_hhp2cached.obj HHP2CACHED_RESOURCES = \ @@ -328,7 +328,7 @@ clean: -if exist $(OBJS)\hhp2cached.pdb del $(OBJS)\hhp2cached.pdb $(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\hhp2cached.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\hhp2cached.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(HHP2CACHED_OBJECTS) $(HHP2CACHED_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/utils/ifacecheck/src/makefile.vc b/utils/ifacecheck/src/makefile.vc index 5339ff08f2..b3f9691e8b 100644 --- a/utils/ifacecheck/src/makefile.vc +++ b/utils/ifacecheck/src/makefile.vc @@ -21,12 +21,12 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) IFACECHECK_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\ifacecheck.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ - /W4 /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_11) \ + $(__DEBUGINFO_0) /Fd$(OBJS)\ifacecheck.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ + $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_11) \ $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) IFACECHECK_OBJECTS = \ $(OBJS)\ifacecheck_ifacecheck.obj \ @@ -266,7 +266,7 @@ clean: -if exist $(OBJS)\ifacecheck.pdb del $(OBJS)\ifacecheck.pdb $(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS) - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\ifacecheck.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\ifacecheck.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< $(IFACECHECK_OBJECTS) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/utils/screenshotgen/src/makefile.vc b/utils/screenshotgen/src/makefile.vc index 3f46150dbb..fdf8e9684e 100644 --- a/utils/screenshotgen/src/makefile.vc +++ b/utils/screenshotgen/src/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) SCREENSHOTGEN_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\screenshotgen.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \ - $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\screenshotgen.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ + $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) SCREENSHOTGEN_OBJECTS = \ $(OBJS)\screenshotgen_screenshot_app.obj \ $(OBJS)\screenshotgen_screenshot_main.obj \ @@ -348,7 +348,7 @@ clean: -if exist $(OBJS)\screenshotgen.pdb del $(OBJS)\screenshotgen.pdb $(OBJS)\screenshotgen.exe: $(SCREENSHOTGEN_OBJECTS) $(OBJS)\screenshotgen_screenshotgen.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\screenshotgen.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\screenshotgen.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(SCREENSHOTGEN_OBJECTS) $(SCREENSHOTGEN_RESOURCES) $(__WXLIB_AUI_p) $(__WXLIB_ADV_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << diff --git a/utils/wxrc/makefile.vc b/utils/wxrc/makefile.vc index 027e69a16c..43f34d7ded 100644 --- a/utils/wxrc/makefile.vc +++ b/utils/wxrc/makefile.vc @@ -21,13 +21,13 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) WXRC_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\wxrc.pdb $(__DEBUGINFO_2) \ - $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_11) \ - $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_0) /Fd$(OBJS)\wxrc.pdb $(____DEBUGRUNTIME_3_p) \ + $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) \ + $(CXXFLAGS) WXRC_OBJECTS = \ $(OBJS)\wxrc_wxrc.obj @@ -269,7 +269,7 @@ clean: !if "$(USE_XRC)" == "1" $(OBJS)\wxrc.exe: $(WXRC_OBJECTS) - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxrc.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxrc.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< $(WXRC_OBJECTS) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << !endif