Fix a crash in wxExecute() in wxMSW too.

[wxWidgets.git] / samples / image / makefile.vc

diff --git a/samples/image/makefile.vc b/samples/image/makefile.vc
index 3a7fa3e228da33c7a634c35e90854ffc45432058..6a62ab620f76d182807f1536d874bd0ce88031e9 100644 (file)
--- a/samples/image/makefile.vc
+++ b/samples/image/makefile.vc
@@ -1,141 +1,375 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../../build/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-IMAGE_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGFLAG_2) /DWIN32 $(__DEBUGFLAG_0) /Fd$(OBJS)\image.pdb $(____DEBUGFLAG_3_p) $(__OPTIMIZEFLAG_4)  /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib  /I.\..\..\src\regex /I.\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_WINDOWS $(CXXFLAGS)
-OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
+# =========================================================================\r
+#     This makefile was generated by\r
+#     Bakefile 0.2.9 (http://www.bakefile.org)\r
+#     Do not modify, all changes will be overwritten!\r
+# =========================================================================\r
+\r
+!include <../../build/msw/config.vc>\r
+\r
+# -------------------------------------------------------------------------\r
+# Do not modify the rest of this file!\r
+# -------------------------------------------------------------------------\r
+\r
+### Variables: ###\r
+\r
+WX_RELEASE_NODOT = 29\r
+COMPILER_PREFIX = vc\r
+OBJS = \\r
+       $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+LIBDIRNAME = \\r
+       .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \\r
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
+IMAGE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \\r
+       $(__DEBUGINFO_0) /Fd$(OBJS)\image.pdb $(____DEBUGRUNTIME_3_p) \\r
+       $(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \\r
+       /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \\r
+       $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+       /I$(SETUPHDIR) /I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. \\r
+       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \\r
+       $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS)\r
+IMAGE_OBJECTS =  \\r
+       $(OBJS)\image_image.obj \\r
+       $(OBJS)\image_canvas.obj\r
+IMAGE_RESOURCES =  \\r
+       $(OBJS)\image_image.res
+\r
+### Conditionally set variables: ###\r
+\r
+!if "$(TARGET_CPU)" == "AMD64"
+ARCH_SUFFIX = _x64

 !endif
 !endif

-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
+!if "$(TARGET_CPU)" == "IA64"
+ARCH_SUFFIX = _ia64

 !endif
 !endif

-!if "$(BUILD)" == "debug"
-WXDEBUGFLAG = d
+!if "$(TARGET_CPU)" == "X64"
+ARCH_SUFFIX = _x64

 !endif
 !endif

-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
+!if "$(TARGET_CPU)" == "amd64"
+ARCH_SUFFIX = _x64

 !endif
 !endif

-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
+!if "$(TARGET_CPU)" == "ia64"
+ARCH_SUFFIX = _ia64

 !endif
 !endif

-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
+!if "$(TARGET_CPU)" == "x64"
+ARCH_SUFFIX = _x64

 !endif
 !endif

-!if "$(BUILD)" == "debug"
-__DEBUGFLAG_0 = /Zi
+!if "$(USE_GUI)" == "0"\r
+PORTNAME = base\r
+!endif\r
+!if "$(USE_GUI)" == "1"\r
+PORTNAME = msw\r
+!endif\r
+!if "$(OFFICIAL_BUILD)" == "1"
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD

 !endif
 !endif

-!if "$(BUILD)" == "release"
-__DEBUGFLAG_0 = 
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+WXDEBUGFLAG = d\r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
+WXDEBUGFLAG = d\r
+!endif\r
+!if "$(UNICODE)" == "1"\r
+WXUNICODEFLAG = u\r
+!endif\r
+!if "$(WXUNIV)" == "1"\r
+WXUNIVNAME = univ\r
+!endif\r
+!if "$(SHARED)" == "1"\r
+WXDLLFLAG = dll\r
+!endif\r
+!if "$(SHARED)" == "0"\r
+LIBTYPE_SUFFIX = lib\r
+!endif\r
+!if "$(SHARED)" == "1"\r
+LIBTYPE_SUFFIX = dll\r
+!endif\r
+!if "$(TARGET_CPU)" == "AMD64"\r
+LINK_TARGET_CPU = /MACHINE:X64\r
+!endif\r
+!if "$(TARGET_CPU)" == "IA64"\r
+LINK_TARGET_CPU = /MACHINE:IA64\r
+!endif\r
+!if "$(TARGET_CPU)" == "X64"
+LINK_TARGET_CPU = /MACHINE:X64

 !endif
 !endif

-!if "$(BUILD)" == "debug"
-__DEBUGFLAG_1 = /DEBUG
+!if "$(TARGET_CPU)" == "amd64"\r
+LINK_TARGET_CPU = /MACHINE:X64\r
+!endif\r
+!if "$(TARGET_CPU)" == "ia64"\r
+LINK_TARGET_CPU = /MACHINE:IA64\r
+!endif\r
+!if "$(TARGET_CPU)" == "x64"
+LINK_TARGET_CPU = /MACHINE:X64

 !endif
 !endif

