Developer forums (C::B DEVELOPMENT STRICTLY!) > Development

new wxSmith merge to trunk : svn problem

<< < (3/4) > >>

Der Meister:
You are right, but I think you missed one directory: src/plugins/contrib/wxSmith/wxwidgets/icons/Makefile

Here is a small patch, that worked for me (bootstrap only, didn't do more):

--- Code: ---Index: configure.in
===================================================================
--- configure.in        (revision 3522)
+++ configure.in        (working copy)
@@ -218,10 +218,11 @@
        src/plugins/contrib/symtab/resources/Makefile
        src/plugins/contrib/regex_testbed/Makefile
        src/plugins/contrib/wxSmith/Makefile
-       src/plugins/contrib/wxSmith/defwidgets/Makefile
        src/plugins/contrib/wxSmith/properties/Makefile
-       src/plugins/contrib/wxSmith/resources/Makefile
-       src/plugins/contrib/wxSmith/smithicons/Makefile
+       src/plugins/contrib/wxSmith/wxwidgets/Makefile
+       src/plugins/contrib/wxSmith/wxwidgets/defitems/Makefile
+       src/plugins/contrib/wxSmith/wxwidgets/properties/Makefile
+       src/plugins/contrib/wxSmith/wxwidgets/icons/Makefile
        src/scripts/Makefile   
        src/tools/Makefile     
        src/tools/cb_share_config/Makefile

--- End code ---

killerbot:
hehe, the boss committed :-)

byo:
Sorry for this inconvenience. I don't have access to root folder so the boss had to do this. And we were little bit out of sync ;)

straka.milan:
But it doesn't build, there is a mistake in wxSmith/wxwidgets/Makefile. It definitely should not contain references to defwidgets/..., but defitems/... instead!

[EDIT:] Replacing them manually in Makefile helped, so it should be enough to correct it in Makefile.am and bootstrap & configure.

[EDIT2:] Giving up, another error in wxssettings.cpp
--- Code: ---./wxssettings.cpp: In member function 'void wxsSettings::OnDragTargetColClick(wxCommandEvent&)':
./wxssettings.cpp:249: error: '::wxGetColourFromUser' has not been declared
./wxssettings.cpp: In member function 'void wxsSettings::OnDragParentColClick(wxCommandEvent&)':
./wxssettings.cpp:258: error: '::wxGetColourFromUser' has not been declared
make[5]: *** [wxssettings.lo] Error 1

--- End code ---

I am going to bed :)

killerbot:
ok, I have a look at that one, probably missing include

#include <wx/colordlg.h>

[edit] committed the include fix, I'll leave the Makefile.am to byo

Navigation

[0] Message Index

[#] Next page

[*] Previous page