enable OpenGL library build by default under Windows too

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

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 17a9e686c94c199bd448ab6593de56c51df7b936..e462f043828326dc909aa0ba7d0810c50af4be1e 100644 (file)
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -239,7 +239,7 @@ Acts according to BUILD by default.
 
     <option name="USE_OPENGL">
         <values>0,1</values>
 
     <option name="USE_OPENGL">
         <values>0,1</values>

-        <default-value>0</default-value>
+        <default-value>1</default-value>

         <description>
             Build OpenGL canvas library (USE_GUI must be 1)?
         </description>
         <description>
             Build OpenGL canvas library (USE_GUI must be 1)?
         </description>

diff --git a/build/bakefiles/opengl.bkl b/build/bakefiles/opengl.bkl
index c22a2123f14219835320e2388289dc73c840eddb..85673828a88b1909b9f4e088ca707b81b9b69b50 100644 (file)
--- a/build/bakefiles/opengl.bkl
+++ b/build/bakefiles/opengl.bkl
@@ -14,27 +14,10 @@
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('base')))</if>
     </set>
 
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('base')))</if>
     </set>
 

-    <!--
-        When using makefile-based formats (so exclude all project files as well
-        as autoconf) we want to allow people to override the value of
-        wxUSE_GLCANVAS in setup.h by specifying USE_OPENGL=1 on make command
-        line so we predefine it as 1 on the compiler command line in this case
-        and only define it in setup.h if it han't been defined yet.
-     -->
-    <if cond="FORMAT in ['autoconf','msvc','msvc6prj','msvs2003prj','msvs2005prj','msvs2008prj']">
-        <set var="OPENGL_DEFINE"/>
-    </if>
-    <if cond="FORMAT not in ['autoconf','msvc','msvc6prj','msvs2003prj','msvs2005prj','msvs2008prj']">
-        <set var="OPENGL_DEFINE">
-            <if cond="USE_OPENGL=='1'">wxUSE_GLCANVAS=1</if>
-        </set>
-    </if>
-

     <dll id="gldll" template="wx_dll"
          cond="SHARED=='1' and USE_GUI=='1' and USE_OPENGL=='1'">
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_GL</define>
     <dll id="gldll" template="wx_dll"
          cond="SHARED=='1' and USE_GUI=='1' and USE_OPENGL=='1'">
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_GL</define>

-        <define>$(OPENGL_DEFINE)</define>

         <sources>$(OPENGL_SRC)</sources>
         <msvc-headers>$(OPENGL_HDR)</msvc-headers>
 
         <sources>$(OPENGL_SRC)</sources>
         <msvc-headers>$(OPENGL_HDR)</msvc-headers>
 


@@ -52,7 +35,6 @@
 
     <lib id="gllib" template="wx_lib"
          cond="SHARED=='0' and USE_GUI=='1' and USE_OPENGL=='1'">
 
     <lib id="gllib" template="wx_lib"
          cond="SHARED=='0' and USE_GUI=='1' and USE_OPENGL=='1'">

-        <define>$(OPENGL_DEFINE)</define>

         <sources>$(OPENGL_SRC)</sources>
         <msvc-headers>$(OPENGL_HDR)</msvc-headers>
     </lib>
         <sources>$(OPENGL_SRC)</sources>
         <msvc-headers>$(OPENGL_HDR)</msvc-headers>
     </lib>

diff --git a/build/msw/config.bcc b/build/msw/config.bcc
index a5b79607546d49b4d34b5aea737849d72c230606..10034928813ac4b172ae7730de3e48bf1e26d039 100644 (file)
--- a/build/msw/config.bcc
+++ b/build/msw/config.bcc
@@ -130,7 +130,7 @@ USE_STC = 1
 
 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
 !ifndef USE_OPENGL
 
 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
 !ifndef USE_OPENGL

-USE_OPENGL = 0
+USE_OPENGL = 1

 !endif
 
 # Build quality assurance classes library (USE_GUI must be 1)? [0,1]
 !endif
 
 # Build quality assurance classes library (USE_GUI must be 1)? [0,1]

diff --git a/build/msw/config.gcc b/build/msw/config.gcc
index 08935caef67ca3c304180f567e626052248beaf6..b625980fb4591cbf70f8fb31bd618d76982fd50c 100644 (file)
--- a/build/msw/config.gcc
+++ b/build/msw/config.gcc
@@ -89,7 +89,7 @@ USE_RICHTEXT ?= 1
 USE_STC ?= 1
 
 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
 USE_STC ?= 1
 
 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]

