OpenGL off by default on Mac, correct scripts to

copy setup0.h

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/tardist b/distrib/msw/tardist
index de41459644d02df9d53bc46fa1649635072c442f..a94c893048cf5ff1cf83c826580740a98f08e344 100644 (file)
--- a/distrib/msw/tardist
+++ b/distrib/msw/tardist
@@ -64,6 +64,10 @@ rm *~ */*~ */*/*~ */*/*/*~ */*/*/*/*~
 
 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...
 
 ### Generic
@@ -132,11 +136,14 @@ gzip $2/wxX11-${WXVER}.tar
 # gzip $2/wxMSW-${WXVER}.tar
 
 ### wxMac
+cp $1/include/wx/mac/setup0.h $1/include/wx/setup.h
 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
 expandlines /tmp/wxmac_in.txt /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...
 cd $2
 mkdir wxWindows-${WXVER}

diff --git a/distrib/msw/tarwxmac b/distrib/msw/tarwxmac
index 60a71dd2ecb0a91de12a425591d952aae72148ac..2a94b72db5a0c70f40c1453ee1e229562e041533 100755 (executable)
--- a/distrib/msw/tarwxmac
+++ b/distrib/msw/tarwxmac
@@ -65,6 +65,8 @@ rm *~ */*~ */*/*~ */*/*/*~ */*/*/*/*~
 rm -f $2/wxMac-${WXVER}*.tar.gz
 rm -f -r $2/wxMac-${WXVER}
 
+cp $1/include/wx/mac/setup0.h $1/include/wx/setup.h
+
 echo Tarring...
 
 ### 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
 $TAR cf $2/wxMac-${WXVER}.tar -T /tmp/wxmac.txt
 
+rm -f $1/include/wx/setup.h
+
 echo Re-tarring in a subdirectory...
 cd $2
 mkdir wxWindows-${WXVER}

diff --git a/distrib/msw/zipdistinno.bat b/distrib/msw/zipdistinno.bat
index 19fe49fc0782746890a411096aca8fde55b8f92d..8e7fc0a2653510d6122b13364e913a2d4ba91bc4 100755 (executable)
--- a/distrib/msw/zipdistinno.bat
+++ b/distrib/msw/zipdistinno.bat
@@ -53,6 +53,10 @@ copy %webfiles%\site\faq*.htm %src\docs\html
 copy %webfiles%\site\platform.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
 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
 
 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 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\mac.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\contrib.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%
 
 zip32 -d %dest%\wxMac-%version%.zip %dest%/src/gtk/descrip.mms %dest%/src/motif/descrip.mms

diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h
index 4dabde310e2b234d248e515fa21e6317fd5c4b8b..5942f3926647244a54b8caac286da28ed5f617c0 100644 (file)
--- a/include/wx/mac/setup0.h
+++ b/include/wx/mac/setup0.h
@@ -708,7 +708,7 @@
 #define wxUSE_HTML          1
 
 // OpenGL canvas
-#define wxUSE_GLCANVAS       1
+#define wxUSE_GLCANVAS       0
 
 // wxTreeLayout class
 #define wxUSE_TREELAYOUT     1