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

2.8.11.tag

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/WX_2_8_11@64141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2010-04-26 08:15:16 +00:00
parent b7379c0e71
commit cc7a8fce91
154 changed files with 7359 additions and 10217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
contrib/build/ogl/makefile.wat
View File

@@ -4,7 +4,7 @@
# Do not modify, all changes will be overwritten!
# =========================================================================
!include ../../../build/msw/config.wat
!include ../../../build/os2/config.wat
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
@@ -36,14 +36,7 @@ PORTNAME =
PORTNAME = base
!endif
!ifeq USE_GUI 1
PORTNAME = msw
!endif
VENDORTAG =
!ifeq OFFICIAL_BUILD 0
VENDORTAG = _$(VENDOR)
!endif
!ifeq OFFICIAL_BUILD 1
VENDORTAG =
PORTNAME = pm
!endif
WXDEBUGFLAG =
!ifeq BUILD debug
@@ -68,10 +61,10 @@ WXDLLFLAG = dll
!endif
LIBTYPE_SUFFIX =
!ifeq SHARED 0
LIBTYPE_SUFFIX = lib
LIBTYPE_SUFFIX = pm_lib
!endif
!ifeq SHARED 1
LIBTYPE_SUFFIX = dll
LIBTYPE_SUFFIX = pm_dll
!endif
EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 0
@@ -83,7 +76,7 @@ EXTRALIBS_FOR_BASE =
__ogldll___depname =
!ifeq SHARED 1
__ogldll___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG).dll
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.dll
!endif
__DEBUGINFO_2 =
!ifeq BUILD debug
@@ -119,18 +112,6 @@ __LIB_PNG_p =
!ifeq USE_GUI 1
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
__GDIPLUS_LIB_p =
!ifeq USE_GDIPLUS 1
__GDIPLUS_LIB_p = gdiplus.lib
!endif
__CAIRO_LIB_p =
!ifeq USE_CAIRO 1
__CAIRO_LIB_p = cairo.lib
!endif
____CAIRO_LIBDIR_FILENAMES_p =
!ifeq USE_CAIRO 1
____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib
!endif
__WXLIB_CORE_p =
!ifeq MONOLITHIC 0
__WXLIB_CORE_p = &
@@ -249,7 +230,7 @@ LIBDIRNAME = ..\..\src\ogl\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
OGLDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &
-i=$(SETUPHDIR) -i=..\..\src\ogl\..\..\..\include &
@@ -272,7 +253,7 @@ OGLDLL_OBJECTS = &
$(OBJS)\ogldll_lines.obj &
$(OBJS)\ogldll_ogldiag.obj
OGLLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &
-i=$(SETUPHDIR) -i=..\..\src\ogl\..\..\..\include &
@@ -309,21 +290,21 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG).dll
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.dll
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib
-del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib
!ifeq SHARED 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG).dll : $(OGLDLL_OBJECTS) $(OBJS)\ogldll_version.res
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.dll : $(OGLDLL_OBJECTS)
@%create $(OBJS)\ogldll.lbc
@%append $(OBJS)\ogldll.lbc option quiet
@%append $(OBJS)\ogldll.lbc name $^@
@%append $(OBJS)\ogldll.lbc option caseexact
@%append $(OBJS)\ogldll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
@%append $(OBJS)\ogldll.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(LDFLAGS)
@for %i in ($(OGLDLL_OBJECTS)) do @%append $(OBJS)\ogldll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\ogldll.lbc library %i
@%append $(OBJS)\ogldll.lbc option resource=$(OBJS)\ogldll_version.res
@%append $(OBJS)\ogldll.lbc system nt_dll
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\ogldll.lbc library %i
@%append $(OBJS)\ogldll.lbc
@%append $(OBJS)\ogldll.lbc system os2v2 dll
wlink @$(OBJS)\ogldll.lbc
wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib +$^@
!endif
@@ -336,83 +317,80 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
!endif
$(OBJS)\ogldll_dummy.obj : .AUTODEPEND ..\..\src\ogl\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogldll_version.res : .AUTODEPEND ..\..\src\ogl\..\..\..\src\msw\version.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\ogl\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG) -i=..\..\src\ogl\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_OGL $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogldll_basic2.obj : .AUTODEPEND ..\..\src\ogl\basic2.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogldll_canvas.obj : .AUTODEPEND ..\..\src\ogl\canvas.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogldll_divided.obj : .AUTODEPEND ..\..\src\ogl\divided.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogldll_mfutils.obj : .AUTODEPEND ..\..\src\ogl\mfutils.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogldll_oglmisc.obj : .AUTODEPEND ..\..\src\ogl\oglmisc.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogldll_basic.obj : .AUTODEPEND ..\..\src\ogl\basic.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogldll_composit.obj : .AUTODEPEND ..\..\src\ogl\composit.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogldll_drawn.obj : .AUTODEPEND ..\..\src\ogl\drawn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogldll_bmpshape.obj : .AUTODEPEND ..\..\src\ogl\bmpshape.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogldll_constrnt.obj : .AUTODEPEND ..\..\src\ogl\constrnt.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogldll_lines.obj : .AUTODEPEND ..\..\src\ogl\lines.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogldll_ogldiag.obj : .AUTODEPEND ..\..\src\ogl\ogldiag.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogllib_dummy.obj : .AUTODEPEND ..\..\src\ogl\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(OBJS)\ogllib_basic2.obj : .AUTODEPEND ..\..\src\ogl\basic2.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(OBJS)\ogllib_canvas.obj : .AUTODEPEND ..\..\src\ogl\canvas.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(OBJS)\ogllib_divided.obj : .AUTODEPEND ..\..\src\ogl\divided.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(OBJS)\ogllib_mfutils.obj : .AUTODEPEND ..\..\src\ogl\mfutils.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(OBJS)\ogllib_oglmisc.obj : .AUTODEPEND ..\..\src\ogl\oglmisc.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(OBJS)\ogllib_basic.obj : .AUTODEPEND ..\..\src\ogl\basic.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(OBJS)\ogllib_composit.obj : .AUTODEPEND ..\..\src\ogl\composit.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(OBJS)\ogllib_drawn.obj : .AUTODEPEND ..\..\src\ogl\drawn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(OBJS)\ogllib_bmpshape.obj : .AUTODEPEND ..\..\src\ogl\bmpshape.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(OBJS)\ogllib_constrnt.obj : .AUTODEPEND ..\..\src\ogl\constrnt.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(OBJS)\ogllib_lines.obj : .AUTODEPEND ..\..\src\ogl\lines.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(OBJS)\ogllib_ogldiag.obj : .AUTODEPEND ..\..\src\ogl\ogldiag.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(CXX) -bt=os2 -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<