compilation fix for tooltip patch code applied by Julian and w32api

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

diff --git a/samples/taskbar/makefile.vc b/samples/taskbar/makefile.vc
index bfa2e1e76b3da1b287be6bec6f92bdecfc6ef210..6107a5adc7505920ff719e250a056bc508cd083a 100644 (file)
--- a/samples/taskbar/makefile.vc
+++ b/samples/taskbar/makefile.vc
@@ -16,12 +16,12 @@ OBJS = \
        vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 SETUPHDIR = \
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
        vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 SETUPHDIR = \
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)

-TASKBAR_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \
-       /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\taskbar.pdb $(____DEBUGRUNTIME_2_p) \
+TASKBAR_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\taskbar.pdb $(____DEBUGRUNTIME_2_p) \

        $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \
        $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \

-       /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \
-       $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9)
+       /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \
+       $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS)

 TASKBAR_OBJECTS =  \
        $(OBJS)\taskbar_tbtest.obj \
        $(OBJS)\taskbar_tbtest.res
 TASKBAR_OBJECTS =  \
        $(OBJS)\taskbar_tbtest.obj \
        $(OBJS)\taskbar_tbtest.res