-!if "$(BUILD)" == "release"
-__DEBUGFLAG_1 = 
-!endif
-!if "$(BUILD)" == "debug"
-__DEBUGFLAG_2 = d
-!endif
-!if "$(BUILD)" == "release"
-__DEBUGFLAG_2 = 
-!endif
-!if "$(BUILD)" == "debug"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug"
-__DEBUG_DEFINE_p_1 = /d__WXDEBUG__
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = /dWXUSINGDLL
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_4 = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_4 = /O2
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 = T
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /dwxUSE_UNICODE=1
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug"
-____DEBUGFLAG_3_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release"
-____DEBUGFLAG_3_p = /DNDEBUG
-!endif
-!if "$(BUILD)" == "debug"
-____DEBUGFLAG_3_p_1 = /d_DEBUG
-!endif
-!if "$(BUILD)" == "release"
-____DEBUGFLAG_3_p_1 = /dNDEBUG
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-       -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\image.exe data
-
-$(OBJS)\image_image.obj: .\image.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(IMAGE_CXXFLAGS) $**
-
+!if "$(MONOLITHIC)" == "0"\r
+EXTRALIBS_FOR_BASE = \r
+!endif\r
+!if "$(MONOLITHIC)" == "1"\r
+EXTRALIBS_FOR_BASE =   \r
+!endif\r
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
+__DEBUGINFO_0 = /Zi\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
+__DEBUGINFO_0 = \r
+!endif\r
+!if "$(DEBUG_INFO)" == "0"\r
+__DEBUGINFO_0 = \r
+!endif\r
+!if "$(DEBUG_INFO)" == "1"\r
+__DEBUGINFO_0 = /Zi\r
+!endif\r
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
+__DEBUGINFO_1 = /DEBUG\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
+__DEBUGINFO_1 = \r
+!endif\r
+!if "$(DEBUG_INFO)" == "0"\r
+__DEBUGINFO_1 = \r
+!endif\r
+!if "$(DEBUG_INFO)" == "1"\r
+__DEBUGINFO_1 = /DEBUG\r
+!endif\r
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
+__DEBUGINFO_2 = \r
+!endif\r
+!if "$(DEBUG_INFO)" == "0"\r
+__DEBUGINFO_2 = \r
+!endif\r
+!if "$(DEBUG_INFO)" == "1"\r
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)\r
+!endif\r
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+____DEBUGRUNTIME_3_p = /D_DEBUG\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+____DEBUGRUNTIME_3_p = \r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+____DEBUGRUNTIME_3_p = \r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
+____DEBUGRUNTIME_3_p = /D_DEBUG\r
+!endif\r
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+____DEBUGRUNTIME_3_p_1 = \r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+____DEBUGRUNTIME_3_p_1 = \r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG\r
+!endif\r
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+__DEBUGRUNTIME_4 = d\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+__DEBUGRUNTIME_4 = \r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+__DEBUGRUNTIME_4 = \r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
+__DEBUGRUNTIME_4 = d\r
+!endif\r
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+__DEBUGRUNTIME_5 = \r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf\r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf\r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
+__DEBUGRUNTIME_5 = \r
+!endif\r
+!if "$(BUILD)" == "debug"\r
+__OPTIMIZEFLAG_6 = /Od\r
+!endif\r
+!if "$(BUILD)" == "release"\r
+__OPTIMIZEFLAG_6 = /O2\r
+!endif\r
+!if "$(USE_THREADS)" == "0"\r
+__THREADSFLAG_9 = L\r
+!endif\r
+!if "$(USE_THREADS)" == "1"\r
+__THREADSFLAG_9 = T\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "dynamic"\r
+__RUNTIME_LIBS_10 = D\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "static"\r
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)\r
+!endif\r
+!if "$(USE_RTTI)" == "0"\r
+__RTTIFLAG_11 = \r
+!endif\r
+!if "$(USE_RTTI)" == "1"\r
+__RTTIFLAG_11 = /GR\r
+!endif\r
+!if "$(USE_EXCEPTIONS)" == "0"\r
+__EXCEPTIONSFLAG_12 = \r
+!endif\r
+!if "$(USE_EXCEPTIONS)" == "1"\r
+__EXCEPTIONSFLAG_12 = /EHsc\r
+!endif\r
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__\r
+!endif\r
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
+!endif\r
+!if "$(WXUNIV)" == "1"\r
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
+!endif\r
+!if "$(WXUNIV)" == "1"\r
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
+!endif\r
+!if "$(DEBUG_FLAG)" == "0"\r
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
+!endif\r
+!if "$(DEBUG_FLAG)" == "0"\r
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+__NDEBUG_DEFINE_p = /DNDEBUG\r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+__NDEBUG_DEFINE_p = /DNDEBUG\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+__NDEBUG_DEFINE_p_1 = /d NDEBUG\r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+__NDEBUG_DEFINE_p_1 = /d NDEBUG\r
+!endif\r
+!if "$(USE_EXCEPTIONS)" == "0"\r
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
+!endif\r
+!if "$(USE_EXCEPTIONS)" == "0"\r
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
+!endif\r
+!if "$(USE_RTTI)" == "0"\r
+__RTTI_DEFINE_p = /DwxNO_RTTI\r
+!endif\r
+!if "$(USE_RTTI)" == "0"\r
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
+!endif\r
+!if "$(USE_THREADS)" == "0"\r
+__THREAD_DEFINE_p = /DwxNO_THREADS\r
+!endif\r
+!if "$(USE_THREADS)" == "0"\r
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS\r
+!endif\r
+!if "$(UNICODE)" == "0"\r
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0\r
+!endif\r
+!if "$(UNICODE)" == "1"\r
+__UNICODE_DEFINE_p = /D_UNICODE\r
+!endif\r
+!if "$(UNICODE)" == "0"\r
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
+!endif\r
+!if "$(UNICODE)" == "1"\r
+__UNICODE_DEFINE_p_1 = /d _UNICODE\r
+!endif\r
+!if "$(MSLU)" == "1"\r
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
+!endif\r
+!if "$(MSLU)" == "1"\r
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
+!endif\r
+!if "$(USE_CAIRO)" == "1"\r
+____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo\r
+!endif\r
+!if "$(USE_CAIRO)" == "1"\r
+____CAIRO_INCLUDEDIR_FILENAMES_1_p = /i $(CAIRO_ROOT)\include\cairo\r
+!endif\r
+!if "$(SHARED)" == "1"\r
+__DLLFLAG_p = /DWXUSINGDLL\r
+!endif\r
+!if "$(SHARED)" == "1"\r
+__DLLFLAG_p_1 = /d WXUSINGDLL\r
+!endif\r
+!if "$(MONOLITHIC)" == "0"\r
+__WXLIB_CORE_p = \\r
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
+!endif\r
+!if "$(MONOLITHIC)" == "0"\r
+__WXLIB_BASE_p = \\r
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
+!endif\r
+!if "$(MONOLITHIC)" == "1"\r
+__WXLIB_MONO_p = \\r
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
+!endif\r
+!if "$(USE_GUI)" == "1"\r
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
+!endif\r
+!if "$(USE_GUI)" == "1"\r
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
+!endif\r
+!if "$(USE_GUI)" == "1"\r
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
+!endif\r
+!if "$(MSLU)" == "1"\r
+__UNICOWS_LIB_p = unicows.lib\r
+!endif\r
+!if "$(USE_CAIRO)" == "1"\r
+__CAIRO_LIB_p = cairo.lib\r
+!endif\r
+!if "$(USE_CAIRO)" == "1"\r
+____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib\r
+!endif\r
+\r
+\r
+all: $(OBJS)\r
+$(OBJS):\r
+       -if not exist $(OBJS) mkdir $(OBJS)\r
+\r
+### Targets: ###\r
+\r
+all: $(OBJS)\image.exe data\r
+\r
+clean: \r
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
+       -if exist $(OBJS)\image.exe del $(OBJS)\image.exe\r
+       -if exist $(OBJS)\image.ilk del $(OBJS)\image.ilk\r
+       -if exist $(OBJS)\image.pdb del $(OBJS)\image.pdb\r
+\r
+$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_image.res
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\image.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
+       $(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) $(__CAIRO_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\r
+<<\r
+\r
+data: \r
+       if not exist $(OBJS) mkdir $(OBJS)\r
+       for %f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg cursor.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
+\r
+$(OBJS)\image_image.obj: .\image.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(IMAGE_CXXFLAGS) .\image.cpp\r
+\r
+$(OBJS)\image_canvas.obj: .\canvas.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(IMAGE_CXXFLAGS) .\canvas.cpp\r
+\r

 $(OBJS)\image_image.res: .\image.rc
 $(OBJS)\image_image.res: .\image.rc

-       rc /fo$@ /dWIN32 $(____DEBUGFLAG_3_p_1) /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib  /i.\..\..\src\regex /i.\..\..\src\expat\lib /i. $(__DLLFLAG_p_1) /d_WINDOWS $**
-
-clean: 
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res
-       -if exist $(OBJS)\image.exe del $(OBJS)\image.exe
-
-data: 
-       if not exist $(OBJS) mkdir $(OBJS)
-       for %f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse.tif horse.xpm horse.cur horse.ico horse3.ani smile.xbm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
-
-$(OBJS)\image.exe: $(OBJS)\image_image.obj $(OBJS)\image_image.res
-       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1)  /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS  @<<
-       $(OBJS)\image_image.obj $(OBJS)\image_image.res  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib
-<<
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\image.rc