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

New makefile and modified .def file supporting the xpmdecod module.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2001-04-30 15:35:30 +00:00
parent adebd2d72c
commit a51fb6427c
2 changed files with 89 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/os2/makefile.va
View File

@@ -295,6 +295,7 @@ COMMONOBJS = \
..\common\$D\wincmn.obj \ ..\common\$D\wincmn.obj \
..\common\$D\wxchar.obj \ ..\common\$D\wxchar.obj \
..\common\$D\wxexpr.obj \ ..\common\$D\wxexpr.obj \
..\common\$D\xpmdecod.obj \
..\common\$D\y_tab.obj \ ..\common\$D\y_tab.obj \
..\common\$D\zipstrm.obj \ ..\common\$D\zipstrm.obj \
..\common\$D\zstream.obj ..\common\$D\zstream.obj
@@ -408,6 +409,7 @@ COMLIBOBJS3 = \
wincmn.obj \ wincmn.obj \
wxchar.obj \ wxchar.obj \
wxexpr.obj \ wxexpr.obj \
xpmdecod.obj \
y_tab.obj \ y_tab.obj \
zipstrm.obj \ zipstrm.obj \
zstream.obj zstream.obj
@@ -747,6 +749,7 @@ $(COMLIBOBJS3):
copy ..\common\$D\wincmn.obj copy ..\common\$D\wincmn.obj
copy ..\common\$D\wxchar.obj copy ..\common\$D\wxchar.obj
copy ..\common\$D\wxexpr.obj copy ..\common\$D\wxexpr.obj
copy ..\common\$D\xpmdecod.obj
copy ..\common\$D\y_tab.obj copy ..\common\$D\y_tab.obj
copy ..\common\$D\zipstrm.obj copy ..\common\$D\zipstrm.obj
copy ..\common\$D\zstream.obj copy ..\common\$D\zstream.obj

147
src/os2/wx23.def
View File