-USE_OPENGL ?= 0
+USE_OPENGL ?= 1

 
 # Build quality assurance classes library (USE_GUI must be 1)? [0,1]
 USE_QA ?= 0
 
 # Build quality assurance classes library (USE_GUI must be 1)? [0,1]
 USE_QA ?= 0

diff --git a/build/msw/config.vc b/build/msw/config.vc
index a71f72dffb8c24a9811d57807568f8e06fc28a3f..5fe8154fdd802afb9944a1c62b6ad04e17902397 100644 (file)
--- a/build/msw/config.vc
+++ b/build/msw/config.vc
@@ -96,7 +96,7 @@ USE_RICHTEXT = 1
 USE_STC = 1
 
 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
 USE_STC = 1
 
 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]

-USE_OPENGL = 0
+USE_OPENGL = 1

 
 # Build quality assurance classes library (USE_GUI must be 1)? [0,1]
 USE_QA = 1
 
 # Build quality assurance classes library (USE_GUI must be 1)? [0,1]
 USE_QA = 1

diff --git a/build/msw/config.wat b/build/msw/config.wat
index efbb110be38cdd32354524dccd91f52b5e6bd1d8..7d18f639e695cf357ae4c1b35e17de0495932113 100644 (file)
--- a/build/msw/config.wat
+++ b/build/msw/config.wat
@@ -87,7 +87,7 @@ USE_RICHTEXT = 1
 USE_STC = 1
 
 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
 USE_STC = 1
 
 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]

-USE_OPENGL = 0
+USE_OPENGL = 1

 
 # Build quality assurance classes library (USE_GUI must be 1)? [0,1]
 USE_QA = 0
 
 # Build quality assurance classes library (USE_GUI must be 1)? [0,1]
 USE_QA = 0

diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 888d6e14bdc4d3377a55b65f0795af3b98b5a9d6..a71f80d0c63578437593fe8b41fff2ec5a26db8f 100644 (file)
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1337,8 +1337,8 @@ GLDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
        $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
        $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \
        -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \
        $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
        $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \
        -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \

-       -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_GL \
-       $(__OPENGL_DEFINE_p) -Hu -H=$(OBJS)\wxprec_gldll.csm $(CPPFLAGS) $(CXXFLAGS)
+       -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_GL -Hu \
+       -H=$(OBJS)\wxprec_gldll.csm $(CPPFLAGS) $(CXXFLAGS)

 GLDLL_OBJECTS =  \
        $(OBJS)\gldll_dummy.obj \
        $(OBJS)\gldll_glcmn.obj \
 GLDLL_OBJECTS =  \
        $(OBJS)\gldll_dummy.obj \
        $(OBJS)\gldll_glcmn.obj \


@@ -1349,8 +1349,8 @@ GLLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
        $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
        $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \
        -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \
        $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
        $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \
        -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \

-       -I..\..\src\regex -I..\..\src\expat\lib $(__OPENGL_DEFINE_p) -Hu \
-       -H=$(OBJS)\wxprec_gllib.csm $(CPPFLAGS) $(CXXFLAGS)
+       -I..\..\src\regex -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_gllib.csm \
+       $(CPPFLAGS) $(CXXFLAGS)

 GLLIB_OBJECTS =  \
        $(OBJS)\gllib_dummy.obj \
        $(OBJS)\gllib_glcmn.obj \
 GLLIB_OBJECTS =  \
        $(OBJS)\gllib_dummy.obj \
        $(OBJS)\gllib_glcmn.obj \


@@ -4072,9 +4072,6 @@ ____wxstc_namelib_DEP = $(__stclib___depname)
 __gldll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).dll
 !endif
 __gldll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).dll
 !endif

-!if "$(USE_OPENGL)" == "1"
-__OPENGL_DEFINE_p_1 = -dwxUSE_GLCANVAS=1
-!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIBGLDEP_CORE_p = \
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
 !if "$(MONOLITHIC)" == "0"
 __WXLIBGLDEP_CORE_p = \
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib


@@ -4224,9 +4221,6 @@ __MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
 !if "$(USE_GDIPLUS)" == "1"
 __GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
 !endif
 !if "$(USE_GDIPLUS)" == "1"
 __GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
 !endif

