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

OpenGL off by default on Mac, correct scripts to

Browse Source 
copy setup0.h


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-08-20 18:38:05 +00:00
parent 44ba8f0ea9
commit c9b3918ae4
4 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
distrib/msw/tardist
View File

@@ -64,6 +64,10 @@ rm *~ */*~ */*/*~ */*/*/*~ */*/*/*/*~
rm -f $2/wx*-${WXVER}*.tar.gz rm -f $2/wx*-${WXVER}*.tar.gz
# Copy setup files
cp $1/include/wx/os2/setup0.h $1/include/wx/os2/setup.h
cp $1/include/wx/msw/setup0.h $1/include/wx/msw/setup.h
echo Tarring... echo Tarring...
### Generic ### Generic
@@ -132,11 +136,14 @@ gzip $2/wxX11-${WXVER}.tar
# gzip $2/wxMSW-${WXVER}.tar # gzip $2/wxMSW-${WXVER}.tar
### wxMac ### wxMac
cp $1/include/wx/mac/setup0.h $1/include/wx/setup.h
cd $1 cd $1
cat $1/distrib/msw/mac.rsp $1/distrib/msw/generic.rsp $1/distrib/msw/cw.rsp $1/distrib/msw/tex2rtf.rsp $1/distrib/msw/utils.rsp $1/distrib/msw/dialoged.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/stc.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp > /tmp/wxmac_in.txt cat $1/distrib/msw/mac.rsp $1/distrib/msw/generic.rsp $1/distrib/msw/cw.rsp $1/distrib/msw/tex2rtf.rsp $1/distrib/msw/utils.rsp $1/distrib/msw/dialoged.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/stc.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp > /tmp/wxmac_in.txt
expandlines /tmp/wxmac_in.txt /tmp/wxmac.txt expandlines /tmp/wxmac_in.txt /tmp/wxmac.txt
$TAR cf $2/wxMac-${WXVER}.tar -T /tmp/wxmac.txt $TAR cf $2/wxMac-${WXVER}.tar -T /tmp/wxmac.txt
rm -f $1/include/wx/setup.h
echo Re-tarring wxMac in a subdirectory... echo Re-tarring wxMac in a subdirectory...
cd $2 cd $2
mkdir wxWindows-${WXVER} mkdir wxWindows-${WXVER}

4
distrib/msw/tarwxmac
View File

@@ -65,6 +65,8 @@ rm *~ */*~ */*/*~ */*/*/*~ */*/*/*/*~
rm -f $2/wxMac-${WXVER}*.tar.gz rm -f $2/wxMac-${WXVER}*.tar.gz
rm -f -r $2/wxMac-${WXVER} rm -f -r $2/wxMac-${WXVER}
cp $1/include/wx/mac/setup0.h $1/include/wx/setup.h
echo Tarring... echo Tarring...
### wxMac ### wxMac
@@ -72,6 +74,8 @@ cat $1/distrib/msw/mac.rsp $1/distrib/msw/generic.rsp $1/distrib/msw/cw.rsp $1/d
expandlines /tmp/wxmac_in.txt /tmp/wxmac.txt expandlines /tmp/wxmac_in.txt /tmp/wxmac.txt
$TAR cf $2/wxMac-${WXVER}.tar -T /tmp/wxmac.txt $TAR cf $2/wxMac-${WXVER}.tar -T /tmp/wxmac.txt
rm -f $1/include/wx/setup.h
echo Re-tarring in a subdirectory... echo Re-tarring in a subdirectory...
cd $2 cd $2
mkdir wxWindows-${WXVER} mkdir wxWindows-${WXVER}

10
distrib/msw/zipdistinno.bat
View File

@@ -53,6 +53,10 @@ copy %webfiles%\site\faq*.htm %src\docs\html
copy %webfiles%\site\platform.htm %src\docs\html copy %webfiles%\site\platform.htm %src\docs\html
copy %webfiles%\site\i18n.htm %src\docs\html copy %webfiles%\site\i18n.htm %src\docs\html
Rem Copy setup0.h files to setup.h
copy %src%\include\wx\os2\setup0.h %src%\include\wx\os2\setup.h
copy %src%\include\wx\msw\setup0.h %src%\include\wx\msw\setup.h
cd %src cd %src
echo Zipping... echo Zipping...
@@ -78,6 +82,9 @@ call %WXWIN%\distrib\msw\rearchive wxOS2-%version%.zip wxWindows-%version% %dest
zip32 -d %dest%\wxOS2-%version%.zip %dest%/src/gtk/descrip.mms %dest%/src/motif/descrip.mms zip32 -d %dest%\wxOS2-%version%.zip %dest%/src/gtk/descrip.mms %dest%/src/motif/descrip.mms
echo Zipping wxMac distribution echo Zipping wxMac distribution
copy %src%\include\wx\mac\setup0.h %src%\include\wx\setup.h
zip32 -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\generic.rsp zip32 -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\generic.rsp
zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\mac.rsp zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\mac.rsp
zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\cw.rsp zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\cw.rsp
@@ -91,6 +98,9 @@ zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\xml.rsp
zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\stc.rsp zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\stc.rsp
zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\contrib.rsp zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\contrib.rsp
zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\makefile.rsp zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\makefile.rsp
erase /Y %src%\include\wx\setup.h
call %WXWIN%\distrib\msw\rearchive wxMac-%version%.zip wxWindows-%version% %dest% call %WXWIN%\distrib\msw\rearchive wxMac-%version%.zip wxWindows-%version% %dest%
zip32 -d %dest%\wxMac-%version%.zip %dest%/src/gtk/descrip.mms %dest%/src/motif/descrip.mms zip32 -d %dest%\wxMac-%version%.zip %dest%/src/gtk/descrip.mms %dest%/src/motif/descrip.mms

2
include/wx/mac/setup0.h
View File

@@ -708,7 +708,7 @@
#define wxUSE_HTML 1 #define wxUSE_HTML 1
// OpenGL canvas // OpenGL canvas
#define wxUSE_GLCANVAS 1 #define wxUSE_GLCANVAS 0
// wxTreeLayout class // wxTreeLayout class
#define wxUSE_TREELAYOUT 1 #define wxUSE_TREELAYOUT 1