Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-22 14:20:35 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Added bakefile for the OGL contrib

Browse Source 
Changed use of deprecated methods in OGL to new methods

Changes to allow OGL to be built without the deprecated wxExpr (again)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-07-18 02:09:34 +00:00
parent 52fcf3b1bd
commit fd657b8a59
21 changed files with 2348 additions and 2741 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.in
+95 -58
View File
@@ -265,7 +265,8 @@ WXZLIB_CFLAGS = $(CPPFLAGS) $(CFLAGS)
@COND_PLATFORM_UNIX_1@ wx/unix/gsockunx.h wx/unix/mimetype.h
@COND_PLATFORM_WIN32_1@BASE_PLATFORM_HDR = \
@COND_PLATFORM_WIN32_1@ wx/msw/dde.h wx/msw/gccpriv.h wx/msw/mimetype.h \
@COND_PLATFORM_WIN32_1@ wx/msw/winundef.h wx/msw/wrapwin.h wx/msw/chkconf.h
@COND_PLATFORM_WIN32_1@ wx/msw/winundef.h wx/msw/wrapwin.h wx/msw/chkconf.h \
@COND_PLATFORM_WIN32_1@ wx/msw/crashrpt.h
@COND_TOOLKIT_COCOA@BASE_PLATFORM_HDR =
@COND_TOOLKIT_MAC@BASE_PLATFORM_HDR =
@COND_DEPS_TRACKING_0@CCC = $(CC)
@@ -585,7 +586,8 @@ WXZLIB_CFLAGS = $(CPPFLAGS) $(CFLAGS)
@COND_PLATFORM_WIN32_1@ monodll_basemsw.o monodll_dde.o monodll_dir.o \
@COND_PLATFORM_WIN32_1@ monodll_mimetype.o monodll_regconf.o \
@COND_PLATFORM_WIN32_1@ monodll_registry.o monodll_snglinst.o \
@COND_PLATFORM_WIN32_1@ monodll_thread.o monodll_utils.o monodll_utilsexc.o
@COND_PLATFORM_WIN32_1@ monodll_thread.o monodll_utils.o monodll_utilsexc.o \
@COND_PLATFORM_WIN32_1@ monodll_crashrpt.o
@COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_1 \
@COND_PLATFORM_MACOSX_1@ = $(__BASE_MACOSX_SRC_OBJECTS_1)
@COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_1 = \
@@ -597,7 +599,8 @@ WXZLIB_CFLAGS = $(CPPFLAGS) $(CFLAGS)
@COND_PLATFORM_WIN32_1@ monolib_basemsw.o monolib_dde.o monolib_dir.o \
@COND_PLATFORM_WIN32_1@ monolib_mimetype.o monolib_regconf.o \
@COND_PLATFORM_WIN32_1@ monolib_registry.o monolib_snglinst.o \
@COND_PLATFORM_WIN32_1@ monolib_thread.o monolib_utils.o monolib_utilsexc.o
@COND_PLATFORM_WIN32_1@ monolib_thread.o monolib_utils.o monolib_utilsexc.o \
@COND_PLATFORM_WIN32_1@ monolib_crashrpt.o
@COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_2 \
@COND_PLATFORM_MACOSX_1@ = $(__BASE_MACOSX_SRC_OBJECTS_2)
@COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_2 = \
@@ -609,7 +612,8 @@ WXZLIB_CFLAGS = $(CPPFLAGS) $(CFLAGS)
@COND_PLATFORM_WIN32_1@ basedll_basemsw.o basedll_dde.o basedll_dir.o \
@COND_PLATFORM_WIN32_1@ basedll_mimetype.o basedll_regconf.o \
@COND_PLATFORM_WIN32_1@ basedll_registry.o basedll_snglinst.o \
@COND_PLATFORM_WIN32_1@ basedll_thread.o basedll_utils.o basedll_utilsexc.o
@COND_PLATFORM_WIN32_1@ basedll_thread.o basedll_utils.o basedll_utilsexc.o \
@COND_PLATFORM_WIN32_1@ basedll_crashrpt.o
@COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_3 \
@COND_PLATFORM_MACOSX_1@ = $(__BASE_MACOSX_SRC_OBJECTS_3)
@COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_3 = \
@@ -621,58 +625,60 @@ WXZLIB_CFLAGS = $(CPPFLAGS) $(CFLAGS)
@COND_PLATFORM_WIN32_1@ baselib_basemsw.o baselib_dde.o baselib_dir.o \
@COND_PLATFORM_WIN32_1@ baselib_mimetype.o baselib_regconf.o \
@COND_PLATFORM_WIN32_1@ baselib_registry.o baselib_snglinst.o \
@COND_PLATFORM_WIN32_1@ baselib_thread.o baselib_utils.o baselib_utilsexc.o
@COND_PLATFORM_WIN32_1@ baselib_thread.o baselib_utils.o baselib_utilsexc.o \
@COND_PLATFORM_WIN32_1@ baselib_crashrpt.o
@COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS = \
@COND_USE_GUI_1_WXUNIV_0@ $(__LOWLEVEL_SRC_OBJECTS) $(__GUI_SRC_OBJECTS) \
@COND_USE_GUI_1_WXUNIV_0@ monodll_selstore.o monodll_busyinfo.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_calctrl.o monodll_choicdgg.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_dcbuffer.o monodll_dcpsg.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_dirctrlg.o monodll_grid.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_gridctrl.o monodll_gridsel.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_laywin.o monodll_logg.o monodll_numdlgg.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_panelg.o monodll_progdlgg.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_sashwin.o monodll_scrlwing.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_spinctlg.o monodll_splash.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_splitter.o monodll_tbarsmpl.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_textdlgg.o monodll_tipdlg.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_tipwin.o monodll_treectlg.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_vlbox.o monodll_vscroll.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_wizard.o monodll_appcmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_fontmap.o monodll_accesscmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_artprov.o monodll_artstd.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_bmpbase.o monodll_choiccmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_clipcmn.o monodll_cmdproc.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_cmndata.o monodll_containr.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_cshelp.o monodll_ctrlcmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_ctrlsub.o monodll_datacmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_dbgrid.o monodll_dcbase.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_dlgcmn.o monodll_dndcmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_dobjcmn.o monodll_docmdi.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_docview.o monodll_dpycmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_dseldlg.o monodll_effects.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_fddlgcmn.o monodll_fldlgcmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_fontcmn.o monodll_framecmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_timercmn.o monodll_toplvcmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_gaugecmn.o monodll_gdicmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_geometry.o monodll_gifdecod.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_helpbase.o monodll_iconbndl.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_imagall.o monodll_imagbmp.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_image.o monodll_imaggif.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_imagiff.o monodll_imagjpeg.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_imagpcx.o monodll_imagpng.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_imagpnm.o monodll_imagtiff.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_imagxpm.o monodll_imagfill.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_layout.o monodll_lboxcmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_matrix.o monodll_menucmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_nbkbase.o monodll_paper.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_popupcmn.o monodll_prntbase.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_quantize.o monodll_radiocmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_rgncmn.o monodll_settcmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_sizer.o monodll_statbar.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_tbarbase.o monodll_textcmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_treebase.o monodll_valgen.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_validate.o monodll_valtext.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_wincmn.o monodll_xpmdecod.o
@COND_USE_GUI_1_WXUNIV_0@ monodll_dirctrlg.o monodll_dragimgg.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_grid.o monodll_gridctrl.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_gridsel.o monodll_laywin.o monodll_logg.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_numdlgg.o monodll_panelg.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_progdlgg.o monodll_sashwin.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_scrlwing.o monodll_spinctlg.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_splash.o monodll_splitter.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_tbarsmpl.o monodll_textdlgg.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_tipdlg.o monodll_tipwin.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_treectlg.o monodll_vlbox.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_vscroll.o monodll_wizard.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_appcmn.o monodll_fontmap.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_accesscmn.o monodll_artprov.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_artstd.o monodll_bmpbase.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_choiccmn.o monodll_clipcmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_cmdproc.o monodll_cmndata.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_containr.o monodll_cshelp.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_ctrlcmn.o monodll_ctrlsub.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_datacmn.o monodll_dbgrid.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_dcbase.o monodll_dlgcmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_dndcmn.o monodll_dobjcmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_docmdi.o monodll_docview.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_dpycmn.o monodll_dseldlg.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_effects.o monodll_fddlgcmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_fldlgcmn.o monodll_fontcmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_framecmn.o monodll_timercmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_toplvcmn.o monodll_gaugecmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_gdicmn.o monodll_geometry.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_gifdecod.o monodll_helpbase.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_iconbndl.o monodll_imagall.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_imagbmp.o monodll_image.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_imaggif.o monodll_imagiff.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_imagjpeg.o monodll_imagpcx.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_imagpng.o monodll_imagpnm.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_imagtiff.o monodll_imagxpm.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_imagfill.o monodll_layout.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_lboxcmn.o monodll_matrix.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_menucmn.o monodll_nbkbase.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_paper.o monodll_popupcmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_prntbase.o monodll_quantize.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_radiocmn.o monodll_rgncmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_settcmn.o monodll_sizer.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_statbar.o monodll_tbarbase.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_textcmn.o monodll_treebase.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_valgen.o monodll_validate.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_valtext.o monodll_wincmn.o \
@COND_USE_GUI_1_WXUNIV_0@ monodll_xpmdecod.o
@COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS = \
@COND_USE_GUI_1_WXUNIV_1@ $(__LOWLEVEL_SRC_OBJECTS) \
@COND_USE_GUI_1_WXUNIV_1@ $(__UNIV_TEXTCTRL_OBJECTS) monodll_bmpbuttn.o \
@@ -701,7 +707,8 @@ WXZLIB_CFLAGS = $(CPPFLAGS) $(CFLAGS)
@COND_USE_GUI_1_WXUNIV_1@ monodll_metal.o monodll_selstore.o \
@COND_USE_GUI_1_WXUNIV_1@ monodll_busyinfo.o monodll_calctrl.o \
@COND_USE_GUI_1_WXUNIV_1@ monodll_choicdgg.o monodll_dcbuffer.o \
@COND_USE_GUI_1_WXUNIV_1@ monodll_dcpsg.o monodll_dirctrlg.o monodll_grid.o \
@COND_USE_GUI_1_WXUNIV_1@ monodll_dcpsg.o monodll_dirctrlg.o \
@COND_USE_GUI_1_WXUNIV_1@ monodll_dragimgg.o monodll_grid.o \
@COND_USE_GUI_1_WXUNIV_1@ monodll_gridctrl.o monodll_gridsel.o \
@COND_USE_GUI_1_WXUNIV_1@ monodll_laywin.o monodll_logg.o monodll_numdlgg.o \
@COND_USE_GUI_1_WXUNIV_1@ monodll_panelg.o monodll_progdlgg.o \
@@ -752,7 +759,8 @@ WXZLIB_CFLAGS = $(CPPFLAGS) $(CFLAGS)
@COND_USE_GUI_1_WXUNIV_0@ $(__GUI_SRC_OBJECTS_1) monolib_selstore.o \
@COND_USE_GUI_1_WXUNIV_0@ monolib_busyinfo.o monolib_calctrl.o \
@COND_USE_GUI_1_WXUNIV_0@ monolib_choicdgg.o monolib_dcbuffer.o \
@COND_USE_GUI_1_WXUNIV_0@ monolib_dcpsg.o monolib_dirctrlg.o monolib_grid.o \
@COND_USE_GUI_1_WXUNIV_0@ monolib_dcpsg.o monolib_dirctrlg.o \
@COND_USE_GUI_1_WXUNIV_0@ monolib_dragimgg.o monolib_grid.o \
@COND_USE_GUI_1_WXUNIV_0@ monolib_gridctrl.o monolib_gridsel.o \
@COND_USE_GUI_1_WXUNIV_0@ monolib_laywin.o monolib_logg.o monolib_numdlgg.o \
@COND_USE_GUI_1_WXUNIV_0@ monolib_panelg.o monolib_progdlgg.o \
@@ -826,7 +834,8 @@ WXZLIB_CFLAGS = $(CPPFLAGS) $(CFLAGS)
@COND_USE_GUI_1_WXUNIV_1@ monolib_metal.o monolib_selstore.o \
@COND_USE_GUI_1_WXUNIV_1@ monolib_busyinfo.o monolib_calctrl.o \
@COND_USE_GUI_1_WXUNIV_1@ monolib_choicdgg.o monolib_dcbuffer.o \
@COND_USE_GUI_1_WXUNIV_1@ monolib_dcpsg.o monolib_dirctrlg.o monolib_grid.o \
@COND_USE_GUI_1_WXUNIV_1@ monolib_dcpsg.o monolib_dirctrlg.o \
@COND_USE_GUI_1_WXUNIV_1@ monolib_dragimgg.o monolib_grid.o \
@COND_USE_GUI_1_WXUNIV_1@ monolib_gridctrl.o monolib_gridsel.o \
@COND_USE_GUI_1_WXUNIV_1@ monolib_laywin.o monolib_logg.o monolib_numdlgg.o \
@COND_USE_GUI_1_WXUNIV_1@ monolib_panelg.o monolib_progdlgg.o \
@@ -877,7 +886,8 @@ WXZLIB_CFLAGS = $(CPPFLAGS) $(CFLAGS)
@COND_USE_GUI_1_WXUNIV_0@ $(__GUI_SRC_OBJECTS_2) coredll_selstore.o \
@COND_USE_GUI_1_WXUNIV_0@ coredll_busyinfo.o coredll_calctrl.o \
@COND_USE_GUI_1_WXUNIV_0@ coredll_choicdgg.o coredll_dcbuffer.o \
@COND_USE_GUI_1_WXUNIV_0@ coredll_dcpsg.o coredll_dirctrlg.o coredll_grid.o \
@COND_USE_GUI_1_WXUNIV_0@ coredll_dcpsg.o coredll_dirctrlg.o \
@COND_USE_GUI_1_WXUNIV_0@ coredll_dragimgg.o coredll_grid.o \
@COND_USE_GUI_1_WXUNIV_0@ coredll_gridctrl.o coredll_gridsel.o \
@COND_USE_GUI_1_WXUNIV_0@ coredll_laywin.o coredll_logg.o coredll_numdlgg.o \
@COND_USE_GUI_1_WXUNIV_0@ coredll_panelg.o coredll_progdlgg.o \
@@ -951,7 +961,8 @@ WXZLIB_CFLAGS = $(CPPFLAGS) $(CFLAGS)
@COND_USE_GUI_1_WXUNIV_1@ coredll_metal.o coredll_selstore.o \
@COND_USE_GUI_1_WXUNIV_1@ coredll_busyinfo.o coredll_calctrl.o \
@COND_USE_GUI_1_WXUNIV_1@ coredll_choicdgg.o coredll_dcbuffer.o \
@COND_USE_GUI_1_WXUNIV_1@ coredll_dcpsg.o coredll_dirctrlg.o coredll_grid.o \
@COND_USE_GUI_1_WXUNIV_1@ coredll_dcpsg.o coredll_dirctrlg.o \
@COND_USE_GUI_1_WXUNIV_1@ coredll_dragimgg.o coredll_grid.o \
@COND_USE_GUI_1_WXUNIV_1@ coredll_gridctrl.o coredll_gridsel.o \
@COND_USE_GUI_1_WXUNIV_1@ coredll_laywin.o coredll_logg.o coredll_numdlgg.o \
@COND_USE_GUI_1_WXUNIV_1@ coredll_panelg.o coredll_progdlgg.o \
@@ -1002,7 +1013,8 @@ WXZLIB_CFLAGS = $(CPPFLAGS) $(CFLAGS)
@COND_USE_GUI_1_WXUNIV_0@ $(__GUI_SRC_OBJECTS_3) corelib_selstore.o \
@COND_USE_GUI_1_WXUNIV_0@ corelib_busyinfo.o corelib_calctrl.o \
@COND_USE_GUI_1_WXUNIV_0@ corelib_choicdgg.o corelib_dcbuffer.o \
@COND_USE_GUI_1_WXUNIV_0@ corelib_dcpsg.o corelib_dirctrlg.o corelib_grid.o \
@COND_USE_GUI_1_WXUNIV_0@ corelib_dcpsg.o corelib_dirctrlg.o \
@COND_USE_GUI_1_WXUNIV_0@ corelib_dragimgg.o corelib_grid.o \
@COND_USE_GUI_1_WXUNIV_0@ corelib_gridctrl.o corelib_gridsel.o \
@COND_USE_GUI_1_WXUNIV_0@ corelib_laywin.o corelib_logg.o corelib_numdlgg.o \
@COND_USE_GUI_1_WXUNIV_0@ corelib_panelg.o corelib_progdlgg.o \
@@ -1076,7 +1088,8 @@ WXZLIB_CFLAGS = $(CPPFLAGS) $(CFLAGS)
@COND_USE_GUI_1_WXUNIV_1@ corelib_metal.o corelib_selstore.o \
@COND_USE_GUI_1_WXUNIV_1@ corelib_busyinfo.o corelib_calctrl.o \
@COND_USE_GUI_1_WXUNIV_1@ corelib_choicdgg.o corelib_dcbuffer.o \
@COND_USE_GUI_1_WXUNIV_1@ corelib_dcpsg.o corelib_dirctrlg.o corelib_grid.o \
@COND_USE_GUI_1_WXUNIV_1@ corelib_dcpsg.o corelib_dirctrlg.o \
@COND_USE_GUI_1_WXUNIV_1@ corelib_dragimgg.o corelib_grid.o \
@COND_USE_GUI_1_WXUNIV_1@ corelib_gridctrl.o corelib_gridsel.o \
@COND_USE_GUI_1_WXUNIV_1@ corelib_laywin.o corelib_logg.o corelib_numdlgg.o \
@COND_USE_GUI_1_WXUNIV_1@ corelib_panelg.o corelib_progdlgg.o \
@@ -2281,6 +2294,9 @@ basedll_cmdline.o: $(srcdir)/src/common/cmdline.cpp
basedll_config.o: $(srcdir)/src/common/config.cpp
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
basedll_crashrpt.o: $(srcdir)/src/msw/crashrpt.cpp
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
basedll_datetime.o: $(srcdir)/src/common/datetime.cpp
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
@@ -2607,6 +2623,9 @@ baselib_cmdline.o: $(srcdir)/src/common/cmdline.cpp
baselib_config.o: $(srcdir)/src/common/config.cpp
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
baselib_crashrpt.o: $(srcdir)/src/msw/crashrpt.cpp
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
baselib_datetime.o: $(srcdir)/src/common/datetime.cpp
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
@@ -3635,6 +3654,9 @@ coredll_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp
coredll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
@COND_USE_GUI_1@coredll_dragimgg.o: $(srcdir)/src/generic/dragimgg.cpp
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
@COND_TOOLKIT_MSW_USE_GUI_1@coredll_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
@@ -5758,6 +5780,9 @@ corelib_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp
corelib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
@COND_USE_GUI_1@corelib_dragimgg.o: $(srcdir)/src/generic/dragimgg.cpp
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
@COND_TOOLKIT_MSW_USE_GUI_1@corelib_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
@@ -7918,6 +7943,9 @@ monodll_config.o: $(srcdir)/src/common/config.cpp
@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/os2/control.cpp
@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
monodll_crashrpt.o: $(srcdir)/src/msw/crashrpt.cpp
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@COND_USE_GUI_1@monodll_cshelp.o: $(srcdir)/src/common/cshelp.cpp
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -8239,6 +8267,9 @@ monodll_dirmac.o: $(srcdir)/src/mac/dirmac.cpp
monodll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@COND_USE_GUI_1@monodll_dragimgg.o: $(srcdir)/src/generic/dragimgg.cpp
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@COND_TOOLKIT_MSW_USE_GUI_1@monodll_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -10401,6 +10432,9 @@ monolib_config.o: $(srcdir)/src/common/config.cpp
@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/os2/control.cpp
@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
monolib_crashrpt.o: $(srcdir)/src/msw/crashrpt.cpp
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@COND_USE_GUI_1@monolib_cshelp.o: $(srcdir)/src/common/cshelp.cpp
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -10722,6 +10756,9 @@ monolib_dirmac.o: $(srcdir)/src/mac/dirmac.cpp
monolib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@COND_USE_GUI_1@monolib_dragimgg.o: $(srcdir)/src/generic/dragimgg.cpp
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@COND_TOOLKIT_MSW_USE_GUI_1@monolib_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
build/bakefiles/Makefile
+1402 -1381
View File
File diff suppressed because one or more lines are too long
build/makefile.bcc
+406 -378
View File
File diff suppressed because it is too large Load Diff
build/makefile.gcc
+33 -13
View File
File diff suppressed because one or more lines are too long
build/makefile.vc
+28 -8
View File
File diff suppressed because one or more lines are too long
build/makefile.wat
+28 -8
View File
File diff suppressed because one or more lines are too long
contrib/build/ogl/ogl.bkl
+56
View File
@@ -0,0 +1,56 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<include file="../../../build/bakefiles/common_contrib.bkl"/>
<set var="OGL_SRC">
basic2.cpp
canvas.cpp
divided.cpp
mfutils.cpp
oglmisc.cpp
basic.cpp
composit.cpp
drawn.cpp
bmpshape.cpp
constrnt.cpp
lines.cpp
ogldiag.cpp
</set>
<headers template="wx_contrib_headers">
<files>
wx/ogl/basic.h
wx/ogl/basicp.h
wx/ogl/bmpshape.h
wx/ogl/canvas.h
wx/ogl/composit.h
wx/ogl/constrnt.h
wx/ogl/divided.h
wx/ogl/drawn.h
wx/ogl/drawnp.h
wx/ogl/lines.h
wx/ogl/linesp.h
wx/ogl/mfutils.h
wx/ogl/misc.h
wx/ogl/ogldiag.h
wx/ogl/ogl.h
</files>
</headers>
<dll id="ogldll" template="wx_contrib_dll" cond="SHARED=='1'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_OGL</define>
<define>wxUSE_DEPRECATED=0</define> <!-- this is a hack, we should do the RightThing later -->
<sources>$(OGL_SRC)</sources>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
</dll>
<lib id="ogllib" template="wx_contrib_lib" cond="SHARED=='0'">
<sources>$(OGL_SRC)</sources>
</lib>
</makefile>
contrib/include/wx/ogl/ogldiag.h
+3 -1
View File
@@ -16,7 +16,9 @@
#pragma interface "ogldiag.h"
#endif
#include <wx/deprecated/setup.h>
#if wxUSE_DEPRECATED
#include <wx/deprecated/wxexpr.h>
#endif
#if wxUSE_PROLOGIO
#include <wx/deprecated/wxexpr.h>
contrib/src/ogl/Makefile.in
+265 -22
View File
@@ -1,29 +1,272 @@
# $Id$
top_srcdir = @top_srcdir@/..
top_builddir = ../../..
libsrc_dir = contrib/src/ogl
TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_ogl-@WX_RELEASE@
LIBVERSION_CURRENT=@WX_CURRENT@
LIBVERSION_REVISION=@WX_REVISION@
LIBVERSION_AGE=@WX_AGE@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
HEADER_PATH=$(top_srcdir)/contrib/include/wx
HEADER_SUBDIR=ogl
@MAKE_SET@
HEADERS=basic.h basicp.h bmpshape.h canvas.h composit.h constrnt.h \
divided.h drawn.h drawnp.h lines.h linesp.h mfutils.h misc.h \
ogl.h ogldiag.h
prefix = @prefix@
exec_prefix = @exec_prefix@
INSTALL = @INSTALL@
AR = @AR@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXFLAGS = @CXXFLAGS@
DLLPREFIX = @DLLPREFIX@
EXTRALIBS = @EXTRALIBS@
EXTRALIBS_GUI = @EXTRALIBS_GUI@
HOST_SUFFIX = @HOST_SUFFIX@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_DIR = @INSTALL_DIR@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
LDFLAGS = @LDFLAGS@
LN_S = @LN_S@
PIC_FLAG = @PIC_FLAG@
RANLIB = @RANLIB@
SHARED_LD_CXX = @SHARED_LD_CXX@
SONAME_FLAG = @SONAME_FLAG@
SO_SUFFIX = @SO_SUFFIX@
STRIP = @STRIP@
TOOLKIT = @TOOLKIT@
TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
TOOLKIT_VERSION = @TOOLKIT_VERSION@
VENDOR = @VENDOR@
includedir = @includedir@
libdir = @libdir@
srcdir = @srcdir@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
OBJECTS=basic.o bmpshape.o composit.o divided.o lines.o misc.o \
basic2.o canvas.o constrnt.o drawn.o mfutils.o ogldiag.o
DEPFILES=$(OBJECTS:.o=.d)
### Variables: ###
APPEXTRADEFS=-I$(top_srcdir)/contrib/include
OGLDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
$(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include \
-DWXUSINGDLL -DWXMAKINGDLL_OGL -DwxUSE_DEPRECATED=0 $(CXXFLAGS) $(PIC_FLAG)
OGLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
$(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include \
$(CXXFLAGS)
include $(top_builddir)/src/makelib.env
### Conditionally set variables: ###
-include $(DEPFILES)
@COND_DEPS_TRACKING_0@CXXC = $(CXX)
@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX)
@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG =
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
@COND_BUILD_DEBUG@WXDEBUGFLAG = d
@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)25
@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5
@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg
@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc
@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png
@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex
@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff
@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib
@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \
@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \
@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX)
@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \
@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX)
@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \
@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_CORE_p = \
@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = \
@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@COND_SHARED_1@__install_ogldll___depname = install_ogldll
@COND_SHARED_0@__install_ogllib___depname = install_ogllib
@COND_SHARED_1@__ogldll___depname = \
@COND_SHARED_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
@COND_PLATFORM_WIN32_1@__ogldll___importlib = \
@COND_PLATFORM_WIN32_1@ -Wl,--out-implib,libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
@COND_PLATFORM_WIN32_1@__ogldll___importlib = \
@COND_PLATFORM_WIN32_1@ -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
@COND_PLATFORM_MACOSX_1@__ogldll___macinstnamecmd = \
@COND_PLATFORM_MACOSX_1@ -install_name \
@COND_PLATFORM_MACOSX_1@ $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2)
@COND_PLATFORM_MACOSX_1@__ogldll___macver = \
@COND_PLATFORM_MACOSX_1@ -compatibility_version 2.5 -current_version 2.5.0
@COND_USE_SOSYMLINKS_1@__ogldll___so_symlinks_cmd = \
@COND_USE_SOSYMLINKS_1@ rm -f \
@COND_USE_SOSYMLINKS_1@ $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \
@COND_USE_SOSYMLINKS_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \
@COND_USE_SOSYMLINKS_1@ $(LN_S) \
@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) \
@COND_USE_SOSYMLINKS_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \
@COND_USE_SOSYMLINKS_1@ $(LN_S) \
@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) \
@COND_USE_SOSYMLINKS_1@ $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
@COND_USE_SOSYMLINKS_1@__ogldll___so_symlinks_inst_cmd \
@COND_USE_SOSYMLINKS_1@ = rm -f \
@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \
@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \
@COND_USE_SOSYMLINKS_1@ $(LN_S) \
@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) \
@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2); \
@COND_USE_SOSYMLINKS_1@ $(LN_S) \
@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) \
@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
@COND_USE_SOVERLINUX_1@__ogldll___soname_flags = \
@COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2)
@COND_USE_SOVERSOLARIS_1@__ogldll___soname_flags = \
@COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__ogldll___targetsuf2 \
@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__ogldll___targetsuf2 \
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.$(SO_SUFFIX)
@COND_USE_SOVERSION_0@__ogldll___targetsuf2 = .$(SO_SUFFIX)
@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__ogldll___targetsuf3 \
@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0.0.0
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__ogldll___targetsuf3 \
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX)
@COND_USE_SOVERSION_0@__ogldll___targetsuf3 = .$(SO_SUFFIX)
@COND_SHARED_0@__ogllib___depname = \
@COND_SHARED_0@ $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a
### Targets: ###
all: $(__ogldll___depname) $(__ogllib___depname)
clean:
rm -rf ./.deps
rm -f -f ./*.o
rm -f $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2)
rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a
distclean: clean
rm -f configure config.cache config.log config.status
rm -f bk-deps shared-ld-sh
install: all $(__install_ogldll___depname) $(__install_ogllib___depname)
$(INSTALL_DIR) $(includedir)
for f in wx/ogl/basic.h wx/ogl/basicp.h wx/ogl/bmpshape.h wx/ogl/canvas.h wx/ogl/composit.h wx/ogl/constrnt.h wx/ogl/divided.h wx/ogl/drawn.h wx/ogl/drawnp.h wx/ogl/lines.h wx/ogl/linesp.h wx/ogl/mfutils.h wx/ogl/misc.h wx/ogl/ogldiag.h wx/ogl/ogl.h; do \
if test ! -d $(includedir)/`dirname $$f` ; then \
$(INSTALL_DIR) $(includedir)/`dirname $$f`; \
fi; \
$(INSTALL_DATA) $(srcdir)/../../include//$$f $(includedir)/$$f; \
done
install-strip: install
$(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
@COND_SHARED_1@install_ogldll:
@COND_SHARED_1@ $(INSTALL_DIR) $(libdir)
@COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir)
@COND_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) $(libdir)
@COND_SHARED_1@ (cd $(libdir) ; $(__ogldll___so_symlinks_inst_cmd))
@COND_SHARED_0@install_ogllib:
@COND_SHARED_0@ $(INSTALL_DIR) $(libdir)
@COND_SHARED_0@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a $(libdir)
@COND_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3): ogldll_basic2.o ogldll_canvas.o ogldll_divided.o ogldll_mfutils.o ogldll_oglmisc.o ogldll_basic.o ogldll_composit.o ogldll_drawn.o ogldll_bmpshape.o ogldll_constrnt.o ogldll_lines.o ogldll_ogldiag.o
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ ogldll_basic2.o ogldll_canvas.o ogldll_divided.o ogldll_mfutils.o ogldll_oglmisc.o ogldll_basic.o ogldll_composit.o ogldll_drawn.o ogldll_bmpshape.o ogldll_constrnt.o ogldll_lines.o ogldll_ogldiag.o $(LDFLAGS) $(__ogldll___importlib) -L$(top_builddir)lib $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(__ogldll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@ $(__ogldll___so_symlinks_cmd)
ogldll_basic.o: $(srcdir)/basic.cpp
$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
ogldll_basic2.o: $(srcdir)/basic2.cpp
$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
ogldll_bmpshape.o: $(srcdir)/bmpshape.cpp
$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
ogldll_canvas.o: $(srcdir)/canvas.cpp
$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
ogldll_composit.o: $(srcdir)/composit.cpp
$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
ogldll_constrnt.o: $(srcdir)/constrnt.cpp
$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
ogldll_divided.o: $(srcdir)/divided.cpp
$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
ogldll_drawn.o: $(srcdir)/drawn.cpp
$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
ogldll_lines.o: $(srcdir)/lines.cpp
$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
ogldll_mfutils.o: $(srcdir)/mfutils.cpp
$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
ogldll_ogldiag.o: $(srcdir)/ogldiag.cpp
$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
ogldll_oglmisc.o: $(srcdir)/oglmisc.cpp
$(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $<
@COND_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a: ogllib_basic2.o ogllib_canvas.o ogllib_divided.o ogllib_mfutils.o ogllib_oglmisc.o ogllib_basic.o ogllib_composit.o ogllib_drawn.o ogllib_bmpshape.o ogllib_constrnt.o ogllib_lines.o ogllib_ogldiag.o
@COND_SHARED_0@ rm -f $@
@COND_SHARED_0@ $(AR) rcu $@ ogllib_basic2.o ogllib_canvas.o ogllib_divided.o ogllib_mfutils.o ogllib_oglmisc.o ogllib_basic.o ogllib_composit.o ogllib_drawn.o ogllib_bmpshape.o ogllib_constrnt.o ogllib_lines.o ogllib_ogldiag.o
@COND_SHARED_0@ $(RANLIB) $@
ogllib_basic.o: $(srcdir)/basic.cpp
$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
ogllib_basic2.o: $(srcdir)/basic2.cpp
$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
ogllib_bmpshape.o: $(srcdir)/bmpshape.cpp
$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
ogllib_canvas.o: $(srcdir)/canvas.cpp
$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
ogllib_composit.o: $(srcdir)/composit.cpp
$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
ogllib_constrnt.o: $(srcdir)/constrnt.cpp
$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
ogllib_divided.o: $(srcdir)/divided.cpp
$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
ogllib_drawn.o: $(srcdir)/drawn.cpp
$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
ogllib_lines.o: $(srcdir)/lines.cpp
$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
ogllib_mfutils.o: $(srcdir)/mfutils.cpp
$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
ogllib_ogldiag.o: $(srcdir)/ogldiag.cpp
$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
ogllib_oglmisc.o: $(srcdir)/oglmisc.cpp
$(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $<
uninstall:
# Include dependency info, if present:
@IF_GNU_MAKE@-include .deps/*.d
.PHONY: all clean distclean install install_ogldll install_ogllib uninstall
contrib/src/ogl/basic.cpp
+2
View File
@@ -24,7 +24,9 @@
#include <wx/wx.h>
#endif
#if wxUSE_DEPRECATED
#include <wx/deprecated/wxexpr.h>
#endif
#ifdef new
#undef new
contrib/src/ogl/basic2.cpp
+2
View File
@@ -24,7 +24,9 @@
#include <wx/wx.h>
#endif
#if wxUSE_DEPRECATED
#include <wx/deprecated/wxexpr.h>
#endif
#ifdef new
#undef new
contrib/src/ogl/bmpshape.cpp
+2
View File
@@ -24,7 +24,9 @@
#include <wx/wx.h>
#endif
#if wxUSE_DEPRECATED
#include <wx/deprecated/wxexpr.h>
#endif
#include <wx/ogl/basic.h>
#include <wx/ogl/basicp.h>
contrib/src/ogl/canvas.cpp
+2
View File
@@ -24,7 +24,9 @@
#include <wx/wx.h>
#endif
#if wxUSE_DEPRECATED
#include <wx/deprecated/wxexpr.h>
#endif
#ifdef new
#undef new
contrib/src/ogl/composit.cpp
+2
View File
@@ -24,7 +24,9 @@
#include <wx/wx.h>
#endif
#if wxUSE_DEPRECATED
#include <wx/deprecated/wxexpr.h>
#endif
#include <wx/ogl/basic.h>
#include <wx/ogl/basicp.h>
contrib/src/ogl/constrnt.cpp
+2
View File
@@ -24,7 +24,9 @@
#include <wx/wx.h>
#endif
#if wxUSE_DEPRECATED
#include <wx/deprecated/wxexpr.h>
#endif
#include <wx/ogl/basic.h>
#include <wx/ogl/constrnt.h>
contrib/src/ogl/divided.cpp
+2
View File
@@ -24,7 +24,9 @@
#include <wx/wx.h>
#endif
#if wxUSE_DEPRECATED
#include <wx/deprecated/wxexpr.h>
#endif
#include <wx/ogl/basic.h>
#include <wx/ogl/basicp.h>
contrib/src/ogl/drawn.cpp
+2
View File
@@ -25,7 +25,9 @@
#include <wx/wx.h>
#endif
#if wxUSE_DEPRECATED
#include <wx/deprecated/wxexpr.h>
#endif
#include <wx/ogl/basic.h>
#include <wx/ogl/basicp.h>
contrib/src/ogl/lines.cpp
+2
View File
@@ -25,7 +25,9 @@
#include <wx/wx.h>
#endif
#if wxUSE_DEPRECATED
#include <wx/deprecated/wxexpr.h>
#endif
#ifdef new
#undef new
contrib/src/ogl/misc.cpp
-862
View File
File diff suppressed because it is too large Load Diff
contrib/src/ogl/ogldiag.cpp
+2
View File
@@ -24,7 +24,9 @@
#include <wx/wx.h>
#endif
#if wxUSE_DEPRECATED
#include <wx/deprecated/wxexpr.h>
#endif
#ifdef new
#undef new
contrib/src/ogl/oglmisc.cpp
+12 -10
View File
@@ -24,7 +24,9 @@
#include <wx/wx.h>
#endif
#if wxUSE_DEPRECATED
#include <wx/deprecated/wxexpr.h>
#endif
#include <wx/types.h>
@@ -229,7 +231,7 @@ void oglCentreText(wxDC& dc, wxList *text_list,
if (current_width > max_width)
max_width = current_width;
current = current->Next();
current = current->GetNext();
i ++;
}
@@ -277,7 +279,7 @@ void oglCentreText(wxDC& dc, wxList *text_list,
double y = (double)(i*char_height + yoffset);
line->SetX( x - xOffset ); line->SetY( y - yOffset );
current = current->Next();
current = current->GetNext();
i ++;
}
@@ -312,7 +314,7 @@ void oglCentreTextNoClipping(wxDC& dc, wxList *text_list,
if (current_width > max_width)
max_width = current_width;
current = current->Next();
current = current->GetNext();
i ++;
}
@@ -333,7 +335,7 @@ void oglCentreTextNoClipping(wxDC& dc, wxList *text_list,
double y = (double)(i*char_height + yoffset);
line->SetX( x - m_xpos ); line->SetY( y - m_ypos );
current = current->Next();
current = current->GetNext();
i ++;
}
delete widths;
@@ -367,7 +369,7 @@ void oglGetCentredTextExtent(wxDC& dc, wxList *text_list,
if (current_width > max_width)
max_width = current_width;
current = current->Next();
current = current->GetNext();
i ++;
}
@@ -445,7 +447,7 @@ wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double
char buffer[400];
buffer[0] = 0;
wxNode *node = word_list.First();
wxStringListNode *node = word_list.GetFirst();
long x, y;
while (node)
@@ -481,7 +483,7 @@ wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double
}
}
node = node->Next();
node = node->GetNext();
}
if (buffer[0] != 0)
string_list->Add(buffer);
@@ -514,7 +516,7 @@ void oglDrawFormattedText(wxDC& dc, wxList *text_list,
wxShapeTextLine *line = (wxShapeTextLine *)current->GetData();
dc.DrawText(line->GetText(), WXROUND(xoffset + line->GetX()), WXROUND(yoffset + line->GetY()));
current = current->Next();
current = current->GetNext();
}
dc.DestroyClippingRegion();
@@ -536,7 +538,7 @@ void oglFindPolylineCentroid(wxList *points, double *x, double *y)
wxRealPoint *point = (wxRealPoint *)node->GetData();
xcount += point->x;
ycount += point->y;
node = node->Next();
node = node->GetNext();
}
*x = (xcount/points->GetCount());
@@ -813,7 +815,7 @@ void UpdateListBox(wxListBox *item, wxList *list)
{
char *s = (char *)node->GetData();
item->Append(s);
node = node->Next();
node = node->GetNext();
}
}