-!if "$(USE_OPENGL)" == "1"
-__OPENGL_DEFINE_p = -DwxUSE_GLCANVAS=1
-!endif

 !if "$(WXUNIV)" == "0"
 __SETUP_H_SUBDIR_FILENAMES = msw
 !endif
 !if "$(WXUNIV)" == "0"
 __SETUP_H_SUBDIR_FILENAMES = msw
 !endif


@@ -14366,7 +14360,7 @@ $(OBJS)\gldll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) -q -c -P -o$@ $(GLDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 
 $(OBJS)\gldll_version.res: ..\..\src\msw\version.rc
        $(CXX) -q -c -P -o$@ $(GLDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 
 $(OBJS)\gldll_version.res: ..\..\src\msw\version.rc

-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_GL $(__OPENGL_DEFINE_p_1) ..\..\src\msw\version.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_GL ..\..\src\msw\version.rc

 
 $(OBJS)\gldll_glcmn.obj: ..\..\src\common\glcmn.cpp
        $(CXX) -q -c -P -o$@ $(GLDLL_CXXFLAGS) ..\..\src\common\glcmn.cpp
 
 $(OBJS)\gldll_glcmn.obj: ..\..\src\common\glcmn.cpp
        $(CXX) -q -c -P -o$@ $(GLDLL_CXXFLAGS) ..\..\src\common\glcmn.cpp

diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 840796909897609f84f70eac959e48b42f854a05..9f5fafa4fc07be6989745a27db4ce44918022d0e 100644 (file)
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1346,9 +1346,8 @@ GLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
        $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
        -I$(SETUPHDIR) -I..\..\include -W -Wall -DWXBUILDING -I..\..\src\tiff\libtiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
        $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
        -I$(SETUPHDIR) -I..\..\include -W -Wall -DWXBUILDING -I..\..\src\tiff\libtiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \

-       -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_GL $(__OPENGL_DEFINE_p) \
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
-       $(CXXFLAGS)
+       -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_GL $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)

 GLDLL_OBJECTS =  \
        $(OBJS)\gldll_dummy.o \
        $(OBJS)\gldll_version_rc.o \
 GLDLL_OBJECTS =  \
        $(OBJS)\gldll_dummy.o \
        $(OBJS)\gldll_version_rc.o \


@@ -1360,8 +1359,8 @@ GLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
        $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
        -I$(SETUPHDIR) -I..\..\include -W -Wall -DWXBUILDING -I..\..\src\tiff\libtiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
        $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
        -I$(SETUPHDIR) -I..\..\include -W -Wall -DWXBUILDING -I..\..\src\tiff\libtiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \

-       -I..\..\src\expat\lib $(__OPENGL_DEFINE_p) $(__RTTIFLAG) \
-       $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+       -I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)

 GLLIB_OBJECTS =  \
        $(OBJS)\gllib_dummy.o \
        $(OBJS)\gllib_glcmn.o \
 GLLIB_OBJECTS =  \
        $(OBJS)\gllib_dummy.o \
        $(OBJS)\gllib_glcmn.o \


@@ -4216,9 +4215,6 @@ __gldll___depname = \
 endif
 endif
 endif
 endif
 endif
 endif

-ifeq ($(USE_OPENGL),1)
-__OPENGL_DEFINE_p_1 = --define wxUSE_GLCANVAS=1
-endif

 ifeq ($(MONOLITHIC),0)
 __WXLIBGLDEP_CORE_p = \
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
 ifeq ($(MONOLITHIC),0)
 __WXLIBGLDEP_CORE_p = \
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core


@@ -4386,9 +4382,6 @@ endif
 ifeq ($(USE_GDIPLUS),1)
 __GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
 endif
 ifeq ($(USE_GDIPLUS),1)
 __GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
 endif

-ifeq ($(USE_OPENGL),1)
-__OPENGL_DEFINE_p = -DwxUSE_GLCANVAS=1
-endif

 ifeq ($(WXUNIV),0)
 __SETUP_H_SUBDIR_FILENAMES = msw
 endif
 ifeq ($(WXUNIV),0)
 __SETUP_H_SUBDIR_FILENAMES = msw
 endif


