Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rebake after MSW/Cairo changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@60192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2009-04-16 01:13:13 +00:00
parent 50f9c1377c
commit 15569d2614
589 changed files with 11510 additions and 4893 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
contrib/build/svg/makefile.vc
View File

@@ -26,9 +26,10 @@ SVGDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_9)$(__DEBUGRUNTIME) /DWIN32 \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) \
/I..\..\src\svg\..\..\..\include /W4 /I..\..\src\svg\..\..\include \
/DWXUSINGDLL /DWXMAKINGDLL_SVG $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
/Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_svgdll.pch" $(CPPFLAGS) $(CXXFLAGS)
/I..\..\src\svg\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \
/I..\..\src\svg\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_SVG $(__RTTIFLAG) \
$(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_svgdll.pch" \
$(CPPFLAGS) $(CXXFLAGS)
SVGDLL_OBJECTS = \
$(OBJS)\svgdll_dummy.obj \
$(OBJS)\svgdll_version.res \
@@ -40,9 +41,9 @@ SVGLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_22)$(__DEBUGRUNTIME) /DWIN32 \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) \
/I..\..\src\svg\..\..\..\include /W4 /I..\..\src\svg\..\..\include \
$(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
/Fp"$(OBJS)\wxprec_svglib.pch" $(CPPFLAGS) $(CXXFLAGS)
/I..\..\src\svg\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \
/I..\..\src\svg\..\..\include $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
/Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_svglib.pch" $(CPPFLAGS) $(CXXFLAGS)
SVGLIB_OBJECTS = \
$(OBJS)\svglib_dummy.obj \
$(OBJS)\svglib_dcsvg.obj
@@ -179,6 +180,9 @@ __MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
!if "$(USE_GDIPLUS)" == "1"
__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
!endif
!if "$(USE_CAIRO)" == "1"
____CAIRO_INCLUDEDIR_FILENAMES_1_p = /i $(CAIRO_ROOT)\include\cairo
!endif
!if "$(MONOLITHIC)" == "1"
__WXLIB_MONO_p = \
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
@@ -198,6 +202,12 @@ __UNICOWS_LIB_p = unicows.lib
!if "$(USE_GDIPLUS)" == "1"
__GDIPLUS_LIB_p = gdiplus.lib
!endif
!if "$(USE_CAIRO)" == "1"
__CAIRO_LIB_p = cairo.lib
!endif
!if "$(USE_CAIRO)" == "1"
____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_CORE_p = \
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
@@ -309,6 +319,9 @@ __MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
!if "$(USE_GDIPLUS)" == "1"
__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
!endif
!if "$(USE_CAIRO)" == "1"
____CAIRO_INCLUDEDIR_FILENAMES = /I$(CAIRO_ROOT)\include\cairo
!endif
all: $(OBJS)
@@ -331,8 +344,8 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg_vc$(VENDORTAG).dll: $(OBJS)\svgdll_dummy.obj $(SVGDLL_OBJECTS) $(OBJS)\svgdll_version.res
link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_2) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
$(SVGDLL_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)_svg.lib
link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_2) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(SVGDLL_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) $(__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 odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.lib
<<
!endif
@@ -348,7 +361,7 @@ $(OBJS)\svgdll_dummy.obj: ..\..\src\svg\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(SVGDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\svg\..\..\..\src\common\dummy.cpp
$(OBJS)\svgdll_version.res: ..\..\src\svg\..\..\..\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) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i ..\..\src\svg\..\..\..\include /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg_vc$(VENDORTAG) /i ..\..\src\svg\..\..\include /d WXUSINGDLL /d WXMAKINGDLL_SVG ..\..\src\svg\..\..\..\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) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i ..\..\src\svg\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg_vc$(VENDORTAG) /i ..\..\src\svg\..\..\include /d WXUSINGDLL /d WXMAKINGDLL_SVG ..\..\src\svg\..\..\..\src\msw\version.rc
$(OBJS)\svgdll_dcsvg.obj: ..\..\src\svg\dcsvg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(SVGDLL_CXXFLAGS) ..\..\src\svg\dcsvg.cpp