moved drawing to isvisible branch only

[wxWidgets.git] / contrib / build / plot / makefile.vc

diff --git a/contrib/build/plot/makefile.vc b/contrib/build/plot/makefile.vc
index 772bf99ac1d8cc245020ea972a4dee17f7218262..642059f7f2a708a5b9eda013ffc4258d7f3662f9 100644 (file)
--- a/contrib/build/plot/makefile.vc
+++ b/contrib/build/plot/makefile.vc
@@ -15,23 +15,23 @@
 OBJS = \
        vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 PLOTDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \
 OBJS = \
        vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 PLOTDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \

-       $(__DEBUGINFO_2) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\src\plot\..\..\..\include /I$(SETUPHDIR) \
+       $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       /I..\..\src\plot\..\..\..\include /I$(SETUPHDIR) /W4 \

        /I..\..\src\plot\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_PLOT $(CXXFLAGS) \
        /I..\..\src\plot\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_PLOT $(CXXFLAGS) \

-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_plotdll.pch"
+       /GR /GX /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_plotdll.pch"

 PLOTDLL_OBJECTS =  \
        $(OBJS)\plotdll_dummy.obj \
        $(OBJS)\plotdll_plot.obj
 PLOTDLL_OBJECTS =  \
        $(OBJS)\plotdll_dummy.obj \
        $(OBJS)\plotdll_plot.obj

-PLOTLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_12) /DWIN32 \
-       $(__DEBUGINFO_2) \
+PLOTLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_13) /DWIN32 \
+       $(__DEBUGINFO) \

        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.pdb \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.pdb \

-       $(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\src\plot\..\..\..\include /I$(SETUPHDIR) \
-       /I..\..\src\plot\..\..\include $(CXXFLAGS) /Yu"wx/wxprec.h" \
+       $(____DEBUGRUNTIME_12_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       /I..\..\src\plot\..\..\..\include /I$(SETUPHDIR) /W4 \
+       /I..\..\src\plot\..\..\include $(CXXFLAGS) /GR /GX /Yu"wx/wxprec.h" \

        /Fp"$(OBJS)\wxprec_plotlib.pch"
 PLOTLIB_OBJECTS =  \
        $(OBJS)\plotlib_dummy.obj \
        /Fp"$(OBJS)\wxprec_plotlib.pch"
 PLOTLIB_OBJECTS =  \
        $(OBJS)\plotlib_dummy.obj \


@@ -75,7 +75,7 @@ WXUNICODEFLAG = u
 WXUNIVNAME = univ
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 WXUNIVNAME = univ
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"

-__DEBUGINFO = d
+__DEBUGINFO = /Zi

 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO = 
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO = 


@@ -84,7 +84,7 @@ __DEBUGINFO =
 __DEBUGINFO = 
 !endif
 !if "$(DEBUG_INFO)" == "1"
 __DEBUGINFO = 
 !endif
 !if "$(DEBUG_INFO)" == "1"

-__DEBUGINFO = d
+__DEBUGINFO = /Zi

 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO_1 = /DEBUG
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO_1 = /DEBUG


@@ -99,7 +99,7 @@ __DEBUGINFO_1 =
 __DEBUGINFO_1 = /DEBUG
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO_1 = /DEBUG
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"

-__DEBUGINFO_2 = /Zi
+__DEBUGINFO_2 = d

 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO_2 = 
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO_2 = 


@@ -108,16 +108,16 @@ __DEBUGINFO_2 =
 __DEBUGINFO_2 = 
 !endif
 !if "$(DEBUG_INFO)" == "1"
 __DEBUGINFO_2 = 
 !endif
 !if "$(DEBUG_INFO)" == "1"

-__DEBUGINFO_2 = /Zi
+__DEBUGINFO_2 = d

 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"

-__DEBUGRUNTIME_12 = 
+__DEBUGRUNTIME_13 = 

 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"

-__DEBUGRUNTIME_12 = d
+__DEBUGRUNTIME_13 = d

 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "default"
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "default"

-__DEBUGRUNTIME_12 = $(__DEBUGINFO)
+__DEBUGRUNTIME_13 = $(__DEBUGINFO_2)

 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
 __DEBUGRUNTIME_3 = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
 __DEBUGRUNTIME_3 = 


@@ -126,7 +126,7 @@ __DEBUGRUNTIME_3 =
 __DEBUGRUNTIME_3 = d
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "default"
 __DEBUGRUNTIME_3 = d
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "default"

-__DEBUGRUNTIME_3 = $(__DEBUGINFO)
+__DEBUGRUNTIME_3 = $(__DEBUGINFO_2)

 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
 __DEBUG_DEFINE_p = /D__WXDEBUG__
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
 __DEBUG_DEFINE_p = /D__WXDEBUG__


@@ -143,6 +143,12 @@ __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
 !endif

+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif

 !if "$(BUILD)" == "debug"
 __OPTIMIZEFLAG = /Od
 !endif
 !if "$(BUILD)" == "debug"
 __OPTIMIZEFLAG = /Od
 !endif


@@ -156,7 +162,7 @@ __RUNTIME_LIBS = D
 __RUNTIME_LIBS = T
 !endif
 !if "$(UNICODE)" == "1"
 __RUNTIME_LIBS = T
 !endif
 !if "$(UNICODE)" == "1"

-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = /D_UNICODE

 !endif
 !if "$(MSLU)" == "1"
 __UNICOWS_LIB_p = unicows.lib
 !endif
 !if "$(MSLU)" == "1"
 __UNICOWS_LIB_p = unicows.lib


@@ -188,13 +194,13 @@ ____DEBUGINFO =
 ____DEBUGINFO = /D_DEBUG
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
 ____DEBUGINFO = /D_DEBUG
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"

-____DEBUGRUNTIME_11_p = 
+____DEBUGRUNTIME_12_p = 

 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"

-____DEBUGRUNTIME_11_p = /D_DEBUG
+____DEBUGRUNTIME_12_p = /D_DEBUG

 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "default"
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "default"

-____DEBUGRUNTIME_11_p = $(____DEBUGINFO)
+____DEBUGRUNTIME_12_p = $(____DEBUGINFO)

 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
 ____DEBUGRUNTIME_2_p = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
 ____DEBUGRUNTIME_2_p = 


@@ -207,7 +213,7 @@ ____DEBUGRUNTIME_2_p = $(____DEBUGINFO)
 !endif
 !if "$(SHARED)" == "1"
 __plotdll___depname = \
 !endif
 !if "$(SHARED)" == "1"
 __plotdll___depname = \

-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_vc$(VENDORTAG).dll
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_vc$(VENDORTAG).dll

 !endif
 !if "$(SHARED)" == "0"
 __plotlib___depname = \
 !endif
 !if "$(SHARED)" == "0"
 __plotlib___depname = \


@@ -238,14 +244,16 @@ $(OBJS)\plotlib_plot.obj: ../../src/plot\plot.cpp
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res

-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_vc$(VENDORTAG).pdb

        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib
 
 !if "$(SHARED)" == "1"
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib
 
 !if "$(SHARED)" == "1"

-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_vc$(VENDORTAG).dll: $(OBJS)\plotdll_dummy.obj  $(PLOTDLL_OBJECTS)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_vc$(VENDORTAG).dll: $(OBJS)\plotdll_dummy.obj  $(PLOTDLL_OBJECTS)

        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) @<<
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) @<<

-       $(PLOTDLL_OBJECTS)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib
+       $(PLOTDLL_OBJECTS)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) 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 oleacc.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib

 <<
 !endif
 
 <<
 !endif