@@ -14967,7 +14960,7 @@ $(OBJS)\gldll_dummy.o: ../../src/common/dummy.cpp
        $(CXX) -c -o $@ $(GLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\gldll_version_rc.o: ../../src/msw/version.rc
        $(CXX) -c -o $@ $(GLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\gldll_version_rc.o: ../../src/msw/version.rc

-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) --include-dir $(SETUPHDIR) --include-dir ../../include --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG)  --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_GL $(__OPENGL_DEFINE_p_1)
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) --include-dir $(SETUPHDIR) --include-dir ../../include --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG)  --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_GL

 
 $(OBJS)\gldll_glcmn.o: ../../src/common/glcmn.cpp
        $(CXX) -c -o $@ $(GLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\gldll_glcmn.o: ../../src/common/glcmn.cpp
        $(CXX) -c -o $@ $(GLDLL_CXXFLAGS) $(CPPDEPS) $<

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 491da92e846a77ead02d176652b5eeb2b8ae76ee..ea99b8f4ad4d57370ed946fa6e2ede73b4d2dea5 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -14706,7 +14706,7 @@ $(OBJS)\gldll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\gldll_version.res: ..\..\src\msw\version.rc
        $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
 $(OBJS)\gldll_version.res: ..\..\src\msw\version.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_64)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_GL  ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_64)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_GL ..\..\src\msw\version.rc

 
 $(OBJS)\gldll_glcmn.obj: ..\..\src\common\glcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) ..\..\src\common\glcmn.cpp
 
 $(OBJS)\gldll_glcmn.obj: ..\..\src\common\glcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) ..\..\src\common\glcmn.cpp

diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index 79f7826540b744ae040cb0d0109bd9c5c1a0f023..3f859e923808982b0c71b50ed642d8b212743bf4 100644 (file)
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -3129,10 +3129,6 @@ __GFXCTX_DEFINE_p =
 !ifeq USE_GDIPLUS 1
 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
 !endif
 !ifeq USE_GDIPLUS 1
 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
 !endif

-__OPENGL_DEFINE_p =
-!ifeq USE_OPENGL 1
-__OPENGL_DEFINE_p = -dwxUSE_GLCANVAS=1
-!endif

 __SETUP_H_SUBDIR_FILENAMES =
 !ifeq WXUNIV 0
 __SETUP_H_SUBDIR_FILENAMES = msw
 __SETUP_H_SUBDIR_FILENAMES =
 !ifeq WXUNIV 0
 __SETUP_H_SUBDIR_FILENAMES = msw


@@ -4464,7 +4460,7 @@ GLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
        -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
        $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
        -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &

-       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_GL $(__OPENGL_DEFINE_p) &
+       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_GL &

        /fh=$(OBJS)\wxprec_gldll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
        $(CXXFLAGS)
 GLDLL_OBJECTS =  &
        /fh=$(OBJS)\wxprec_gldll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
        $(CXXFLAGS)
 GLDLL_OBJECTS =  &


@@ -4477,8 +4473,8 @@ GLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
        -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
        $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
        -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &

-       -i=..\..\src\expat\lib $(__OPENGL_DEFINE_p) /fh=$(OBJS)\wxprec_gllib.pch &
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+       -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_gllib.pch $(__RTTIFLAG) &
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)

 GLLIB_OBJECTS =  &
        $(OBJS)\gllib_dummy.obj &
        $(OBJS)\gllib_glcmn.obj &
 GLLIB_OBJECTS =  &
        $(OBJS)\gllib_dummy.obj &
        $(OBJS)\gllib_glcmn.obj &


@@ -15213,7 +15209,7 @@ $(OBJS)\gldll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(GLDLL_CXXFLAGS) $<
 
 $(OBJS)\gldll_version.res :  .AUTODEPEND ..\..\src\msw\version.rc
        $(CXX) -bt=nt -zq -fo=$^@ $(GLDLL_CXXFLAGS) $<
 
 $(OBJS)\gldll_version.res :  .AUTODEPEND ..\..\src\msw\version.rc

-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_GL $(__OPENGL_DEFINE_p) $<
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_GL $<

 
 $(OBJS)\gldll_glcmn.obj :  .AUTODEPEND ..\..\src\common\glcmn.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(GLDLL_CXXFLAGS) $<
 
 $(OBJS)\gldll_glcmn.obj :  .AUTODEPEND ..\..\src\common\glcmn.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(GLDLL_CXXFLAGS) $<

diff --git a/docs/changes.txt b/docs/changes.txt
index 345e0c1e1bbc503f6641f5ce941593ab31dbb9e3..a8771c89d9c779d3beb8bd6a49acc6ab9ba5140e 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -339,6 +339,7 @@ All (GUI):
 - wxGrid: add possibility to prevent resizing of individual rows/columns.
 - wxHTML: add support for table borders width (Laurent Humbertclaude).
 - Added wxMouseEventsManager.
 - wxGrid: add possibility to prevent resizing of individual rows/columns.
 - wxHTML: add support for table borders width (Laurent Humbertclaude).
 - Added wxMouseEventsManager.

