Commit d176e98d authored by dickelbeck's avatar dickelbeck

patch from wafeliron@yahoo.com via pastbin.com

parent 27005d8c
...@@ -254,3 +254,5 @@ if(UNIX) ...@@ -254,3 +254,5 @@ if(UNIX)
COMPONENT resources COMPONENT resources
PATTERN ".svn" EXCLUDE) PATTERN ".svn" EXCLUDE)
endif(UNIX) endif(UNIX)
include(CTest)
...@@ -14,8 +14,20 @@ Requirements ...@@ -14,8 +14,20 @@ Requirements
* Doxygen (http://www.doxygen.nl) * Doxygen (http://www.doxygen.nl)
Building wxWidgets 2.9 Building wxWidgets 2.9 Universal
~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
To check if your tools and libraries are installed check with file for architectures.
user@macosx$ file /Developer/SDKs/MacOSX10.5.sdk/usr/lib/libSystem.dylib
/Developer/SDKs/MacOSX10.5.sdk/usr/lib/libSystem.dylib: Mach-O universal binary with 4 architectures
/Developer/SDKs/MacOSX10.5.sdk/usr/lib/libSystem.dylib (for architecture ppc7400): Mach-O dynamically linked shared library stub ppc
/Developer/SDKs/MacOSX10.5.sdk/usr/lib/libSystem.dylib (for architecture ppc64)Mach-O 64-bit dynamically linked shared library stub ppc64
/Developer/SDKs/MacOSX10.5.sdk/usr/lib/libSystem.dylib (for architecture i386):Mach-O dynamically linked shared library stub i386
/Developer/SDKs/MacOSX10.5.sdk/usr/lib/libSystem.dylib (for architecture x86_64): Mach-O 64-bit dynamically linked shared library stub x86_64
You need the architectures what you are compiling for !
If you have problems that the 64bits library is not build you should add in If you have problems that the 64bits library is not build you should add in
the configure file: the configure file:
...@@ -25,7 +37,7 @@ At time of writing (2009-01-16) this is on line 18381 ...@@ -25,7 +37,7 @@ At time of writing (2009-01-16) this is on line 18381
Building a universal monolib wxWidgets 2.9 with the following parameters: Building a universal monolib wxWidgets 2.9 with the following parameters:
./configure --enable-unicode=yes --enable-shared=no --enable-monolithic --with-opengl \ ./configure --enable-unicode=yes --enable-shared=no --enable-monolithic --with-opengl \
--enable-universal_binary --enable-aui --enable-debug --with-osx_cocoa --with-macosx \ --enable-universal_binary --enable-aui --enable-debug --with-osx_cocoa \
--with-macosx-sdk=/Developer/SDKs/MacOSX10.5.sdk/ --prefix=/opt/wxwidgets-svn --with-macosx-sdk=/Developer/SDKs/MacOSX10.5.sdk/ --prefix=/opt/wxwidgets-svn
If you dont need the debugging symbols then you can remove the --enable-debug parameter. If you dont need the debugging symbols then you can remove the --enable-debug parameter.
...@@ -90,3 +102,9 @@ file included from ...@@ -90,3 +102,9 @@ file included from
error: macro "check" passed 2 arguments, but takes just 1 error: macro "check" passed 2 arguments, but takes just 1
CMAKE_CXX_FLAGS = -D__ASSERTMACROS__ fixes this :-) CMAKE_CXX_FLAGS = -D__ASSERTMACROS__ fixes this :-)
configure:18585: gcc -isysroot /Developer/SDKs/MacOSX10.5.sdk/ -mmacosx-version-min=10.5 -o conftest -arch i386 -arch x86_64 -arch ppc -arch i386 -arch x86_64 -arch ppc conftest.c >&5
ld: warning: in /Developer/SDKs/MacOSX10.5.sdk//usr/lib/libSystem.dylib, missing required architecture ppc in file
Installing rosetta and xcode with all architectures fixes this "problem"
\ No newline at end of file
...@@ -196,7 +196,7 @@ void WinEDA_DrawFrame::OnSelectGrid( wxCommandEvent& event ) ...@@ -196,7 +196,7 @@ void WinEDA_DrawFrame::OnSelectGrid( wxCommandEvent& event )
*/ */
int index = m_SelGridBox->GetSelection(); int index = m_SelGridBox->GetSelection();
wxASSERT( index != wxNOT_FOUND ); wxASSERT( index != wxNOT_FOUND );
clientData = (int*) m_SelGridBox->GetClientData( index ); clientData = (int*) m_SelGridBox->wxItemContainer::GetClientData( index );
if( clientData != NULL ) if( clientData != NULL )
id = *clientData; id = *clientData;
...@@ -212,7 +212,7 @@ void WinEDA_DrawFrame::OnSelectGrid( wxCommandEvent& event ) ...@@ -212,7 +212,7 @@ void WinEDA_DrawFrame::OnSelectGrid( wxCommandEvent& event )
{ {
for( size_t i = 0; i < m_SelGridBox->GetCount(); i++ ) for( size_t i = 0; i < m_SelGridBox->GetCount(); i++ )
{ {
clientData = (int*) m_SelGridBox->GetClientData( i ); clientData = (int*) m_SelGridBox->wxItemContainer::GetClientData( i );
if( clientData && id == *clientData ) if( clientData && id == *clientData )
{ {
......
...@@ -89,7 +89,7 @@ static Ki_HotkeyInfo HkRedo( wxT( "Redo" ), HK_REDO, GR_KB_CTRL + 'Y', ...@@ -89,7 +89,7 @@ static Ki_HotkeyInfo HkRedo( wxT( "Redo" ), HK_REDO, GR_KB_CTRL + 'Y',
#else #else
static Ki_HotkeyInfo HkRedo( wxT( "Redo" ), HK_REDO, static Ki_HotkeyInfo HkRedo( wxT( "Redo" ), HK_REDO,
GR_KB_SHIFT + GR_KB_CTRL + 'Z', GR_KB_SHIFT + GR_KB_CTRL + 'Z',
(int) ID_SCHEMATIC_REDO ); (int) wxID_REDO );
#endif #endif
// Schematic editor // Schematic editor
......
...@@ -767,7 +767,7 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event ) ...@@ -767,7 +767,7 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event )
case ID_TOOLBARH_PCB_SELECT_LAYER: case ID_TOOLBARH_PCB_SELECT_LAYER:
itmp = m_SelLayerBox->GetChoice(); itmp = m_SelLayerBox->GetChoice();
setActiveLayer( (size_t) m_SelLayerBox->GetClientData( itmp ) ); setActiveLayer( (size_t) m_SelLayerBox->wxItemContainer::GetClientData( itmp ) );
if( DisplayOpt.ContrastModeDisplay ) if( DisplayOpt.ContrastModeDisplay )
DrawPanel->Refresh( true ); DrawPanel->Refresh( true );
break; break;
......
...@@ -672,7 +672,7 @@ void WinEDA_PcbFrame::syncLayerBox() ...@@ -672,7 +672,7 @@ void WinEDA_PcbFrame::syncLayerBox()
for( int listNdx=0; listNdx<count; ++listNdx ) for( int listNdx=0; listNdx<count; ++listNdx )
{ {
int clientData = (int) (size_t) m_SelLayerBox->GetClientData( listNdx ); int clientData = (int) (size_t) m_SelLayerBox->wxItemContainer::GetClientData( listNdx );
if( clientData == layer ) if( clientData == layer )
{ {
...@@ -752,7 +752,7 @@ WinEDAChoiceBox* WinEDA_PcbFrame::ReCreateLayerBox( WinEDA_Toolbar* parent ) ...@@ -752,7 +752,7 @@ WinEDAChoiceBox* WinEDA_PcbFrame::ReCreateLayerBox( WinEDA_Toolbar* parent )
//D(printf("appending layername=%s, ndx=%d, layer=%d\n", CONV_TO_UTF8(msg), listNdx, layer );) //D(printf("appending layername=%s, ndx=%d, layer=%d\n", CONV_TO_UTF8(msg), listNdx, layer );)
m_SelLayerBox->SetClientData( listNdx, (void*) layer ); m_SelLayerBox->wxItemContainer::SetClientData( listNdx, (void*) layer );
length = MAX( length, msg.Len() ); length = MAX( length, msg.Len() );
listNdx++; listNdx++;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment