mirror of
https://github.com/wxWidgets/wxWidgets.git
synced 2026-08-20 22:06:25 +08:00
Added wxAccelerators (sort of)
Moved configure (once again) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -58,7 +58,7 @@ user::
|
||||
makefiles:: recreate
|
||||
Makefiles:: recreate
|
||||
recreate::
|
||||
@install/unix/setup/general/createall
|
||||
@setup/general/createall
|
||||
|
||||
# the following ones define what needs to be done to distribute the
|
||||
# library and its components
|
||||
|
||||
+599
File diff suppressed because it is too large
Load Diff
+927
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
+1552
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,106 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: accel.h
|
||||
// Purpose: wxAcceleratorTable class
|
||||
// Author: Robert
|
||||
// Modified by:
|
||||
// RCS-ID:
|
||||
// Copyright: (c) Robert Roebling
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef __GTKACCELH__
|
||||
#define __GTKACCELH__
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma interface "accel.h"
|
||||
#endif
|
||||
|
||||
#include "wx/defs.h"
|
||||
#include "wx/object.h"
|
||||
#include "wx/event.h"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// classes
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class wxAcceleratorEntry;
|
||||
class wxAcceleratorTable;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// constants
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
extern wxAcceleratorTable wxNullAcceleratorTable;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// constants
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
// Hold Ctrl key down
|
||||
#define wxACCEL_ALT 0x01
|
||||
|
||||
// Hold Ctrl key down
|
||||
#define wxACCEL_CTRL 0x02
|
||||
|
||||
// Hold Shift key down
|
||||
#define wxACCEL_SHIFT 0x04
|
||||
|
||||
// Hold no other key
|
||||
#define wxACCEL_NORMAL 0x00
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxAcceleratorEntry
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class wxAcceleratorEntry
|
||||
{
|
||||
public:
|
||||
|
||||
wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0)
|
||||
{ m_flags = flags; m_keyCode = keyCode; m_command = cmd; }
|
||||
|
||||
inline void Set(int flags, int keyCode, int cmd)
|
||||
{ m_flags = flags; m_keyCode = keyCode; m_command = cmd; }
|
||||
|
||||
inline int GetFlags() const { return m_flags; }
|
||||
inline int GetKeyCode() const { return m_keyCode; }
|
||||
inline int GetCommand() const { return m_command; }
|
||||
|
||||
int m_flags;
|
||||
int m_keyCode; // ASCII or virtual keycode
|
||||
int m_command; // Command id to generate
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxAcceleratorTable
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class wxAcceleratorTable: public wxObject
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
|
||||
|
||||
public:
|
||||
wxAcceleratorTable();
|
||||
wxAcceleratorTable(int n, wxAcceleratorEntry entries[] );
|
||||
~wxAcceleratorTable();
|
||||
|
||||
inline wxAcceleratorTable(const wxAcceleratorTable& accel)
|
||||
{ Ref(accel); }
|
||||
inline wxAcceleratorTable(const wxAcceleratorTable* accel)
|
||||
{ if (accel) Ref(*accel); }
|
||||
inline wxAcceleratorTable& operator = (const wxAcceleratorTable& accel)
|
||||
{ if (*this == accel) return (*this); Ref(accel); return *this; }
|
||||
inline bool operator == (const wxAcceleratorTable& accel)
|
||||
{ return m_refData == accel.m_refData; }
|
||||
inline bool operator != (const wxAcceleratorTable& accel)
|
||||
{ return m_refData != accel.m_refData; }
|
||||
|
||||
bool Ok() const;
|
||||
|
||||
// private:
|
||||
|
||||
int GetCommand( wxKeyEvent &event );
|
||||
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -15,6 +15,7 @@
|
||||
#pragma interface
|
||||
#endif
|
||||
|
||||
#include "wx/defs.h"
|
||||
#include "wx/window.h"
|
||||
#include "wx/frame.h"
|
||||
|
||||
|
||||
+50
-49
@@ -26,6 +26,7 @@
|
||||
#include "wx/dc.h"
|
||||
#include "wx/region.h"
|
||||
#include "wx/dnd.h"
|
||||
#include "wx/accel.h"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// global data
|
||||
@@ -77,8 +78,10 @@ public:
|
||||
const wxString& name = wxPanelNameStr);
|
||||
virtual ~wxWindow();
|
||||
|
||||
virtual bool LoadFromResource(wxWindow *parent, const wxString& resourceName, const wxResourceTable *table = (const wxResourceTable *) NULL);
|
||||
virtual wxControl *CreateItem(const wxItemResource *childResource, const wxResourceTable *table = (const wxResourceTable *) NULL);
|
||||
virtual bool LoadFromResource( wxWindow *parent, const wxString& resourceName,
|
||||
const wxResourceTable *table = (const wxResourceTable *) NULL);
|
||||
virtual wxControl *CreateItem( const wxItemResource *childResource,
|
||||
const wxResourceTable *table = (const wxResourceTable *) NULL);
|
||||
|
||||
bool Close( bool force = FALSE );
|
||||
virtual bool Destroy();
|
||||
@@ -131,6 +134,9 @@ public:
|
||||
virtual wxValidator *GetValidator();
|
||||
virtual void SetValidator( const wxValidator &validator );
|
||||
|
||||
virtual void SetAcceleratorTable( const wxAcceleratorTable& accel );
|
||||
virtual wxAcceleratorTable *GetAcceleratorTable() { return &m_acceleratorTable; }
|
||||
|
||||
bool IsBeingDeleted();
|
||||
|
||||
void SetId( wxWindowID id );
|
||||
@@ -211,11 +217,6 @@ public:
|
||||
virtual void SetDropTarget( wxDropTarget *dropTarget );
|
||||
virtual wxDropTarget *GetDropTarget() const;
|
||||
|
||||
//private:
|
||||
virtual GtkWidget* GetConnectWidget(void);
|
||||
virtual bool IsOwnGtkWindow( GdkWindow *window );
|
||||
|
||||
public:
|
||||
virtual void SetScrollbar( int orient, int pos, int thumbVisible,
|
||||
int range, bool refresh = TRUE );
|
||||
virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
|
||||
@@ -224,15 +225,14 @@ public:
|
||||
virtual int GetScrollRange( int orient ) const;
|
||||
virtual void ScrollWindow( int dx, int dy, const wxRect* rect = (wxRect *) NULL );
|
||||
|
||||
// return FALSE from here if the window doesn't want the focus
|
||||
virtual bool AcceptsFocus() const;
|
||||
|
||||
// update the UI state (called from OnIdle)
|
||||
void UpdateWindowUI();
|
||||
|
||||
|
||||
public: // cannot get private going yet
|
||||
|
||||
virtual GtkWidget* GetConnectWidget(void);
|
||||
virtual bool IsOwnGtkWindow( GdkWindow *window );
|
||||
|
||||
void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos,
|
||||
const wxSize &size, long style, const wxString &name );
|
||||
void PostCreation();
|
||||
@@ -240,47 +240,48 @@ public: // cannot get private going yet
|
||||
virtual void ImplementSetSize();
|
||||
virtual void ImplementSetPosition();
|
||||
|
||||
wxWindow *m_parent;
|
||||
wxList m_children;
|
||||
int m_x,m_y;
|
||||
int m_width,m_height;
|
||||
int m_minWidth,m_minHeight;
|
||||
int m_maxWidth,m_maxHeight;
|
||||
int m_retCode;
|
||||
wxEvtHandler *m_eventHandler;
|
||||
wxValidator *m_windowValidator;
|
||||
wxDropTarget *m_pDropTarget;
|
||||
wxWindowID m_windowId;
|
||||
wxCursor *m_cursor;
|
||||
wxFont m_font;
|
||||
wxColour m_backgroundColour;
|
||||
wxColour m_defaultBackgroundColour;
|
||||
wxColour m_foregroundColour ;
|
||||
wxColour m_defaultForegroundColour;
|
||||
wxRegion m_updateRegion;
|
||||
long m_windowStyle;
|
||||
bool m_isShown;
|
||||
bool m_isEnabled;
|
||||
wxString m_windowName;
|
||||
wxWindow *m_parent;
|
||||
wxList m_children;
|
||||
int m_x,m_y;
|
||||
int m_width,m_height;
|
||||
int m_minWidth,m_minHeight;
|
||||
int m_maxWidth,m_maxHeight;
|
||||
int m_retCode;
|
||||
wxEvtHandler *m_eventHandler;
|
||||
wxValidator *m_windowValidator;
|
||||
wxDropTarget *m_pDropTarget;
|
||||
wxWindowID m_windowId;
|
||||
wxCursor *m_cursor;
|
||||
wxFont m_font;
|
||||
wxColour m_backgroundColour;
|
||||
wxColour m_defaultBackgroundColour;
|
||||
wxColour m_foregroundColour ;
|
||||
wxColour m_defaultForegroundColour;
|
||||
wxRegion m_updateRegion;
|
||||
long m_windowStyle;
|
||||
bool m_isShown;
|
||||
bool m_isEnabled;
|
||||
wxString m_windowName;
|
||||
wxAcceleratorTable m_acceleratorTable;
|
||||
|
||||
GtkWidget *m_widget;
|
||||
GtkWidget *m_wxwindow;
|
||||
GtkAdjustment *m_hAdjust,*m_vAdjust;
|
||||
float m_oldHorizontalPos;
|
||||
float m_oldVerticalPos;
|
||||
bool m_needParent;
|
||||
bool m_hasScrolling;
|
||||
bool m_hasVMT;
|
||||
bool m_sizeSet;
|
||||
bool m_resizing;
|
||||
GtkWidget *m_widget;
|
||||
GtkWidget *m_wxwindow;
|
||||
GtkAdjustment *m_hAdjust,*m_vAdjust;
|
||||
float m_oldHorizontalPos;
|
||||
float m_oldVerticalPos;
|
||||
bool m_needParent;
|
||||
bool m_hasScrolling;
|
||||
bool m_hasVMT;
|
||||
bool m_sizeSet;
|
||||
bool m_resizing;
|
||||
|
||||
public: // Layout section
|
||||
public:
|
||||
|
||||
wxLayoutConstraints * m_constraints;
|
||||
wxList * m_constraintsInvolvedIn;
|
||||
wxSizer * m_windowSizer;
|
||||
wxWindow * m_sizerParent;
|
||||
bool m_autoLayout;
|
||||
wxLayoutConstraints *m_constraints;
|
||||
wxList *m_constraintsInvolvedIn;
|
||||
wxSizer *m_windowSizer;
|
||||
wxWindow *m_sizerParent;
|
||||
bool m_autoLayout;
|
||||
|
||||
wxLayoutConstraints *GetConstraints() const;
|
||||
void SetConstraints( wxLayoutConstraints *constraints );
|
||||
|
||||
@@ -0,0 +1,106 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: accel.h
|
||||
// Purpose: wxAcceleratorTable class
|
||||
// Author: Robert
|
||||
// Modified by:
|
||||
// RCS-ID:
|
||||
// Copyright: (c) Robert Roebling
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef __GTKACCELH__
|
||||
#define __GTKACCELH__
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma interface "accel.h"
|
||||
#endif
|
||||
|
||||
#include "wx/defs.h"
|
||||
#include "wx/object.h"
|
||||
#include "wx/event.h"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// classes
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class wxAcceleratorEntry;
|
||||
class wxAcceleratorTable;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// constants
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
extern wxAcceleratorTable wxNullAcceleratorTable;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// constants
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
// Hold Ctrl key down
|
||||
#define wxACCEL_ALT 0x01
|
||||
|
||||
// Hold Ctrl key down
|
||||
#define wxACCEL_CTRL 0x02
|
||||
|
||||
// Hold Shift key down
|
||||
#define wxACCEL_SHIFT 0x04
|
||||
|
||||
// Hold no other key
|
||||
#define wxACCEL_NORMAL 0x00
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxAcceleratorEntry
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class wxAcceleratorEntry
|
||||
{
|
||||
public:
|
||||
|
||||
wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0)
|
||||
{ m_flags = flags; m_keyCode = keyCode; m_command = cmd; }
|
||||
|
||||
inline void Set(int flags, int keyCode, int cmd)
|
||||
{ m_flags = flags; m_keyCode = keyCode; m_command = cmd; }
|
||||
|
||||
inline int GetFlags() const { return m_flags; }
|
||||
inline int GetKeyCode() const { return m_keyCode; }
|
||||
inline int GetCommand() const { return m_command; }
|
||||
|
||||
int m_flags;
|
||||
int m_keyCode; // ASCII or virtual keycode
|
||||
int m_command; // Command id to generate
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxAcceleratorTable
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class wxAcceleratorTable: public wxObject
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
|
||||
|
||||
public:
|
||||
wxAcceleratorTable();
|
||||
wxAcceleratorTable(int n, wxAcceleratorEntry entries[] );
|
||||
~wxAcceleratorTable();
|
||||
|
||||
inline wxAcceleratorTable(const wxAcceleratorTable& accel)
|
||||
{ Ref(accel); }
|
||||
inline wxAcceleratorTable(const wxAcceleratorTable* accel)
|
||||
{ if (accel) Ref(*accel); }
|
||||
inline wxAcceleratorTable& operator = (const wxAcceleratorTable& accel)
|
||||
{ if (*this == accel) return (*this); Ref(accel); return *this; }
|
||||
inline bool operator == (const wxAcceleratorTable& accel)
|
||||
{ return m_refData == accel.m_refData; }
|
||||
inline bool operator != (const wxAcceleratorTable& accel)
|
||||
{ return m_refData != accel.m_refData; }
|
||||
|
||||
bool Ok() const;
|
||||
|
||||
// private:
|
||||
|
||||
int GetCommand( wxKeyEvent &event );
|
||||
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -15,6 +15,7 @@
|
||||
#pragma interface
|
||||
#endif
|
||||
|
||||
#include "wx/defs.h"
|
||||
#include "wx/window.h"
|
||||
#include "wx/frame.h"
|
||||
|
||||
|
||||
+50
-49
@@ -26,6 +26,7 @@
|
||||
#include "wx/dc.h"
|
||||
#include "wx/region.h"
|
||||
#include "wx/dnd.h"
|
||||
#include "wx/accel.h"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// global data
|
||||
@@ -77,8 +78,10 @@ public:
|
||||
const wxString& name = wxPanelNameStr);
|
||||
virtual ~wxWindow();
|
||||
|
||||
virtual bool LoadFromResource(wxWindow *parent, const wxString& resourceName, const wxResourceTable *table = (const wxResourceTable *) NULL);
|
||||
virtual wxControl *CreateItem(const wxItemResource *childResource, const wxResourceTable *table = (const wxResourceTable *) NULL);
|
||||
virtual bool LoadFromResource( wxWindow *parent, const wxString& resourceName,
|
||||
const wxResourceTable *table = (const wxResourceTable *) NULL);
|
||||
virtual wxControl *CreateItem( const wxItemResource *childResource,
|
||||
const wxResourceTable *table = (const wxResourceTable *) NULL);
|
||||
|
||||
bool Close( bool force = FALSE );
|
||||
virtual bool Destroy();
|
||||
@@ -131,6 +134,9 @@ public:
|
||||
virtual wxValidator *GetValidator();
|
||||
virtual void SetValidator( const wxValidator &validator );
|
||||
|
||||
virtual void SetAcceleratorTable( const wxAcceleratorTable& accel );
|
||||
virtual wxAcceleratorTable *GetAcceleratorTable() { return &m_acceleratorTable; }
|
||||
|
||||
bool IsBeingDeleted();
|
||||
|
||||
void SetId( wxWindowID id );
|
||||
@@ -211,11 +217,6 @@ public:
|
||||
virtual void SetDropTarget( wxDropTarget *dropTarget );
|
||||
virtual wxDropTarget *GetDropTarget() const;
|
||||
|
||||
//private:
|
||||
virtual GtkWidget* GetConnectWidget(void);
|
||||
virtual bool IsOwnGtkWindow( GdkWindow *window );
|
||||
|
||||
public:
|
||||
virtual void SetScrollbar( int orient, int pos, int thumbVisible,
|
||||
int range, bool refresh = TRUE );
|
||||
virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
|
||||
@@ -224,15 +225,14 @@ public:
|
||||
virtual int GetScrollRange( int orient ) const;
|
||||
virtual void ScrollWindow( int dx, int dy, const wxRect* rect = (wxRect *) NULL );
|
||||
|
||||
// return FALSE from here if the window doesn't want the focus
|
||||
virtual bool AcceptsFocus() const;
|
||||
|
||||
// update the UI state (called from OnIdle)
|
||||
void UpdateWindowUI();
|
||||
|
||||
|
||||
public: // cannot get private going yet
|
||||
|
||||
virtual GtkWidget* GetConnectWidget(void);
|
||||
virtual bool IsOwnGtkWindow( GdkWindow *window );
|
||||
|
||||
void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos,
|
||||
const wxSize &size, long style, const wxString &name );
|
||||
void PostCreation();
|
||||
@@ -240,47 +240,48 @@ public: // cannot get private going yet
|
||||
virtual void ImplementSetSize();
|
||||
virtual void ImplementSetPosition();
|
||||
|
||||
wxWindow *m_parent;
|
||||
wxList m_children;
|
||||
int m_x,m_y;
|
||||
int m_width,m_height;
|
||||
int m_minWidth,m_minHeight;
|
||||
int m_maxWidth,m_maxHeight;
|
||||
int m_retCode;
|
||||
wxEvtHandler *m_eventHandler;
|
||||
wxValidator *m_windowValidator;
|
||||
wxDropTarget *m_pDropTarget;
|
||||
wxWindowID m_windowId;
|
||||
wxCursor *m_cursor;
|
||||
wxFont m_font;
|
||||
wxColour m_backgroundColour;
|
||||
wxColour m_defaultBackgroundColour;
|
||||
wxColour m_foregroundColour ;
|
||||
wxColour m_defaultForegroundColour;
|
||||
wxRegion m_updateRegion;
|
||||
long m_windowStyle;
|
||||
bool m_isShown;
|
||||
bool m_isEnabled;
|
||||
wxString m_windowName;
|
||||
wxWindow *m_parent;
|
||||
wxList m_children;
|
||||
int m_x,m_y;
|
||||
int m_width,m_height;
|
||||
int m_minWidth,m_minHeight;
|
||||
int m_maxWidth,m_maxHeight;
|
||||
int m_retCode;
|
||||
wxEvtHandler *m_eventHandler;
|
||||
wxValidator *m_windowValidator;
|
||||
wxDropTarget *m_pDropTarget;
|
||||
wxWindowID m_windowId;
|
||||
wxCursor *m_cursor;
|
||||
wxFont m_font;
|
||||
wxColour m_backgroundColour;
|
||||
wxColour m_defaultBackgroundColour;
|
||||
wxColour m_foregroundColour ;
|
||||
wxColour m_defaultForegroundColour;
|
||||
wxRegion m_updateRegion;
|
||||
long m_windowStyle;
|
||||
bool m_isShown;
|
||||
bool m_isEnabled;
|
||||
wxString m_windowName;
|
||||
wxAcceleratorTable m_acceleratorTable;
|
||||
|
||||
GtkWidget *m_widget;
|
||||
GtkWidget *m_wxwindow;
|
||||
GtkAdjustment *m_hAdjust,*m_vAdjust;
|
||||
float m_oldHorizontalPos;
|
||||
float m_oldVerticalPos;
|
||||
bool m_needParent;
|
||||
bool m_hasScrolling;
|
||||
bool m_hasVMT;
|
||||
bool m_sizeSet;
|
||||
bool m_resizing;
|
||||
GtkWidget *m_widget;
|
||||
GtkWidget *m_wxwindow;
|
||||
GtkAdjustment *m_hAdjust,*m_vAdjust;
|
||||
float m_oldHorizontalPos;
|
||||
float m_oldVerticalPos;
|
||||
bool m_needParent;
|
||||
bool m_hasScrolling;
|
||||
bool m_hasVMT;
|
||||
bool m_sizeSet;
|
||||
bool m_resizing;
|
||||
|
||||
public: // Layout section
|
||||
public:
|
||||
|
||||
wxLayoutConstraints * m_constraints;
|
||||
wxList * m_constraintsInvolvedIn;
|
||||
wxSizer * m_windowSizer;
|
||||
wxWindow * m_sizerParent;
|
||||
bool m_autoLayout;
|
||||
wxLayoutConstraints *m_constraints;
|
||||
wxList *m_constraintsInvolvedIn;
|
||||
wxSizer *m_windowSizer;
|
||||
wxWindow *m_sizerParent;
|
||||
bool m_autoLayout;
|
||||
|
||||
wxLayoutConstraints *GetConstraints() const;
|
||||
void SetConstraints( wxLayoutConstraints *constraints );
|
||||
|
||||
+1
-1
@@ -199,7 +199,7 @@ class WXDLLEXPORT wxObject
|
||||
|
||||
protected:
|
||||
wxObjectRefData *m_refData;
|
||||
#ifdef USE_STORABLE_CLASSES
|
||||
#ifdef USE_SERIAL
|
||||
wxObject_Serialize *m_serialObj;
|
||||
#endif
|
||||
};
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@
|
||||
#elif defined(__WXSTUBS__)
|
||||
#include "wx/stubs/setup.h"
|
||||
#elif defined(__WXGTK__)
|
||||
#include "wx/../../install/unix/setup/setup.h"
|
||||
#include "wx/../../setup/setup.h"
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
+1
-1
@@ -65,7 +65,7 @@
|
||||
#include "wx/dirdlg.h"
|
||||
#include "wx/cmndata.h"
|
||||
#include "wx/intl.h"
|
||||
#ifdef USE_STORABLE_CLASSES
|
||||
#ifdef USE_SERIAL
|
||||
#include "wx/objstrm.h"
|
||||
#include "wx/serbase.h"
|
||||
#endif
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
include ../install/unix/setup/general/makedirs
|
||||
include ../setup/general/makedirs
|
||||
|
||||
@@ -1 +1 @@
|
||||
include ../../install/unix/setup/general/makeapp
|
||||
include ../../setup/general/makeapp
|
||||
|
||||
@@ -1 +1 @@
|
||||
include ../../install/unix/setup/general/makeapp
|
||||
include ../../setup/general/makeapp
|
||||
|
||||
@@ -1 +1 @@
|
||||
include ../../install/unix/setup/general/makeapp
|
||||
include ../../setup/general/makeapp
|
||||
|
||||
@@ -1 +1 @@
|
||||
include ../../install/unix/setup/general/makeapp
|
||||
include ../../setup/general/makeapp
|
||||
|
||||
@@ -1 +1 @@
|
||||
include ../../install/unix/setup/general/makeapp
|
||||
include ../../setup/general/makeapp
|
||||
|
||||
@@ -1 +1 @@
|
||||
include ../../install/unix/setup/general/makeapp
|
||||
include ../../setup/general/makeapp
|
||||
|
||||
@@ -1 +1 @@
|
||||
include ../../install/unix/setup/general/makeapp
|
||||
include ../../setup/general/makeapp
|
||||
|
||||
@@ -1 +1 @@
|
||||
include ../../install/unix/setup/general/makeapp
|
||||
include ../../setup/general/makeapp
|
||||
|
||||
@@ -1 +1 @@
|
||||
include ../../install/unix/setup/general/makeapp
|
||||
include ../../setup/general/makeapp
|
||||
|
||||
@@ -1 +1 @@
|
||||
include ../../install/unix/setup/general/makeapp
|
||||
include ../../setup/general/makeapp
|
||||
|
||||
@@ -1 +1 @@
|
||||
include ../../install/unix/setup/general/makeapp
|
||||
include ../../setup/general/makeapp
|
||||
|
||||
@@ -1 +1 @@
|
||||
include ../../install/unix/setup/general/makeapp
|
||||
include ../../setup/general/makeapp
|
||||
|
||||
@@ -1 +1 @@
|
||||
include ../../install/unix/setup/general/makeapp
|
||||
include ../../setup/general/makeapp
|
||||
|
||||
@@ -1 +1 @@
|
||||
include ../../install/unix/setup/general/makeapp
|
||||
include ../../setup/general/makeapp
|
||||
|
||||
@@ -1 +1 @@
|
||||
include ../../install/unix/setup/general/makeapp
|
||||
include ../../setup/general/makeapp
|
||||
|
||||
@@ -1 +1 @@
|
||||
include ../../install/unix/setup/general/makeapp
|
||||
include ../../setup/general/makeapp
|
||||
|
||||
@@ -1 +1 @@
|
||||
include ../../install/unix/setup/general/makeapp
|
||||
include ../../setup/general/makeapp
|
||||
|
||||
@@ -1 +1 @@
|
||||
include ../../install/unix/setup/general/makeapp
|
||||
include ../../setup/general/makeapp
|
||||
|
||||
@@ -1 +1 @@
|
||||
include ../../install/unix/setup/general/makeapp
|
||||
include ../../setup/general/makeapp
|
||||
|
||||
@@ -1 +1 @@
|
||||
include ../../install/unix/setup/general/makeapp
|
||||
include ../../setup/general/makeapp
|
||||
|
||||
@@ -1 +1 @@
|
||||
include ../../install/unix/setup/general/makeapp
|
||||
include ../../setup/general/makeapp
|
||||
|
||||
@@ -1 +1 @@
|
||||
include ../../install/unix/setup/general/makeapp
|
||||
include ../../setup/general/makeapp
|
||||
|
||||
@@ -1 +1 @@
|
||||
include ../../install/unix/setup/general/makeapp
|
||||
include ../../setup/general/makeapp
|
||||
|
||||
@@ -1 +1 @@
|
||||
include ../../install/unix/setup/general/makeapp
|
||||
include ../../setup/general/makeapp
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
Makefile
|
||||
Linux
|
||||
linux-gnu
|
||||
setup.h
|
||||
Executable
+106
@@ -0,0 +1,106 @@
|
||||
#! /bin/sh
|
||||
|
||||
# Just grab dirbase/dir(s)
|
||||
readbase ()
|
||||
{
|
||||
DIRBASE=$1
|
||||
DIRCONTENTS=$2
|
||||
for each in $DIRBASE/*
|
||||
do
|
||||
if test -d $each
|
||||
then
|
||||
DIRCONTENTS="$DIRCONTENTS $each"
|
||||
fi
|
||||
done
|
||||
echo $DIRCONTENTS
|
||||
}
|
||||
|
||||
# Prefer subdir/src over subdir, use whichever available
|
||||
readbase2 ()
|
||||
{
|
||||
DIRBASE=$1
|
||||
DIRCONTENTS=$2
|
||||
for each in $DIRBASE/*
|
||||
do
|
||||
if test -d $each
|
||||
then
|
||||
if test -d $each/src
|
||||
then
|
||||
DIRCONTENTS="$DIRCONTENTS $each/src"
|
||||
else
|
||||
DIRCONTENTS="$DIRCONTENTS $each"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
echo $DIRCONTENTS
|
||||
}
|
||||
|
||||
OS=$OSTYPE
|
||||
|
||||
if test "x$OS" = x; then
|
||||
echo "please set the environment variable OSTYPE "
|
||||
echo "to a value appropriate for your system."
|
||||
echo "to do so type: setenv OSTYPE `uname` for the csh, tcsh"
|
||||
echo " export OSTYPE=`uname` for other shells"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
SRC_DIR=`readbase src src`
|
||||
SAMPLES_DIR=`readbase2 samples`
|
||||
UTILS_DIR=`readbase2 utils`
|
||||
USER_DIR=`readbase2 user`
|
||||
|
||||
ALL_DIR="$SRC_DIR $SAMPLES_DIR $UTILS_DIR $USER_DIR"
|
||||
|
||||
echo Creating for: $OS
|
||||
|
||||
# create defaults
|
||||
if test ! -d setup/$OS; then
|
||||
mkdir setup/$OS
|
||||
fi
|
||||
|
||||
SUBSTFILE=setup/$OS/substit
|
||||
|
||||
# the substit file first
|
||||
if test -f setup/substit ; then
|
||||
cat setup/substit | sed "s/*/@/g" > $SUBSTFILE;
|
||||
rm -f setup/substit
|
||||
fi
|
||||
# now the template file
|
||||
cat setup/maketmpl.in | sed -f $SUBSTFILE > setup/$OS/maketmpl
|
||||
|
||||
# now the config header file
|
||||
#if test -f setup/wx_setup.h ; then
|
||||
# cat setup/wx_setup.h > setup/$OS/wx_setup.h;
|
||||
# rm -f setup/wx_setup.h
|
||||
#fi
|
||||
|
||||
# create lib and bin directory
|
||||
if test ! -d lib; then
|
||||
mkdir lib
|
||||
fi
|
||||
if test ! -d lib/$OS; then
|
||||
mkdir lib/$OS
|
||||
fi
|
||||
if test ! -d bin; then
|
||||
mkdir bin
|
||||
fi
|
||||
if test ! -d bin/$OS; then
|
||||
mkdir bin/$OS
|
||||
fi
|
||||
|
||||
# create makefiles
|
||||
for each in $ALL_DIR; do
|
||||
DIR=$each/$OS
|
||||
# create Makefile in directory
|
||||
if test -r $each/Makefile.in ; then
|
||||
# create directory
|
||||
if test ! -d $DIR; then
|
||||
echo "Creating Directory: $DIR..."
|
||||
mkdir $DIR
|
||||
fi
|
||||
echo "Creating: $DIR/Makefile..."
|
||||
cat $each/Makefile.in | sed -f $SUBSTFILE > $DIR/Makefile
|
||||
(cd $DIR; make subdirs > /dev/null;)
|
||||
fi
|
||||
done
|
||||
Executable
+67
@@ -0,0 +1,67 @@
|
||||
#! /bin/sh
|
||||
#
|
||||
# Written by Martin Sperl
|
||||
# (sperl@dsn.ast.univie.ac.at)
|
||||
#
|
||||
|
||||
|
||||
if test $# -lt 3 ; then
|
||||
cat <<EOF
|
||||
Usage: `basename $0` <basedir> <SOURCE-FILES> <DESTINATION-FILS>
|
||||
copies all files from the source-tar-files to the common
|
||||
destination-tar-file with basedir as a common base directory.
|
||||
EOF
|
||||
exit 0
|
||||
fi
|
||||
|
||||
BaseDir="$1"
|
||||
shift
|
||||
|
||||
Sourcefiles="$1"
|
||||
|
||||
while test "$#" != 2 ; do
|
||||
shift
|
||||
Sourcefiles="$Sourcefiles $1"
|
||||
done
|
||||
|
||||
shift
|
||||
Final=$1
|
||||
|
||||
Destination=/tmp/join$$.tar
|
||||
|
||||
touch $Destination
|
||||
|
||||
curdir=`pwd`
|
||||
|
||||
mkdir tmp$$
|
||||
mkdir tmp$$/$BaseDir
|
||||
|
||||
#uncompress all files
|
||||
cd tmp$$/$BaseDir
|
||||
for each in $Sourcefiles ; do
|
||||
( \
|
||||
if test `basename $each gz` != `basename $each` ; then \
|
||||
gzip -dc ../../$each;\
|
||||
else \
|
||||
cat ../../$each;\
|
||||
fi; \
|
||||
) | tar xf -
|
||||
done
|
||||
cd ..
|
||||
#now tar everything
|
||||
tar -cf $Destination *
|
||||
|
||||
cd ..
|
||||
|
||||
rm -fr tmp$$
|
||||
|
||||
# goto old directory
|
||||
cd $curdir
|
||||
|
||||
if test `basename $Final gz` != `basename $Final` ; then
|
||||
gzip -c $Destination > $Final
|
||||
else
|
||||
cat $Destination > $Final
|
||||
fi
|
||||
|
||||
rm -f $Destination
|
||||
@@ -0,0 +1,73 @@
|
||||
SHELL=/bin/sh
|
||||
|
||||
OS=$(OSTYPE)
|
||||
|
||||
all::
|
||||
-@if test "x$(OS)" = x; then \
|
||||
echo "please set the environment variable OSTYPE ";\
|
||||
echo "to a value appropriate for your system.";\
|
||||
echo "to do so type: setenv OSTYPE `uname` for the csh, tcsh";\
|
||||
echo " export OSTYPE=`uname` for other shells";\
|
||||
else \
|
||||
if test -f Makefile.in ; then \
|
||||
if test -f $(OS)/Makefile ; then \
|
||||
NEEDED=`(cd $(OS); ${MAKE} checkneeds;) | grep "needed to compile" `;\
|
||||
if test "x$$NEEDED" = x; then \
|
||||
(cd $(OS); ${MAKE} $@); \
|
||||
else \
|
||||
(cd $(OS); ${MAKE} checkneeds); \
|
||||
fi ; \
|
||||
else \
|
||||
echo "Did you configure your system?";\
|
||||
fi; \
|
||||
fi; \
|
||||
fi;
|
||||
|
||||
distrib::
|
||||
@if test ! -d ../../distrib ; then mkdir ../../distrib; fi;
|
||||
@if test ! -f ../../system.list ; then \
|
||||
echo "dummy" > ../../system.list;\
|
||||
fi
|
||||
@(curr=`pwd`; direc=`basename $$curr`;\
|
||||
basedir=`dirname $$curr`;\
|
||||
basedirname=`basename $$basedir`;\
|
||||
if test ! -d ../../distrib/$$basedirname ; then \
|
||||
mkdir ../../distrib/$$basedirname;\
|
||||
fi;\
|
||||
if test -d doc; then (cd doc; make clean;); fi;\
|
||||
(cd ..; \
|
||||
echo creating $$direc.tar from the current directory;\
|
||||
files="`\
|
||||
find $$direc -type f \
|
||||
| fgrep -vf ../system.list \
|
||||
| grep -v "~" \
|
||||
| grep -v "#" \
|
||||
` $(DISTRIBUTE_ADDITIONAL)";\
|
||||
tar -cf /tmp/$$direc.tar $$files;\
|
||||
echo compressing $$direc.tar to $$direc.tgz;\
|
||||
gzip -c /tmp/$$direc.tar > ../distrib/$$basedirname/$$direc.tgz;\
|
||||
rm /tmp/$$direc.tar;\
|
||||
)\
|
||||
)
|
||||
|
||||
.DEFAULT:
|
||||
-@if test "x$(OS)" = x; then \
|
||||
echo "please set the environment variable OSTYPE ";\
|
||||
echo "to a value appropriate for your system.";\
|
||||
echo "to do so type: setenv OSTYPE `uname` for the csh, tcsh";\
|
||||
echo " export OSTYPE=`uname` for other shells";\
|
||||
else \
|
||||
if test -f Makefile.in ; then \
|
||||
if test -f $(OS)/Makefile ; then \
|
||||
NEEDED=`(cd $(OS); ${MAKE} checkneeds) | grep "needed to compile" `;\
|
||||
if test "x$$NEEDED" = x; then \
|
||||
(cd $(OS); ${MAKE} $@); \
|
||||
else \
|
||||
(cd $(OS); ${MAKE} checkneeds); \
|
||||
fi ; \
|
||||
else \
|
||||
echo "Did you configure your system?";\
|
||||
fi \
|
||||
fi \
|
||||
fi
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
SHELL=/bin/sh
|
||||
|
||||
DIRS=`find . -print | sed "s|\./||g" | grep -v "/" | grep -v "\." `
|
||||
|
||||
all:
|
||||
@for i in $(DIRS) xxx; do \
|
||||
if test -r $$i/Makefile ; then \
|
||||
echo "entering directory $$i building $@";\
|
||||
(cd $$i ; ${MAKE} $@); \
|
||||
fi; \
|
||||
done
|
||||
|
||||
.DEFAULT:
|
||||
@for i in $(DIRS) xxx; do \
|
||||
if test -r $$i/Makefile ; then \
|
||||
echo "entering directory $$i building $@";\
|
||||
(cd $$i ; ${MAKE} $@); \
|
||||
fi; \
|
||||
done
|
||||
@@ -0,0 +1,102 @@
|
||||
SHELL=/bin/sh
|
||||
|
||||
FILE_BASE=$(TEX_BASE:.tex=)
|
||||
|
||||
BMP_FILES=$(XPM_FILES:.xpm=.bmp)
|
||||
EPS_FILES=$(XPM_FILES:.xpm=.eps)
|
||||
GIF_FILES=$(XPM_FILES:.xpm=.gif)
|
||||
|
||||
HTML_BUTTONS=back.gif forward.gif contents.gif up.gif
|
||||
|
||||
all:: doc
|
||||
|
||||
clean::
|
||||
@ for each in $(DIRS) . ; do \
|
||||
( cd $$each; \
|
||||
rm -f *.bmp *.eps *.gif *.aux *.dvi *.log \
|
||||
*.ps *.toc *~ *.idx *.hlp *.html \
|
||||
*.rtf *.ref *.xlp *.con *.win *.fts \
|
||||
*.hpj *.HLP; \
|
||||
); done
|
||||
|
||||
doc:: doc_ps doc_html doc_xlp doc_winhelp doc_rtf
|
||||
|
||||
#############################################
|
||||
|
||||
doc_ps:: $(FILE_BASE).ps
|
||||
|
||||
$(FILE_BASE).ps: $(FILE_BASE).dvi
|
||||
dvips $(FILE_BASE).dvi -o$@
|
||||
|
||||
#############################################
|
||||
|
||||
doc_dvi:: $(FILE_BASE).dvi
|
||||
|
||||
$(FILE_BASE).dvi: $(FILE_BASE).tex $(TEX_ADDITIONAL) $(EPS_FILES)
|
||||
latex $(FILE_BASE).tex
|
||||
latex $(FILE_BASE).tex
|
||||
|
||||
#############################################
|
||||
|
||||
doc_xlp:: $(FILE_BASE).xlp
|
||||
|
||||
$(FILE_BASE).xlp: $(FILE_BASE).tex $(TEX_ADDITIONAL)
|
||||
../../../bin/$(OSTYPE)/tex2rtf $(FILE_BASE).tex $(FILE_BASE).xlp -twice -xlp
|
||||
|
||||
#############################################
|
||||
|
||||
doc_html:: $(FILE_BASE)_contents.html $(FILE_BASE).html
|
||||
|
||||
$(FILE_BASE).html:
|
||||
@ln -s $(FILE_BASE)_contents.html $@
|
||||
|
||||
$(FILE_BASE)_contents.html: $(FILE_BASE).tex $(TEX_ADDITIONAL) $(GIF_FILES) $(HTML_BUTTONS)
|
||||
../../../bin/$(OSTYPE)/tex2rtf $(FILE_BASE).tex $(FILE_BASE) -twice -html
|
||||
|
||||
#############################################
|
||||
|
||||
doc_rtf:: $(FILE_BASE).rtf
|
||||
|
||||
$(FILE_BASE).rtf: $(FILE_BASE).tex $(TEX_ADDITIONAL) $(BMP_FILES)
|
||||
../../../bin/$(OSTYPE)/tex2rtf $(FILE_BASE).tex $(FILE_BASE).rtf -twice -rtf
|
||||
|
||||
#############################################
|
||||
|
||||
doc_winhelp:: $(FILE_BASE).win
|
||||
|
||||
$(FILE_BASE).win: $(FILE_BASE).tex $(TEX_ADDITIONAL) $(BMP_FILES)
|
||||
../../../bin/$(OSTYPE)/tex2rtf $(FILE_BASE).tex $(FILE_BASE).win -twice -winhelp
|
||||
@echo final conversion still needs to be done by MSWin
|
||||
|
||||
#############################################
|
||||
|
||||
subst::
|
||||
@if test "x$(OLD)" = x; then \
|
||||
echo "OLD not defined!"; exit -1; \
|
||||
fi
|
||||
@if test "x$(NEW)" = x; then \
|
||||
echo "NEW not defined!"; exit -1; \
|
||||
fi
|
||||
@for each in $(TEX_BASE) $(TEX_ADITIONAL) ; do \
|
||||
cat $$each | sed "s/$(OLD)/$(NEW)/g" > /tmp/subst; \
|
||||
rm $$each; cp /tmp/subst $$each; rm /tmp/subst; \
|
||||
done
|
||||
|
||||
#############################################
|
||||
|
||||
.SUFFIXES:
|
||||
.SUFFIXES: .eps .xpm
|
||||
.SUFFIXES: .bmp .xpm
|
||||
.SUFFIXES: .gif .xpm
|
||||
|
||||
.xpm.eps :
|
||||
@$(RM) -f $@
|
||||
xpmtoppm $< | ppmtogif | giftopnm | pnmtops -rle -center -noturn -scale 0.5 - > $@
|
||||
|
||||
.xpm.bmp :
|
||||
@$(RM) -f $@
|
||||
xpmtoppm $< | ppmtobmp -windows - > $@
|
||||
|
||||
.xpm.gif :
|
||||
@$(RM) -f $@
|
||||
xpmtoppm $< | ppmtogif -interlace - > $@
|
||||
Executable
+3
@@ -0,0 +1,3 @@
|
||||
#! /bin/sh
|
||||
grep $@
|
||||
exit 0
|
||||
Executable
+10
@@ -0,0 +1,10 @@
|
||||
#! /bin/sh
|
||||
|
||||
for each in $@ ; do
|
||||
LINE=`grep " $each " ../$OSTYPE/wx_setup.h | grep "#define" | grep 1`
|
||||
if test "x$LINE" = x ; then
|
||||
echo "$each needed to compile";
|
||||
exit 1;
|
||||
fi
|
||||
done
|
||||
|
||||
@@ -0,0 +1,126 @@
|
||||
# Makefile for Autoconf.
|
||||
# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
|
||||
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2, or (at your option)
|
||||
# any later version.
|
||||
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
# 02111-1307, USA.
|
||||
|
||||
#### Start of system configuration section. ####
|
||||
|
||||
GLOBAL_LIB_DIR = $(WXBASEDIR)/lib/$(OS)
|
||||
GLOBAL_BIN_DIR = $(WXBASEDIR)/bin/$(OS)
|
||||
|
||||
# define toolkit to use
|
||||
TOOLKIT_DEF = -D@TOOLKIT_DEF@
|
||||
|
||||
# general compiler stuff
|
||||
OPTIMISE = @OPTIMISE@
|
||||
PROFILE = @PROFILE@
|
||||
DEBUG = @WXDEBUG@ @WXDEBUG_DEFINE@
|
||||
|
||||
# c-compiler stuff
|
||||
CC = @CC@
|
||||
CFLAGS = @CFLAGS@ $(OPTIMISE) $(PROFILE) $(DEBUG)
|
||||
CPP = @CPP@
|
||||
|
||||
# c++-compiler stuff
|
||||
CXX = @CXX@
|
||||
CXXFLAGS = @CXXFLAGS@ $(OPTIMISE) $(PROFILE) $(DEBUG)
|
||||
CXXCPP = @CXXCPP@
|
||||
|
||||
# shared compile stuff
|
||||
PICFLAGS = @PICFLAGS@
|
||||
CREATE_SHARED = @CREATE_SHARED@
|
||||
|
||||
# other stuff
|
||||
RM = rm -f
|
||||
LEX = @LEX@
|
||||
LEXLIB = @LEXLIB@
|
||||
YACC = @YACC@
|
||||
RANLIB = @RANLIB@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
AWK = @AWK@
|
||||
LN_S = @LN_S@
|
||||
CJPEG_PROG =
|
||||
CONVERT_PATH = /usr/bin/X11
|
||||
CONVERT_PROG = /usr/bin/X11/convert
|
||||
DJPEG_PROG =
|
||||
GIFTOPNM_PROG =
|
||||
NETPBM_PATH =
|
||||
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
|
||||
# Directory in which to install scripts.
|
||||
#bindir = @bindir@
|
||||
|
||||
# Directory in which to install library files.
|
||||
datadir = @datadir@
|
||||
acdatadir = $(datadir)/autoconf
|
||||
|
||||
# Directory in which to install documentation info files.
|
||||
infodir = @infodir@
|
||||
|
||||
X_CFLAGS = @X_CFLAGS@
|
||||
X_LIBS = @X_LIBS@
|
||||
X_EXTRA_LIBS = @X_EXTRA_LIBS@
|
||||
X_PRE_LIBS = @X_PRE_LIBS@
|
||||
|
||||
GUI_TK_INCLUDE = @GUI_TK_INCLUDE@
|
||||
GUI_TK_LIBRARY = @GUI_TK_LIBRARY@
|
||||
GUI_TK_LINK = @GUI_TK_LINK@
|
||||
|
||||
OPENGL_INCLUDE = @OPENGL_INCLUDE@
|
||||
OPENGL_LIBRARY = @OPENGL_LIBRARY@
|
||||
OPENGL_LINK = @OPENGL_LINK@
|
||||
|
||||
THREADS_LINK = @THREADS_LINK@
|
||||
EXTRA_LINK = @EXTRA_LINK@
|
||||
|
||||
# INCLUDES
|
||||
WX_INCLUDES = \
|
||||
$(TOOLKIT_DEF) \
|
||||
-I. \
|
||||
-I.. \
|
||||
-I$(WXBASEDIR)/include \
|
||||
-I$(WXBASEDIR)/src/zlib \
|
||||
$(GUI_TK_INCLUDE) \
|
||||
$(OPENGL_INCLUDE) \
|
||||
$(X_CFLAGS)
|
||||
|
||||
# -I$(WXBASEDIR)/src/png \
|
||||
# -I$(WXBASEDIR)/src/zlib \
|
||||
# -I$(WXBASEDIR)/src/gdk_imlib \
|
||||
|
||||
WX_LIBS = -L$(GLOBAL_LIB_DIR) -lwx_gtk
|
||||
|
||||
OPENGL_LIBS = $(OPENGL_LIBRARY) $(OPENGL_LINK)
|
||||
|
||||
GUI_TK_LIBS = $(GUI_TK_LIBRARY) $(GUI_TK_LINK) -ldl
|
||||
|
||||
LINK = $(CXX) -o $@
|
||||
LINK_LIBS= \
|
||||
$(WX_LIBS) \
|
||||
$(GUI_TK_LIBS) \
|
||||
$(X_EXTRA_LIBS) \
|
||||
$(X_PRE_LIBS) \
|
||||
$(THREADS_LINK) \
|
||||
$(EXTRA_LINK)
|
||||
|
||||
# Don't include $(OPENGL_LIBS) in LINK_LIBS; they
|
||||
# can be conveniently added to BIN_LINK in Makefile.in.
|
||||
|
||||
#### End of system configuration section. ####
|
||||
@@ -0,0 +1,13 @@
|
||||
# all that is to do
|
||||
all:: checkneeds binary
|
||||
clean:: clean_binary clean_obj
|
||||
|
||||
# now include definite rules
|
||||
BIN_BASE_DIR=.
|
||||
|
||||
# include rules to create library
|
||||
include $(RULES_GENERIC)/bin1
|
||||
# include rules to create objects
|
||||
include $(RULES_GENERIC)/obj
|
||||
# include rule to check for defines needed
|
||||
include $(RULES_GENERIC)/needed
|
||||
@@ -0,0 +1,14 @@
|
||||
# all that is to do
|
||||
all:: checkneeds binary
|
||||
clean:: clean_binary clean_obj
|
||||
|
||||
# now include definite rules
|
||||
BIN_BASE_DIR=.
|
||||
|
||||
# include rules to create library
|
||||
include $(RULES_GENERIC)/bin2
|
||||
# include rules to create objects
|
||||
include $(RULES_GENERIC)/obj
|
||||
# include rule to check for defines needed
|
||||
include $(RULES_GENERIC)/needed
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user