+- Building OpenGL library is now enabled by default.

 
 MSW:
 
 
 MSW:
 

diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h
index d6dc6c23c2efd33c65706260e6e7f45e4e851c3c..29250acff5eef694c13dfea2767b19db6da7009f 100644 (file)
--- a/include/wx/motif/setup0.h
+++ b/include/wx/motif/setup0.h
@@ -1074,13 +1074,12 @@
 // list of libraries used to link your application (although this is done
 // implicitly for Microsoft Visual C++ users).
 //
 // list of libraries used to link your application (although this is done
 // implicitly for Microsoft Visual C++ users).
 //

-// Default is 0 unless USE_OPENGL was defined on make command line in which
-// case this is predefined as 1.
+// Default is 1 unless the compiler is known to ship without the necessary
+// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).

 //
 //

-// Recommended setting: 1 if you intend to use OpenGL, 0 otherwise
-#ifndef wxUSE_GLCANVAS
-    #define wxUSE_GLCANVAS       0
-#endif
+// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
+// otherwise.
+#define wxUSE_GLCANVAS       1

 
 // wxRichTextCtrl allows editing of styled text.
 //
 
 // wxRichTextCtrl allows editing of styled text.
 //

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index ced695d6fa4266b0f1f468182689c7bf174de3e6..20da7967d148183a20795024b833f2f9c0c2e260 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -1074,13 +1074,12 @@
 // list of libraries used to link your application (although this is done
 // implicitly for Microsoft Visual C++ users).
 //
 // list of libraries used to link your application (although this is done
 // implicitly for Microsoft Visual C++ users).
 //

-// Default is 0 unless USE_OPENGL was defined on make command line in which
-// case this is predefined as 1.
+// Default is 1 unless the compiler is known to ship without the necessary
+// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).

 //
 //

-// Recommended setting: 1 if you intend to use OpenGL, 0 otherwise
-#ifndef wxUSE_GLCANVAS
-    #define wxUSE_GLCANVAS       0
-#endif
+// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
+// otherwise.
+#define wxUSE_GLCANVAS       1

 
 // wxRichTextCtrl allows editing of styled text.
 //
 
 // wxRichTextCtrl allows editing of styled text.
 //

diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index 9cf796b9fb8ad0deba12058e6cef1c418f03db87..e1ed0d8b1233d26f8015ed34bbaacfbe90cfea79 100644 (file)
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -1074,13 +1074,12 @@
 // list of libraries used to link your application (although this is done
 // implicitly for Microsoft Visual C++ users).
 //
 // list of libraries used to link your application (although this is done
 // implicitly for Microsoft Visual C++ users).
 //

-// Default is 0 unless USE_OPENGL was defined on make command line in which
-// case this is predefined as 1.
+// Default is 1 unless the compiler is known to ship without the necessary
+// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).

 //
 //

-// Recommended setting: 1 if you intend to use OpenGL, 0 otherwise
-#ifndef wxUSE_GLCANVAS
-    #define wxUSE_GLCANVAS       0
-#endif
+// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
+// otherwise.
+#define wxUSE_GLCANVAS       1

 
 // wxRichTextCtrl allows editing of styled text.
 //
 
 // wxRichTextCtrl allows editing of styled text.
 //

diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index fdaea990ea91613880842bfe8ac1700134221958..272a0d2e1feef6cb752a01ceed8576cac28ae0b0 100644 (file)
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -1074,13 +1074,12 @@
 // list of libraries used to link your application (although this is done
 // implicitly for Microsoft Visual C++ users).
 //
 // list of libraries used to link your application (although this is done
 // implicitly for Microsoft Visual C++ users).
 //

-// Default is 0 unless USE_OPENGL was defined on make command line in which
-// case this is predefined as 1.
+// Default is 1 unless the compiler is known to ship without the necessary
+// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).

 //
 //

-// Recommended setting: 1 if you intend to use OpenGL, 0 otherwise
-#ifndef wxUSE_GLCANVAS
-    #define wxUSE_GLCANVAS       0
-#endif
+// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
+// otherwise.
+#define wxUSE_GLCANVAS       1

 
 // wxRichTextCtrl allows editing of styled text.
 //
 
 // wxRichTextCtrl allows editing of styled text.
 //