@@ -4,7 +4,7 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL
CODE LOADONCALL CODE LOADONCALL
EXPORTS EXPORTS
;From library: H:\DEV\WX2\WXWINDOWS\lib\wx.lib ;From library: H:\Dev\Wx2\WxWindows\lib\wx.lib
;From object file: dummy.cpp ;From object file: dummy.cpp
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
wxDummyChar wxDummyChar
@@ -3494,6 +3494,10 @@ EXPORTS
GetIcon__10wxFileTypeCFP6wxIconP8wxStringPi GetIcon__10wxFileTypeCFP6wxIconP8wxStringPi
;wxArrayFileTypeInfo::Add(const wxFileTypeInfo&) ;wxArrayFileTypeInfo::Add(const wxFileTypeInfo&)
Add__19wxArrayFileTypeInfoFRC14wxFileTypeInfo Add__19wxArrayFileTypeInfoFRC14wxFileTypeInfo
;wxFileTypeInfo::wxFileTypeInfo(const wxArrayString&)
__ct__14wxFileTypeInfoFRC13wxArrayString
;wxMimeTypesManager::Initialize(int,const wxString&)
Initialize__18wxMimeTypesManagerFiRC8wxString
;wxFileType::GetPrintCommand(wxString*,const wxFileType::MessageParameters&) const ;wxFileType::GetPrintCommand(wxString*,const wxFileType::MessageParameters&) const
GetPrintCommand__10wxFileTypeCFP8wxStringRCQ2_10wxFileType17MessageParameters GetPrintCommand__10wxFileTypeCFP8wxStringRCQ2_10wxFileType17MessageParameters
;wxMimeTypesManager::GetFileTypeFromMimeType(const wxString&) ;wxMimeTypesManager::GetFileTypeFromMimeType(const wxString&)
@@ -3504,6 +3508,8 @@ EXPORTS
Associate__18wxMimeTypesManagerFRC14wxFileTypeInfo Associate__18wxMimeTypesManagerFRC14wxFileTypeInfo
;wxFileTypeInfo::wxFileTypeInfo(const char*,const char*,const char*,const char*,...) ;wxFileTypeInfo::wxFileTypeInfo(const char*,const char*,const char*,const char*,...)
__ct__14wxFileTypeInfoFPCcN31e __ct__14wxFileTypeInfoFPCcN31e
;wxFileType::SetDefaultIcon(const wxString&,int)
SetDefaultIcon__10wxFileTypeFRC8wxStringi
;wxArrayFileTypeInfo::DoCopy(const wxArrayFileTypeInfo&) ;wxArrayFileTypeInfo::DoCopy(const wxArrayFileTypeInfo&)
DoCopy__19wxArrayFileTypeInfoFRC19wxArrayFileTypeInfo DoCopy__19wxArrayFileTypeInfoFRC19wxArrayFileTypeInfo
;wxMimeTypesManager::ReadMimeTypes(const wxString&) ;wxMimeTypesManager::ReadMimeTypes(const wxString&)
@@ -3512,6 +3518,8 @@ EXPORTS
ExpandCommand__10wxFileTypeFRC8wxStringRCQ2_10wxFileType17MessageParameters ExpandCommand__10wxFileTypeFRC8wxStringRCQ2_10wxFileType17MessageParameters
;wxMimeTypesManager::IsOfType(const wxString&,const wxString&) ;wxMimeTypesManager::IsOfType(const wxString&,const wxString&)
IsOfType__18wxMimeTypesManagerFRC8wxStringT1 IsOfType__18wxMimeTypesManagerFRC8wxStringT1
;wxMimeTypesManager::Unassociate(wxFileType*)
Unassociate__18wxMimeTypesManagerFP10wxFileType
;wxArrayFileTypeInfo::DoEmpty() ;wxArrayFileTypeInfo::DoEmpty()
DoEmpty__19wxArrayFileTypeInfoFv DoEmpty__19wxArrayFileTypeInfoFv
wxTheMimeTypesManager wxTheMimeTypesManager
@@ -3529,6 +3537,8 @@ EXPORTS
GetDescription__10wxFileTypeCFP8wxString GetDescription__10wxFileTypeCFP8wxString
;wxArrayFileTypeInfo::Index(const wxFileTypeInfo&,unsigned long) const ;wxArrayFileTypeInfo::Index(const wxFileTypeInfo&,unsigned long) const
Index__19wxArrayFileTypeInfoCFRC14wxFileTypeInfoUl Index__19wxArrayFileTypeInfoCFRC14wxFileTypeInfoUl
;wxFileType::SetCommand(const wxString&,const wxString&,unsigned long)
SetCommand__10wxFileTypeFRC8wxStringT1Ul
;wxMimeTypesManager::ReadMailcap(const wxString&,unsigned long) ;wxMimeTypesManager::ReadMailcap(const wxString&,unsigned long)
ReadMailcap__18wxMimeTypesManagerFRC8wxStringUl ReadMailcap__18wxMimeTypesManagerFRC8wxStringUl
;wxArrayFileTypeInfo::Insert(const wxFileTypeInfo&,unsigned int) ;wxArrayFileTypeInfo::Insert(const wxFileTypeInfo&,unsigned int)
@@ -3553,6 +3563,8 @@ EXPORTS
__dt__18wxMimeTypesManagerFv __dt__18wxMimeTypesManagerFv
;wxMimeTypesManager::wxMimeTypesManager() ;wxMimeTypesManager::wxMimeTypesManager()
__ct__18wxMimeTypesManagerFv __ct__18wxMimeTypesManagerFv
;wxMimeTypesManager::ClearData()
ClearData__18wxMimeTypesManagerFv
;wxArrayFileTypeInfo::operator=(const wxArrayFileTypeInfo&) ;wxArrayFileTypeInfo::operator=(const wxArrayFileTypeInfo&)
__as__19wxArrayFileTypeInfoFRC19wxArrayFileTypeInfo __as__19wxArrayFileTypeInfoFRC19wxArrayFileTypeInfo
;wxFileType::GetOpenCommand(wxString*,const wxFileType::MessageParameters&) const ;wxFileType::GetOpenCommand(wxString*,const wxFileType::MessageParameters&) const
@@ -4341,6 +4353,8 @@ EXPORTS
CalcMin__11wxSizerItemFv CalcMin__11wxSizerItemFv
;wxSizer::Remove(wxWindow*) ;wxSizer::Remove(wxWindow*)
Remove__7wxSizerFP8wxWindow Remove__7wxSizerFP8wxWindow
;wxSizer::FitSize(wxWindow*)
FitSize__7wxSizerFP8wxWindow
__vft7wxSizer8wxObject __vft7wxSizer8wxObject
;wxSizer::Remove(int) ;wxSizer::Remove(int)
Remove__7wxSizerFi Remove__7wxSizerFi
@@ -4358,6 +4372,8 @@ EXPORTS
CreateArrays__15wxFlexGridSizerFv CreateArrays__15wxFlexGridSizerFv
;wxSizer::SetSizeHints(wxWindow*) ;wxSizer::SetSizeHints(wxWindow*)
SetSizeHints__7wxSizerFP8wxWindow SetSizeHints__7wxSizerFP8wxWindow
;wxSizer::GetMaxWindowSize(wxWindow*)
GetMaxWindowSize__7wxSizerFP8wxWindow
;wxSizer::Add(wxSizer*,int,int,int,wxObject*) ;wxSizer::Add(wxSizer*,int,int,int,wxObject*)
Add__7wxSizerFP7wxSizeriN22P8wxObject Add__7wxSizerFP7wxSizeriN22P8wxObject
;wxSizer::Prepend(int,int,int,int,int,wxObject*) ;wxSizer::Prepend(int,int,int,int,int,wxObject*)
@@ -6221,6 +6237,14 @@ EXPORTS
DeleteAttributeValue__6wxExprFRC8wxString DeleteAttributeValue__6wxExprFRC8wxString
;wxExpr::AttributeValue(const wxString&) const ;wxExpr::AttributeValue(const wxString&) const
AttributeValue__6wxExprCFRC8wxString AttributeValue__6wxExprCFRC8wxString
;From object file: ..\common\xpmdecod.cpp
;PUBDEFs (Symbols available from object file):
;wxXPMDecoder::CanRead(wxInputStream&)
CanRead__12wxXPMDecoderFR13wxInputStream
;wxXPMDecoder::ReadFile(wxInputStream&)
ReadFile__12wxXPMDecoderFR13wxInputStream
;wxXPMDecoder::ReadData(const char**)
ReadData__12wxXPMDecoderFPPCc
;From object file: ..\common\y_tab.c ;From object file: ..\common\y_tab.c
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
wxExprCleanUp wxExprCleanUp
@@ -8800,61 +8824,63 @@ EXPORTS
sm_eventTableEntries__12wxSashWindow sm_eventTableEntries__12wxSashWindow
;From object file: ..\generic\scrolwin.cpp ;From object file: ..\generic\scrolwin.cpp
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
;wxScrolledWindow::GetScrollPageSize(int) const ;wxGenericScrolledWindow::OnChar(wxKeyEvent&)
GetScrollPageSize__16wxScrolledWindowCFi OnChar__23wxGenericScrolledWindowFR10wxKeyEvent
;wxScrolledWindow::Scroll(int,int) __vft23wxGenericScrolledWindow8wxObject
Scroll__16wxScrolledWindowFiT1 ;wxGenericScrolledWindow::GetVirtualSize(int*,int*) const
;wxScrolledWindow::GetEventTable() const GetVirtualSize__23wxGenericScrolledWindowCFPiT1
GetEventTable__16wxScrolledWindowCFv ;wxGenericScrolledWindow::sm_eventTable
;wxScrolledWindow::SetTargetWindow(wxWindow*) sm_eventTable__23wxGenericScrolledWindow
SetTargetWindow__16wxScrolledWindowFP8wxWindow ;wxGenericScrolledWindow::OnScroll(wxScrollWinEvent&)
;wxScrolledWindow::sm_eventTable OnScroll__23wxGenericScrolledWindowFR16wxScrollWinEvent
sm_eventTable__16wxScrolledWindow ;wxGenericScrolledWindow::OnSize(wxSizeEvent&)
;wxScrolledWindow::OnScroll(wxScrollWinEvent&) OnSize__23wxGenericScrolledWindowFR11wxSizeEvent
OnScroll__16wxScrolledWindowFR16wxScrollWinEvent ;wxGenericScrolledWindow::CalcScrollInc(wxScrollWinEvent&)
;wxScrolledWindow::SetScrollPageSize(int,int) CalcScrollInc__23wxGenericScrolledWindowFR16wxScrollWinEvent
SetScrollPageSize__16wxScrolledWindowFiT1 ;wxGenericScrolledWindow::Scroll(int,int)
;wxScrolledWindow::AdjustScrollbars() Scroll__23wxGenericScrolledWindowFiT1
AdjustScrollbars__16wxScrolledWindowFv ;wxGenericScrolledWindow::GetViewStart(int*,int*) const
;wxScrolledWindow::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&) GetViewStart__23wxGenericScrolledWindowCFPiT1
Create__16wxScrolledWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString ;wxGenericScrolledWindow::EnableScrolling(unsigned long,unsigned long)
;wxScrolledWindow::PrepareDC(wxDC&) EnableScrolling__23wxGenericScrolledWindowFUlT1
PrepareDC__16wxScrolledWindowFR4wxDC ;wxConstructorForwxGenericScrolledWindow()
;wxScrolledWindow::CalcUnscrolledPosition(int,int,int*,int*) const wxConstructorForwxGenericScrolledWindow__Fv
CalcUnscrolledPosition__16wxScrolledWindowCFiT1PiT3 ;wxGenericScrolledWindow::PrepareDC(wxDC&)
;wxScrolledWindow::OnPaint(wxPaintEvent&) PrepareDC__23wxGenericScrolledWindowFR4wxDC
OnPaint__16wxScrolledWindowFR12wxPaintEvent ;wxGenericScrolledWindow::sm_eventTableEntries
;wxScrolledWindow::OnChar(wxKeyEvent&) sm_eventTableEntries__23wxGenericScrolledWindow
OnChar__16wxScrolledWindowFR10wxKeyEvent ;wxGenericScrolledWindow::CalcUnscrolledPosition(int,int,int*,int*) const
;wxConstructorForwxScrolledWindow() CalcUnscrolledPosition__23wxGenericScrolledWindowCFiT1PiT3
wxConstructorForwxScrolledWindow__Fv ;wxGenericScrolledWindow::SetScrollbars(int,int,int,int,int,int,unsigned long)
;wxScrolledWindow::wxScrolledWindow() SetScrollbars__23wxGenericScrolledWindowFiN51Ul
__ct__16wxScrolledWindowFv ;wxGenericScrolledWindow::GetEventTable() const
;wxScrolledWindow::CalcScrollInc(wxScrollWinEvent&) GetEventTable__23wxGenericScrolledWindowCFv
CalcScrollInc__16wxScrolledWindowFR16wxScrollWinEvent ;wxGenericScrolledWindow::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
__vft16wxScrolledWindow8wxObject Create__23wxGenericScrolledWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
;wxScrolledWindow::OnSize(wxSizeEvent&) ;wxGenericScrolledWindow::SetTargetWindow(wxWindow*)
OnSize__16wxScrolledWindowFR11wxSizeEvent SetTargetWindow__23wxGenericScrolledWindowFP8wxWindow
;wxScrolledWindow::GetScrollPixelsPerUnit(int*,int*) const ;wxGenericScrolledWindow::CalcScrolledPosition(int,int,int*,int*) const
GetScrollPixelsPerUnit__16wxScrolledWindowCFPiT1 CalcScrolledPosition__23wxGenericScrolledWindowCFiT1PiT3
;wxScrolledWindow::GetVirtualSize(int*,int*) const ;wxGenericScrolledWindow::GetScrollPageSize(int) const
GetVirtualSize__16wxScrolledWindowCFPiT1 GetScrollPageSize__23wxGenericScrolledWindowCFi
;wxScrolledWindow::EnableScrolling(unsigned long,unsigned long) ;wxGenericScrolledWindow::SetScrollPageSize(int,int)
EnableScrolling__16wxScrolledWindowFUlT1 SetScrollPageSize__23wxGenericScrolledWindowFiT1
;wxScrolledWindow::~wxScrolledWindow() ;wxGenericScrolledWindow::~wxGenericScrolledWindow()
__dt__16wxScrolledWindowFv __dt__23wxGenericScrolledWindowFv
;wxScrolledWindow::GetTargetWindow()
GetTargetWindow__16wxScrolledWindowFv
;wxScrolledWindow::sm_classwxScrolledWindow ;wxScrolledWindow::sm_classwxScrolledWindow
sm_classwxScrolledWindow__16wxScrolledWindow sm_classwxScrolledWindow__16wxScrolledWindow
;wxScrolledWindow::SetScrollbars(int,int,int,int,int,int,unsigned long) ;wxGenericScrolledWindow::OnPaint(wxPaintEvent&)
SetScrollbars__16wxScrolledWindowFiN51Ul OnPaint__23wxGenericScrolledWindowFR12wxPaintEvent
;wxScrolledWindow::GetViewStart(int*,int*) const ;wxGenericScrolledWindow::GetScrollPixelsPerUnit(int*,int*) const
GetViewStart__16wxScrolledWindowCFPiT1 GetScrollPixelsPerUnit__23wxGenericScrolledWindowCFPiT1
;wxScrolledWindow::CalcScrolledPosition(int,int,int*,int*) const ;wxGenericScrolledWindow::wxGenericScrolledWindow()
CalcScrolledPosition__16wxScrolledWindowCFiT1PiT3 __ct__23wxGenericScrolledWindowFv
;wxScrolledWindow::sm_eventTableEntries ;wxGenericScrolledWindow::GetTargetWindow()
sm_eventTableEntries__16wxScrolledWindow GetTargetWindow__23wxGenericScrolledWindowFv
;wxGenericScrolledWindow::AdjustScrollbars()
AdjustScrollbars__23wxGenericScrolledWindowFv
;wxGenericScrolledWindow::sm_classwxGenericScrolledWindow
sm_classwxGenericScrolledWindow__23wxGenericScrolledWindow
;From object file: ..\generic\splitter.cpp ;From object file: ..\generic\splitter.cpp
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
;wxSplitterWindow::OnSize(wxSizeEvent&) ;wxSplitterWindow::OnSize(wxSizeEvent&)
@@ -9257,6 +9283,8 @@ EXPORTS
sm_eventTableEntries__17wxGenericTreeCtrl sm_eventTableEntries__17wxGenericTreeCtrl
;wxGenericTreeCtrl::SetItemFont(const wxTreeItemId&,const wxFont&) ;wxGenericTreeCtrl::SetItemFont(const wxTreeItemId&,const wxFont&)
SetItemFont__17wxGenericTreeCtrlFRC12wxTreeItemIdRC6wxFont SetItemFont__17wxGenericTreeCtrlFRC12wxTreeItemIdRC6wxFont
;wxGenericTreeCtrl::SetFont(const wxFont&)
SetFont__17wxGenericTreeCtrlFRC6wxFont
;wxGenericTreeCtrl::OnPaint(wxPaintEvent&) ;wxGenericTreeCtrl::OnPaint(wxPaintEvent&)
OnPaint__17wxGenericTreeCtrlFR12wxPaintEvent OnPaint__17wxGenericTreeCtrlFR12wxPaintEvent
;wxTreeTextCtrl::OnKeyUp(wxKeyEvent&) ;wxTreeTextCtrl::OnKeyUp(wxKeyEvent&)
@@ -9542,6 +9570,8 @@ EXPORTS
wxConstructorForwxHtmlHelpData__Fv wxConstructorForwxHtmlHelpData__Fv
;wxHtmlSearchStatus::wxHtmlSearchStatus(wxHtmlHelpData*,const wxString&,unsigned long,unsigned long,const wxString&) ;wxHtmlSearchStatus::wxHtmlSearchStatus(wxHtmlHelpData*,const wxString&,unsigned long,unsigned long,const wxString&)
__ct__18wxHtmlSearchStatusFP14wxHtmlHelpDataRC8wxStringUlT3T2 __ct__18wxHtmlSearchStatusFP14wxHtmlHelpDataRC8wxStringUlT3T2
;wxHtmlBookRecord::GetFullPath(const wxString&) const
GetFullPath__16wxHtmlBookRecordCFRC8wxString
;wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord*,wxFileSystem&,const wxString&,const wxString&) ;wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord*,wxFileSystem&,const wxString&,const wxString&)
LoadMSProject__14wxHtmlHelpDataFP16wxHtmlBookRecordR12wxFileSystemRC8wxStringT3 LoadMSProject__14wxHtmlHelpDataFP16wxHtmlBookRecordR12wxFileSystemRC8wxStringT3
__vft14wxSearchEngine8wxObject __vft14wxSearchEngine8wxObject
@@ -9760,6 +9790,8 @@ EXPORTS
DoneParser__12wxHtmlParserFv DoneParser__12wxHtmlParserFv
;wxHtmlParser::AddTagHandler(wxHtmlTagHandler*) ;wxHtmlParser::AddTagHandler(wxHtmlTagHandler*)
AddTagHandler__12wxHtmlParserFP16wxHtmlTagHandler AddTagHandler__12wxHtmlParserFP16wxHtmlTagHandler
;wxHtmlParser::SetSource(const wxString&)
SetSource__12wxHtmlParserFRC8wxString
;wxHtmlParser::PopTagHandler() ;wxHtmlParser::PopTagHandler()
PopTagHandler__12wxHtmlParserFv PopTagHandler__12wxHtmlParserFv
;wxHtmlTagHandler::sm_classwxHtmlTagHandler ;wxHtmlTagHandler::sm_classwxHtmlTagHandler
@@ -10072,19 +10104,12 @@ EXPORTS
_link_dummy_func_m_meta__Fv _link_dummy_func_m_meta__Fv
;From object file: ..\html\m_pre.cpp ;From object file: ..\html\m_pre.cpp
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
__vft13wxHtmlPRECell8wxObject
;HTML_ModulePre::sm_classHTML_ModulePre ;HTML_ModulePre::sm_classHTML_ModulePre
sm_classHTML_ModulePre__14HTML_ModulePre sm_classHTML_ModulePre__14HTML_ModulePre
;_link_dummy_func_m_pre() ;_link_dummy_func_m_pre()
_link_dummy_func_m_pre__Fv _link_dummy_func_m_pre__Fv
;wxConstructorForHTML_ModulePre() ;wxConstructorForHTML_ModulePre()
wxConstructorForHTML_ModulePre__Fv wxConstructorForHTML_ModulePre__Fv
;wxHtmlPRECell::~wxHtmlPRECell()
__dt__13wxHtmlPRECellFv
;wxHtmlPRECell::Draw(wxDC&,int,int,int,int)
Draw__13wxHtmlPRECellFR4wxDCiN32
;wxHtmlPRECell::wxHtmlPRECell(const wxString&,wxDC&)
__ct__13wxHtmlPRECellFRC8wxStringR4wxDC
;From object file: ..\html\m_tables.cpp ;From object file: ..\html\m_tables.cpp
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
;wxHtmlTableCell::ReallocRows(int) ;wxHtmlTableCell::ReallocRows(int)