distrib changes to enable graphics context and add gdiplus.dll

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-10-11 06:44:51 +00:00
parent b39fe95145
commit fa5a80d6a6
6 changed files with 7 additions and 2 deletions

View File

@@ -83,6 +83,7 @@ s/wxUSE_AFM_FOR_POSTSCRIPT *1/wxUSE_AFM_FOR_POSTSCRIPT 0/g
s/wxUSE_DISPLAY *0/wxUSE_DISPLAY 1/g s/wxUSE_DISPLAY *0/wxUSE_DISPLAY 1/g
s/wxUSE_DIB_FOR_BITMAP *0/wxUSE_DIB_FOR_BITMAP 1/g s/wxUSE_DIB_FOR_BITMAP *0/wxUSE_DIB_FOR_BITMAP 1/g
s/wxUSE_DEBUGREPORT *1/wxUSE_DEBUGREPORT 0/g s/wxUSE_DEBUGREPORT *1/wxUSE_DEBUGREPORT 0/g
s/wxUSE_GRAPHICS_CONTEXT *0/wxUSE_GRAPHICS_CONTEXT 1/g
EOF EOF
cat $WXDIR/include/wx/msw/setup0.h | sed -f .my.sedexpr > $WXDIR/include/wx/msw/setup.h cat $WXDIR/include/wx/msw/setup0.h | sed -f .my.sedexpr > $WXDIR/include/wx/msw/setup.h
rm .my.sedexpr rm .my.sedexpr
@@ -90,10 +91,10 @@ rm .my.sedexpr
echo "Building the wx DLLs..." echo "Building the wx DLLs..."
if [ $CHARTYPE = both -o $CHARTYPE = ansi ]; then if [ $CHARTYPE = both -o $CHARTYPE = ansi ]; then
.make hybrid .make hybrid USE_GDIPLUS=1
fi fi
if [ $CHARTYPE = both -o $CHARTYPE = unicode ]; then if [ $CHARTYPE = both -o $CHARTYPE = unicode ]; then
.make hybrid-uni .make hybrid-uni USE_GDIPLUS=1
fi fi

View File

@@ -257,6 +257,7 @@ if [ $skipconfig != yes -a $universal != yes ]; then
--enable-sound \ --enable-sound \
--enable-display \ --enable-display \
--enable-geometry \ --enable-geometry \
--enable-graphics_ctx \
$DEBUG_FLAG \ $DEBUG_FLAG \
--enable-precomp=no \ --enable-precomp=no \
--enable-optimise \ --enable-optimise \

View File

@@ -75,6 +75,7 @@ Name: pthfile; Description: "Make this install be the default wxPython"; Types:
[Files] [Files]
%(RTDLL)s %(RTDLL)s
Source: "distrib\msw\gdiplus.dll"; DestDir: "{code:GetPythonDir}"; OnlyBelowVersion: 5.1; CopyMode: alwaysskipifsameorolder; Flags: sharedfile; Components: core
Source: "%(WXDIR)s\lib\vc_dll\wx*%(WXDLLVER)s_*.dll"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core Source: "%(WXDIR)s\lib\vc_dll\wx*%(WXDLLVER)s_*.dll"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
%(MSLU)s %(MSLU)s

View File

@@ -79,6 +79,7 @@ Name: pthfile; Description: "Make this install be the default wxPython"; Types:
[Files] [Files]
%(RTDLL)s %(RTDLL)s
Source: "distrib\msw\gdiplus.dll"; DestDir: "{code:GetPythonDir}"; OnlyBelowVersion: 5.1; CopyMode: alwaysskipifsameorolder; Flags: sharedfile; Components: core
Source: "%(WXDIR)s\lib\vc_dll\wx*%(WXDLLVER)s_*.dll"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core Source: "%(WXDIR)s\lib\vc_dll\wx*%(WXDLLVER)s_*.dll"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
%(MSLU)s %(MSLU)s

Binary file not shown.

View File

@@ -210,6 +210,7 @@ cd bld
--with-opengl \ --with-opengl \
--with-gnomeprint \ --with-gnomeprint \
--enable-geometry \ --enable-geometry \
--enable-graphics_ctx \
--enable-optimise \ --enable-optimise \
--enable-sound --with-sdl \ --enable-sound --with-sdl \
%if %{mediactrl} %if %{mediactrl}