X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cf9b63b38a7ed96d8a824256f1fb23565c0fb52a..9b8888f92220b617bd0edc047e513e4b242a0911:/contrib/build/plot/makefile.vc diff --git a/contrib/build/plot/makefile.vc b/contrib/build/plot/makefile.vc index d417c39cbb..fefcfe4b08 100644 --- a/contrib/build/plot/makefile.vc +++ b/contrib/build/plot/makefile.vc @@ -13,7 +13,7 @@ ### Variables: ### WX_RELEASE_NODOT = 27 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2 OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) LIBDIRNAME = \ @@ -26,10 +26,10 @@ PLOTDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_9)$(__DEBUGRUNTIME) /DWIN32 \ $(____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) /I$(SETUPHDIR) /I..\..\src\plot\..\..\..\include /W4 \ - /I..\..\src\plot\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_PLOT \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_plotdll.pch" $(CPPFLAGS) $(CXXFLAGS) + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) \ + /I..\..\src\plot\..\..\..\include /W4 /I..\..\src\plot\..\..\include \ + /DWXUSINGDLL /DWXMAKINGDLL_PLOT $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_plotdll.pch" $(CPPFLAGS) $(CXXFLAGS) PLOTDLL_OBJECTS = \ $(OBJS)\plotdll_dummy.obj \ $(OBJS)\plotdll_version.res \ @@ -40,9 +40,10 @@ PLOTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_22)$(__DEBUGRUNTIME) /DWIN32 \ $(____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) /I$(SETUPHDIR) /I..\..\src\plot\..\..\..\include /W4 \ - /I..\..\src\plot\..\..\include $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_plotlib.pch" $(CPPFLAGS) $(CXXFLAGS) + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) \ + /I..\..\src\plot\..\..\..\include /W4 /I..\..\src\plot\..\..\include \ + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_plotlib.pch" $(CPPFLAGS) $(CXXFLAGS) PLOTLIB_OBJECTS = \ $(OBJS)\plotlib_dummy.obj \ $(OBJS)\plotlib_plot.obj @@ -176,6 +177,9 @@ __UNICODE_DEFINE_p_1 = /d _UNICODE !if "$(MSLU)" == "1" __MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 !endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif !if "$(MONOLITHIC)" == "1" __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib @@ -192,6 +196,9 @@ __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !if "$(MSLU)" == "1" __UNICOWS_LIB_p = unicows.lib !endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif !if "$(MONOLITHIC)" == "0" __WXLIB_CORE_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib @@ -300,6 +307,9 @@ __UNICODE_DEFINE_p = /D_UNICODE !if "$(MSLU)" == "1" __MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 !endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif all: $(OBJS) @@ -323,7 +333,7 @@ clean: !if "$(SHARED)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_vc$(VENDORTAG).dll: $(OBJS)\plotdll_dummy.obj $(PLOTDLL_OBJECTS) $(OBJS)\plotdll_version.res link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<< - $(PLOTDLL_OBJECTS) $(__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) 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 odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib + $(PLOTDLL_OBJECTS) $(__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 odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib << !endif @@ -335,16 +345,16 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD << !endif -$(OBJS)\plotdll_dummy.obj: ../../src/plot\..\..\..\src\msw\dummy.cpp +$(OBJS)\plotdll_dummy.obj: ../../src/plot\..\..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(PLOTDLL_CXXFLAGS) /Ycwx/wxprec.h $** $(OBJS)\plotdll_version.res: ../../src/plot\..\..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_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 ..\..\src\plot\..\..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_vc$(VENDORTAG) $** + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i ..\..\src\plot\..\..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_vc$(VENDORTAG) $** $(OBJS)\plotdll_plot.obj: ../../src/plot\plot.cpp $(CXX) /c /nologo /TP /Fo$@ $(PLOTDLL_CXXFLAGS) $** -$(OBJS)\plotlib_dummy.obj: ../../src/plot\..\..\..\src\msw\dummy.cpp +$(OBJS)\plotlib_dummy.obj: ../../src/plot\..\..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(PLOTLIB_CXXFLAGS) /Ycwx/wxprec.h $** $(OBJS)\plotlib_plot.obj: ../../src/plot\plot.cpp