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
This commit is contained in:
Vadim Zeitlin
parent
4fd66e4c56
commit
671683c445
@ -239,7 +239,7 @@ Acts according to BUILD by default.
|
||||
|
||||
<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>
|
||||
|
||||
@ -14,27 +14,10 @@
|
||||
<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>
|
||||
<define>$(OPENGL_DEFINE)</define>
|
||||
<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'">
|
||||
<define>$(OPENGL_DEFINE)</define>
|
||||
<sources>$(OPENGL_SRC)</sources>
|
||||
<msvc-headers>$(OPENGL_HDR)</msvc-headers>
|
||||
</lib>
|
||||
|
||||
@ -130,7 +130,7 @@ USE_STC = 1
|
||||
|
||||
# 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]
|
||||
|
||||
@ -89,7 +89,7 @@ USE_RICHTEXT ?= 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
|
||||
|
||||
@ -96,7 +96,7 @@ USE_RICHTEXT = 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
|
||||
|
||||
@ -87,7 +87,7 @@ USE_RICHTEXT = 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
|
||||
|
||||
@ -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 \
|
||||
-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 \
|
||||
@ -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 \
|
||||
-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 \
|
||||
@ -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
|
||||
!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
|
||||
@ -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_OPENGL)" == "1"
|
||||
__OPENGL_DEFINE_p = -DwxUSE_GLCANVAS=1
|
||||
!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
|
||||
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
|
||||
|
||||
@ -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 \
|
||||
-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 \
|
||||
@ -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 \
|
||||
-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 \
|
||||
@ -4216,9 +4215,6 @@ __gldll___depname = \
|
||||
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
|
||||
@ -4386,9 +4382,6 @@ 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
|
||||
@ -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
|
||||
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) $<
|
||||
|
||||
@ -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
|
||||
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
|
||||
|
||||
@ -3129,10 +3129,6 @@ __GFXCTX_DEFINE_p =
|
||||
!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
|
||||
@ -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 &
|
||||
-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 = &
|
||||
@ -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 &
|
||||
-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 &
|
||||
@ -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
|
||||
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) $<
|
||||
|
||||
@ -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.
|
||||
- Building OpenGL library is now enabled by default.
|
||||
|
||||
MSW:
|
||||
|
||||
|
||||
@ -1074,13 +1074,12 @@
|
||||
// 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.
|
||||
//
|
||||
|
||||
@ -1074,13 +1074,12 @@
|
||||
// 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.
|
||||
//
|
||||
|
||||
@ -1074,13 +1074,12 @@
|
||||
// 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.
|
||||
//
|
||||
|
||||
@ -1074,13 +1074,12 @@
|
||||
// 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.
|
||||
//
|
||||
|
||||
@ -1075,13 +1075,12 @@
|
||||
// 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.
|
||||
//
|
||||
|
||||
@ -1074,13 +1074,12 @@
|
||||
// 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.
|
||||
//
|
||||
|
||||
@ -1070,13 +1070,12 @@
|
||||
// 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.
|
||||
//
|
||||
|
||||
@ -1073,13 +1073,12 @@
|
||||
// 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.
|
||||
//
|
||||
|
||||
Loading…
Reference in New Issue
Block a user