diff --git a/include/wx/osx/setup0.h b/include/wx/osx/setup0.h
index f3f9ea4b575747c148bb3f1607cd66c4656f5564..80a256cf95171c9e3cf3948b52cddf2e1af429a9 100644 (file)
--- a/include/wx/osx/setup0.h
+++ b/include/wx/osx/setup0.h
@@ -1075,13 +1075,12 @@
 // list of libraries used to link your application (although this is done
 // implicitly for Microsoft Visual C++ users).
 //
 // list of libraries used to link your application (although this is done
 // implicitly for Microsoft Visual C++ users).
 //

-// Default is 0 unless USE_OPENGL was defined on make command line in which
-// case this is predefined as 1.
+// Default is 1 unless the compiler is known to ship without the necessary
+// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).

 //
 //

-// Recommended setting: 1 if you intend to use OpenGL, 0 otherwise
-#ifndef wxUSE_GLCANVAS
-    #define wxUSE_GLCANVAS       0
-#endif
+// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
+// otherwise.
+#define wxUSE_GLCANVAS       1

 
 // wxRichTextCtrl allows editing of styled text.
 //
 
 // wxRichTextCtrl allows editing of styled text.
 //

diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h
index 5bc5ae9d76a26f7e84c7278f135073e39df8b120..bf8612e24b2db8fde742c3b2d006849c783947a2 100644 (file)
--- a/include/wx/palmos/setup0.h
+++ b/include/wx/palmos/setup0.h
@@ -1074,13 +1074,12 @@
 // list of libraries used to link your application (although this is done
 // implicitly for Microsoft Visual C++ users).
 //
 // list of libraries used to link your application (although this is done
 // implicitly for Microsoft Visual C++ users).
 //

-// Default is 0 unless USE_OPENGL was defined on make command line in which
-// case this is predefined as 1.
+// Default is 1 unless the compiler is known to ship without the necessary
+// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).

 //
 //

-// Recommended setting: 1 if you intend to use OpenGL, 0 otherwise
-#ifndef wxUSE_GLCANVAS
-    #define wxUSE_GLCANVAS       0
-#endif
+// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
+// otherwise.
+#define wxUSE_GLCANVAS       1

 
 // wxRichTextCtrl allows editing of styled text.
 //
 
 // wxRichTextCtrl allows editing of styled text.
 //

diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
index a437e1c869c6327ec66f0853fba0acf894216572..d7fdc2395421d6dba177e6de7a712b793d6a3a78 100644 (file)
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -1070,13 +1070,12 @@
 // list of libraries used to link your application (although this is done
 // implicitly for Microsoft Visual C++ users).
 //
 // list of libraries used to link your application (although this is done
 // implicitly for Microsoft Visual C++ users).
 //

-// Default is 0 unless USE_OPENGL was defined on make command line in which
-// case this is predefined as 1.
+// Default is 1 unless the compiler is known to ship without the necessary
+// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).

 //
 //

-// Recommended setting: 1 if you intend to use OpenGL, 0 otherwise
-#ifndef wxUSE_GLCANVAS
-    #define wxUSE_GLCANVAS       0
-#endif
+// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
+// otherwise.
+#define wxUSE_GLCANVAS       1

 
 // wxRichTextCtrl allows editing of styled text.
 //
 
 // wxRichTextCtrl allows editing of styled text.
 //

diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index a9166033cc1fc62d8893ff9424afb097bf75ba56..c7472d215eb6bfd1d9aa8dcccf61b2a586b8f4fc 100644 (file)
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -1073,13 +1073,12 @@
 // list of libraries used to link your application (although this is done
 // implicitly for Microsoft Visual C++ users).
 //
 // list of libraries used to link your application (although this is done
 // implicitly for Microsoft Visual C++ users).
 //

-// Default is 0 unless USE_OPENGL was defined on make command line in which
-// case this is predefined as 1.
+// Default is 1 unless the compiler is known to ship without the necessary
+// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).

 //
 //

-// Recommended setting: 1 if you intend to use OpenGL, 0 otherwise
-#ifndef wxUSE_GLCANVAS
-    #define wxUSE_GLCANVAS       0
-#endif
+// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
+// otherwise.
+#define wxUSE_GLCANVAS       1

 
 // wxRichTextCtrl allows editing of styled text.
 //
 
 // wxRichTextCtrl allows editing of styled text.
 //