diff --git a/.gitignore b/.gitignore index 459a53e..3fd0eda 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ codeblocks-10.05-src.tar.bz2 /codeblocks_12.11-1.tar.gz +/codeblocks_13.12-1.tar.gz diff --git a/codeblocks-13.12-unbundle.patch b/codeblocks-13.12-unbundle.patch new file mode 100644 index 0000000..52acfd0 --- /dev/null +++ b/codeblocks-13.12-unbundle.patch @@ -0,0 +1,3128 @@ +From 893aafbe11e3642b9b6a5ad67cf9dbdc2cdd650d Mon Sep 17 00:00:00 2001 +From: Dan Horak +Date: Wed, 13 May 2009 10:21:19 +0200 +Subject: [PATCH 01/36] add check for tinyxml into configure + +--- + configure.ac | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/configure.ac b/configure.ac +index dfcdc20..9997857 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -63,9 +63,18 @@ AC_SEARCH_LIBS(gzopen, z, [HAVE_ZLIB=yes], [HAVE_ZLIB=no]) + LIBS=$save_LIBS + AC_SEARCH_LIBS(BZ2_bzopen, bz2, [HAVE_BZIP2=yes], [HAVE_BZIP2=no]) + LIBS=$save_LIBS ++save_CC=$CC ++save_CPP=$CPP ++CC=$CXX ++CPP=$CXXCPP ++AC_CHECK_HEADER(tinyxml.h, [HAVE_TINYXML=yes], [HAVE_TINYXML=no]) ++CC=$save_CC ++CPP=$save_CPP ++ + + AM_CONDITIONAL([HAVE_ZLIB], [test "$HAVE_ZLIB" = yes]) + AM_CONDITIONAL([HAVE_BZIP2], [test "$HAVE_BZIP2" = yes]) ++AM_CONDITIONAL([HAVE_TINYXML], [test "$HAVE_TINYXML" = yes]) + + dnl versioning info for libtool + dnl Note this is the ABI version which is not the same as our actual library version +-- +1.8.1.4 + + +From 928cfb033583dfd6cad19cb45f6de9066a3c1487 Mon Sep 17 00:00:00 2001 +From: Dan Horak +Date: Wed, 13 May 2009 16:53:29 +0200 +Subject: [PATCH 02/36] move tinywxuni.h header from tinyxml into sdk + +--- + src/include/Makefile.am | 1 + + src/include/tinywxuni.h | 15 +++++++++++++++ + src/include/tinyxml/Makefile.am | 2 +- + src/include/tinyxml/tinywxuni.h | 15 --------------- + src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp | 2 +- + .../contrib/lib_finder/librarydetectionmanager.cpp | 2 +- + src/plugins/contrib/wxSmith/wxsversionconverter.cpp | 2 +- + src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdata.cpp | 2 +- + .../contrib/wxSmith/wxwidgets/wxwidgetsresfactory.cpp | 2 +- + src/sdk/configmanager.cpp | 2 +- + src/sdk/globals.cpp | 2 +- + src/sdk/projectlayoutloader.cpp | 2 +- + src/sdk/projectloader.cpp | 2 +- + src/sdk/workspaceloader.cpp | 2 +- + src/tools/cb_share_config/mainframe.cpp | 2 +- + 15 files changed, 28 insertions(+), 27 deletions(-) + create mode 100644 src/include/tinywxuni.h + delete mode 100644 src/include/tinyxml/tinywxuni.h + +diff --git a/src/include/Makefile.am b/src/include/Makefile.am +index 6f195ab..f7d7382 100644 +--- a/src/include/Makefile.am ++++ b/src/include/Makefile.am +@@ -127,6 +127,7 @@ ALLHEADERS = annoyingdialog.h \ + selecttargetdlg.h \ + settings.h \ + templatemanager.h \ ++ tinywxuni.h \ + toolsmanager.h \ + uservarmanager.h \ + virtualbuildtargetsdlg.h \ +diff --git a/src/include/tinywxuni.h b/src/include/tinywxuni.h +new file mode 100644 +index 0000000..b9433cc +--- /dev/null ++++ b/src/include/tinywxuni.h +@@ -0,0 +1,15 @@ ++#ifndef TINYWXUNI_H ++#define TINYWXUNI_H ++ ++class wxString; ++class TiXmlDocument; ++ ++namespace TinyXML ++{ ++ bool LoadDocument(const wxString& filename, TiXmlDocument *doc); ++ TiXmlDocument* LoadDocument(const wxString& filename); ++ ++ bool SaveDocument(const wxString& filename, TiXmlDocument* doc); ++} ++ ++#endif +diff --git a/src/include/tinyxml/Makefile.am b/src/include/tinyxml/Makefile.am +index a1ec926..c22e938 100644 +--- a/src/include/tinyxml/Makefile.am ++++ b/src/include/tinyxml/Makefile.am +@@ -1,3 +1,3 @@ + sdkdir=$(includedir)/codeblocks/tinyxml + +-sdk_HEADERS = tinyxml.h tinywxuni.h tinystr.h ++sdk_HEADERS = tinystr.h tinyxml.h +diff --git a/src/include/tinyxml/tinywxuni.h b/src/include/tinyxml/tinywxuni.h +deleted file mode 100644 +index b9433cc..0000000 +--- a/src/include/tinyxml/tinywxuni.h ++++ /dev/null +@@ -1,15 +0,0 @@ +-#ifndef TINYWXUNI_H +-#define TINYWXUNI_H +- +-class wxString; +-class TiXmlDocument; +- +-namespace TinyXML +-{ +- bool LoadDocument(const wxString& filename, TiXmlDocument *doc); +- TiXmlDocument* LoadDocument(const wxString& filename); +- +- bool SaveDocument(const wxString& filename, TiXmlDocument* doc); +-} +- +-#endif +diff --git a/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp b/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp +index a08f1f2..edeb044 100644 +--- a/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp ++++ b/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp +@@ -47,7 +47,7 @@ + + #include + #include "tinyxml/tinyxml.h" +-#include "tinyxml/tinywxuni.h" ++#include "tinywxuni.h" + + #include "BrowseTrackerLayout.h" + #include "BrowseMarks.h" +diff --git a/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp b/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp +index 886bbb7..a58776f 100644 +--- a/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp ++++ b/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp +@@ -22,7 +22,7 @@ + */ + + #include +-#include ++#include + + #include + #include +diff --git a/src/plugins/contrib/wxSmith/wxsversionconverter.cpp b/src/plugins/contrib/wxSmith/wxsversionconverter.cpp +index b03ceaa..8c2ca85 100644 +--- a/src/plugins/contrib/wxSmith/wxsversionconverter.cpp ++++ b/src/plugins/contrib/wxSmith/wxsversionconverter.cpp +@@ -26,7 +26,7 @@ + + #include + #include +-#include ++#include + + // TODO: This is same as in wxsproject.h, make one set instead of two + namespace +diff --git a/src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdata.cpp b/src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdata.cpp +index bd87a9b..51a6cb1 100644 +--- a/src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdata.cpp ++++ b/src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdata.cpp +@@ -31,7 +31,7 @@ + #include + #include + #include +-#include ++#include + + #if defined(__WXMSW__) && defined(LoadImage) + // Fix Windows winuser.h Header define of LoadImage. +diff --git a/src/plugins/contrib/wxSmith/wxwidgets/wxwidgetsresfactory.cpp b/src/plugins/contrib/wxSmith/wxwidgets/wxwidgetsresfactory.cpp +index 854602d..7f76bc3 100644 +--- a/src/plugins/contrib/wxSmith/wxwidgets/wxwidgetsresfactory.cpp ++++ b/src/plugins/contrib/wxSmith/wxwidgets/wxwidgetsresfactory.cpp +@@ -31,7 +31,7 @@ + #include "../wxsmith.h" + + #include +-#include ++#include + #include + #include + +diff --git a/src/sdk/configmanager.cpp b/src/sdk/configmanager.cpp +index 61e6123..cc71f09 100644 +--- a/src/sdk/configmanager.cpp ++++ b/src/sdk/configmanager.cpp +@@ -47,7 +47,7 @@ + #include + #endif + +-#include "tinyxml/tinywxuni.h" ++#include "tinywxuni.h" + #include + + template<> CfgMgrBldr* Mgr::instance = nullptr; +diff --git a/src/sdk/globals.cpp b/src/sdk/globals.cpp +index ad93f23..be12b59 100644 +--- a/src/sdk/globals.cpp ++++ b/src/sdk/globals.cpp +@@ -41,7 +41,7 @@ + #include + + #include "filefilters.h" +-#include "tinyxml/tinywxuni.h" ++#include "tinywxuni.h" + #include "filegroupsandmasks.h" + + #ifndef __WXMSW__ +diff --git a/src/sdk/projectlayoutloader.cpp b/src/sdk/projectlayoutloader.cpp +index 68ed58d..c9d6c43 100644 +--- a/src/sdk/projectlayoutloader.cpp ++++ b/src/sdk/projectlayoutloader.cpp +@@ -23,7 +23,7 @@ + + #include "projectlayoutloader.h" + #include "tinyxml/tinyxml.h" +-#include "tinyxml/tinywxuni.h" ++#include "tinywxuni.h" + + ProjectLayoutLoader::ProjectLayoutLoader(cbProject* project) + : m_pProject(project), +diff --git a/src/sdk/projectloader.cpp b/src/sdk/projectloader.cpp +index 8d42065..24aeae9 100644 +--- a/src/sdk/projectloader.cpp ++++ b/src/sdk/projectloader.cpp +@@ -35,7 +35,7 @@ + #include "projectloader_hooks.h" + #include "annoyingdialog.h" + #include "configmanager.h" +-#include "tinyxml/tinywxuni.h" ++#include "tinywxuni.h" + #include "filegroupsandmasks.h" + + ProjectLoader::ProjectLoader(cbProject* project) +diff --git a/src/sdk/workspaceloader.cpp b/src/sdk/workspaceloader.cpp +index 45fd2d0..accbd05 100644 +--- a/src/sdk/workspaceloader.cpp ++++ b/src/sdk/workspaceloader.cpp +@@ -28,7 +28,7 @@ + + + #include "tinyxml/tinyxml.h" +-#include "tinyxml/tinywxuni.h" ++#include "tinywxuni.h" + + WorkspaceLoader::WorkspaceLoader() + { +diff --git a/src/tools/cb_share_config/mainframe.cpp b/src/tools/cb_share_config/mainframe.cpp +index 1fd2024..e0b1f24 100644 +--- a/src/tools/cb_share_config/mainframe.cpp ++++ b/src/tools/cb_share_config/mainframe.cpp +@@ -24,7 +24,7 @@ + #include + #endif + +-#include "tinyxml/tinywxuni.h" ++#include "tinywxuni.h" + + //*********************************************************************** + +-- +1.8.1.4 + + +From 8c34c37fdd1fd5892dd879debe82cfddee85df5e Mon Sep 17 00:00:00 2001 +From: Dan Horak +Date: Thu, 14 May 2009 09:42:37 +0200 +Subject: [PATCH 03/36] move tinywxuni.cpp implementation from tinyxml into sdk + +--- + src/base/tinyxml/Makefile.am | 2 +- + src/base/tinyxml/tinywxuni.cpp | 56 ------------------------------------------ + src/sdk/Makefile.am | 1 + + src/sdk/tinywxuni.cpp | 56 ++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 58 insertions(+), 57 deletions(-) + delete mode 100644 src/base/tinyxml/tinywxuni.cpp + create mode 100644 src/sdk/tinywxuni.cpp + +diff --git a/src/base/tinyxml/Makefile.am b/src/base/tinyxml/Makefile.am +index 84fb465..a68530e 100644 +--- a/src/base/tinyxml/Makefile.am ++++ b/src/base/tinyxml/Makefile.am +@@ -5,6 +5,6 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + + noinst_LTLIBRARIES = libtinyxml.la + +-libtinyxml_la_SOURCES = tinyxml.cpp tinyxmlerror.cpp tinyxmlparser.cpp tinywxuni.cpp ++libtinyxml_la_SOURCES = tinyxml.cpp tinyxmlerror.cpp tinyxmlparser.cpp + + EXTRA_DIST = tinystr.cpp +diff --git a/src/base/tinyxml/tinywxuni.cpp b/src/base/tinyxml/tinywxuni.cpp +deleted file mode 100644 +index 57f48e3..0000000 +--- a/src/base/tinyxml/tinywxuni.cpp ++++ /dev/null +@@ -1,56 +0,0 @@ +-#include "sdk_precomp.h" +- +-#ifndef CB_PRECOMP +- #include +- #include +- #include "filemanager.h" +- #include "manager.h" +-#endif +- +-#include "tinywxuni.h" +-#include "tinyxml.h" +- +-bool TinyXML::LoadDocument(const wxString& filename, TiXmlDocument *doc) +-{ +- +- if (!doc || !wxFile::Access(filename, wxFile::read)) +- return false; +- +- wxFile file(filename); +- size_t len = file.Length(); +- +- if (!len) +- return false; +- +- char *input = new char[len+1]; +- input[len] = '\0'; +- file.Read(input, len); +- +- doc->Parse(input); +- delete[] input; +- return true; +-} +- +-TiXmlDocument* TinyXML::LoadDocument(const wxString& filename) +-{ +- TiXmlDocument* doc = new TiXmlDocument(); +- +- if (TinyXML::LoadDocument(filename, doc)) +- return doc; +- +- delete doc; +- return 0; +-} +- +-bool TinyXML::SaveDocument(const wxString& filename, TiXmlDocument* doc) +-{ +- if (!doc) +- return false; +- +- TiXmlPrinter printer; +- printer.SetIndent("\t"); +- doc->Accept(&printer); +- +- return Manager::Get()->GetFileManager()->SaveUTF8(filename, printer.CStr(), printer.Size()); +-} +- +diff --git a/src/sdk/Makefile.am b/src/sdk/Makefile.am +index 61b0389..998d3ef 100644 +--- a/src/sdk/Makefile.am ++++ b/src/sdk/Makefile.am +@@ -111,6 +111,7 @@ libcodeblocks_la_SOURCES = annoyingdialog.cpp \ + searchresultslog.cpp \ + selecttargetdlg.cpp \ + templatemanager.cpp \ ++ tinywxuni.cpp \ + toolsmanager.cpp \ + uservarmanager.cpp \ + virtualbuildtargetsdlg.cpp \ +diff --git a/src/sdk/tinywxuni.cpp b/src/sdk/tinywxuni.cpp +new file mode 100644 +index 0000000..57f48e3 +--- /dev/null ++++ b/src/sdk/tinywxuni.cpp +@@ -0,0 +1,56 @@ ++#include "sdk_precomp.h" ++ ++#ifndef CB_PRECOMP ++ #include ++ #include ++ #include "filemanager.h" ++ #include "manager.h" ++#endif ++ ++#include "tinywxuni.h" ++#include "tinyxml.h" ++ ++bool TinyXML::LoadDocument(const wxString& filename, TiXmlDocument *doc) ++{ ++ ++ if (!doc || !wxFile::Access(filename, wxFile::read)) ++ return false; ++ ++ wxFile file(filename); ++ size_t len = file.Length(); ++ ++ if (!len) ++ return false; ++ ++ char *input = new char[len+1]; ++ input[len] = '\0'; ++ file.Read(input, len); ++ ++ doc->Parse(input); ++ delete[] input; ++ return true; ++} ++ ++TiXmlDocument* TinyXML::LoadDocument(const wxString& filename) ++{ ++ TiXmlDocument* doc = new TiXmlDocument(); ++ ++ if (TinyXML::LoadDocument(filename, doc)) ++ return doc; ++ ++ delete doc; ++ return 0; ++} ++ ++bool TinyXML::SaveDocument(const wxString& filename, TiXmlDocument* doc) ++{ ++ if (!doc) ++ return false; ++ ++ TiXmlPrinter printer; ++ printer.SetIndent("\t"); ++ doc->Accept(&printer); ++ ++ return Manager::Get()->GetFileManager()->SaveUTF8(filename, printer.CStr(), printer.Size()); ++} ++ +-- +1.8.1.4 + + +From b6cf081205e8b943f161f5b75a46e675a8e64ce4 Mon Sep 17 00:00:00 2001 +From: Dan Horak +Date: Thu, 14 May 2009 10:04:35 +0200 +Subject: [PATCH 04/36] update C::B projects with new locations of tinywxuni + +--- + src/CodeBlocks-unix.cbp | 4 ++-- + src/CodeBlocks.cbp | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/CodeBlocks-unix.cbp b/src/CodeBlocks-unix.cbp +index a5673f5..bec2099 100644 +--- a/src/CodeBlocks-unix.cbp ++++ b/src/CodeBlocks-unix.cbp +@@ -526,7 +526,7 @@ + + +- ++ + + +@@ -1076,7 +1076,7 @@ + + +- ++ + + +diff --git a/src/CodeBlocks.cbp b/src/CodeBlocks.cbp +index 0f973ab..adf972b 100644 +--- a/src/CodeBlocks.cbp ++++ b/src/CodeBlocks.cbp +@@ -769,7 +769,7 @@ + + +- ++ + + +@@ -1319,7 +1319,7 @@ + + +- ++ + + +-- +1.8.1.4 + + +From db7a8721117026ca7e1f52b8f8bcbf9e3c792f46 Mon Sep 17 00:00:00 2001 +From: Dan Horak +Date: Thu, 14 May 2009 10:05:42 +0200 +Subject: [PATCH 05/36] convert autorevision to new tinyxml handling + +--- + src/build_tools/autorevision/Makefile.am | 4 ++++ + src/build_tools/autorevision/autorevision.cpp | 3 +-- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/build_tools/autorevision/Makefile.am b/src/build_tools/autorevision/Makefile.am +index dfb38a9..125e7dc 100644 +--- a/src/build_tools/autorevision/Makefile.am ++++ b/src/build_tools/autorevision/Makefile.am +@@ -3,7 +3,11 @@ auto_revision_SOURCES = autorevision.cpp + + AM_CPPFLAGS = -I$(top_srcdir)/src/include + ++if ! HAVE_TINYXML + auto_revision_LDADD = ../../base/tinyxml/libtinyxml.la ++else ++auto_revision_LDADD = -ltinyxml ++endif + + auto_revision_CXXFLAGS=-DTIXML_USE_STL + +diff --git a/src/build_tools/autorevision/autorevision.cpp b/src/build_tools/autorevision/autorevision.cpp +index 008a3ca..e0a632a 100644 +--- a/src/build_tools/autorevision/autorevision.cpp ++++ b/src/build_tools/autorevision/autorevision.cpp +@@ -11,8 +11,7 @@ + #include + #include + +-#include "tinyxml/tinystr.h" +-#include "tinyxml/tinyxml.h" ++#include + + using namespace std; + +-- +1.8.1.4 + + +From 2ae5531188b7d0674620e54b182c11e0c61a57c6 Mon Sep 17 00:00:00 2001 +From: Dan Horak +Date: Thu, 14 May 2009 17:33:02 +0200 +Subject: [PATCH 06/36] convert sdk to new tinyxml handling + +--- + src/include/configmanager.h | 3 +-- + src/include/projecttemplateloader.h | 2 +- + src/sdk/Makefile.am | 9 +++++++-- + src/sdk/globals.cpp | 2 +- + src/sdk/pluginmanager.cpp | 2 +- + src/sdk/projectlayoutloader.cpp | 2 +- + src/sdk/tinywxuni.cpp | 2 +- + src/sdk/workspaceloader.cpp | 2 +- + 8 files changed, 14 insertions(+), 10 deletions(-) + +diff --git a/src/include/configmanager.h b/src/include/configmanager.h +index 890efc8..a70d4f8 100644 +--- a/src/include/configmanager.h ++++ b/src/include/configmanager.h +@@ -12,8 +12,7 @@ + #include "settings.h" + #include "globals.h" + +-#include "tinyxml/tinystr.h" +-#include "tinyxml/tinyxml.h" ++#include + #include "manager.h" + #include "base64.h" + +diff --git a/src/include/projecttemplateloader.h b/src/include/projecttemplateloader.h +index 82b5c68..9add87c 100644 +--- a/src/include/projecttemplateloader.h ++++ b/src/include/projecttemplateloader.h +@@ -6,7 +6,7 @@ + #ifndef PROJECTTEMPLATELOADER_H + #define PROJECTTEMPLATELOADER_H + +-#include "tinyxml/tinyxml.h" ++#include + #include "settings.h" + + struct FileSetFile +diff --git a/src/sdk/Makefile.am b/src/sdk/Makefile.am +index 998d3ef..6f81492 100644 +--- a/src/sdk/Makefile.am ++++ b/src/sdk/Makefile.am +@@ -4,7 +4,6 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include \ + $(WXPROPGRID_INCLUDE) \ +- -I$(top_srcdir)/src/include/tinyxml \ + -I$(top_srcdir)/src/include/scripting/include \ + -I$(top_srcdir)/src/include/scripting/bindings \ + -I$(top_srcdir)/src/include/scripting/sqplus \ +@@ -23,11 +22,17 @@ libcodeblocks_la_LIBADD = scripting/bindings/libsqbindings.la \ + scripting/sqplus/libsqplus.la \ + scripting/sqstdlib/libsqstdlib.la \ + scripting/squirrel/libsquirrel.la \ +- ../base/tinyxml/libtinyxml.la \ + wxscintilla/libwxscintilla.la \ + $(WX_LIBS) \ + $(WXPROPGRID_LIB) + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++libcodeblocks_la_LIBADD += ../base/tinyxml/libtinyxml.la ++else ++libcodeblocks_la_LIBADD += -ltinyxml ++endif ++ + libcodeblocks_la_SOURCES = annoyingdialog.cpp \ + autodetectcompilers.cpp \ + base64.cpp \ +diff --git a/src/sdk/globals.cpp b/src/sdk/globals.cpp +index be12b59..196c77b 100644 +--- a/src/sdk/globals.cpp ++++ b/src/sdk/globals.cpp +@@ -29,7 +29,7 @@ + #include "projectmanager.h" + #endif + +-#include "tinyxml/tinyxml.h" ++#include + + #include + #include +diff --git a/src/sdk/pluginmanager.cpp b/src/sdk/pluginmanager.cpp +index ad96508..3089fcd 100644 +--- a/src/sdk/pluginmanager.cpp ++++ b/src/sdk/pluginmanager.cpp +@@ -42,7 +42,7 @@ + #include + + #include "filefilters.h" +-#include "tinyxml/tinyxml.h" ++#include + + #include "annoyingdialog.h" + #include "pluginsconfigurationdlg.h" +diff --git a/src/sdk/projectlayoutloader.cpp b/src/sdk/projectlayoutloader.cpp +index c9d6c43..b0f4025 100644 +--- a/src/sdk/projectlayoutloader.cpp ++++ b/src/sdk/projectlayoutloader.cpp +@@ -22,7 +22,7 @@ + #endif + + #include "projectlayoutloader.h" +-#include "tinyxml/tinyxml.h" ++#include + #include "tinywxuni.h" + + ProjectLayoutLoader::ProjectLayoutLoader(cbProject* project) +diff --git a/src/sdk/tinywxuni.cpp b/src/sdk/tinywxuni.cpp +index 57f48e3..3b159e7 100644 +--- a/src/sdk/tinywxuni.cpp ++++ b/src/sdk/tinywxuni.cpp +@@ -8,7 +8,7 @@ + #endif + + #include "tinywxuni.h" +-#include "tinyxml.h" ++#include + + bool TinyXML::LoadDocument(const wxString& filename, TiXmlDocument *doc) + { +diff --git a/src/sdk/workspaceloader.cpp b/src/sdk/workspaceloader.cpp +index accbd05..018a9bd 100644 +--- a/src/sdk/workspaceloader.cpp ++++ b/src/sdk/workspaceloader.cpp +@@ -27,7 +27,7 @@ + + + +-#include "tinyxml/tinyxml.h" ++#include + #include "tinywxuni.h" + + WorkspaceLoader::WorkspaceLoader() +-- +1.8.1.4 + + +From 8d9c0de74f7f5dacf1e1fbe02d2b71c35a2d09ad Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Sat, 16 May 2009 12:36:33 +0200 +Subject: [PATCH 07/36] update codecompletion plugin + +--- + src/plugins/codecompletion/Makefile.am | 4 ++++ + src/plugins/codecompletion/nativeparser.cpp | 1 + + 2 files changed, 5 insertions(+) + +diff --git a/src/plugins/codecompletion/Makefile.am b/src/plugins/codecompletion/Makefile.am +index 933a4da..4a86cec 100644 +--- a/src/plugins/codecompletion/Makefile.am ++++ b/src/plugins/codecompletion/Makefile.am +@@ -10,6 +10,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include/mozilla_chardet/xpcom/base \ + -I$(top_srcdir)/src/include/mozilla_chardet/xpcom/glue + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + + pluginlib_LTLIBRARIES = libcodecompletion.la +diff --git a/src/plugins/codecompletion/nativeparser.cpp b/src/plugins/codecompletion/nativeparser.cpp +index df7d2d7..7061e29 100644 +--- a/src/plugins/codecompletion/nativeparser.cpp ++++ b/src/plugins/codecompletion/nativeparser.cpp +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + + #include "nativeparser.h" + #include "classbrowser.h" +-- +1.8.1.4 + + +From a7b7731ba3b7046c2a77f2c33a9fa14e93950c33 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Sat, 16 May 2009 12:38:01 +0200 +Subject: [PATCH 08/36] update codesnippets plugin + +--- + src/plugins/contrib/codesnippets/Makefile.am | 4 ++++ + src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp | 1 - + src/plugins/contrib/codesnippets/codesnippetstreectrl.h | 2 +- + src/plugins/contrib/codesnippets/codesnippetswindow.cpp | 2 +- + 4 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/src/plugins/contrib/codesnippets/Makefile.am b/src/plugins/contrib/codesnippets/Makefile.am +index ce74ba6..f4c9911 100644 +--- a/src/plugins/contrib/codesnippets/Makefile.am ++++ b/src/plugins/contrib/codesnippets/Makefile.am +@@ -15,6 +15,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include/mozilla_chardet/xpcom/base \ + -I$(top_srcdir)/src/include/mozilla_chardet/xpcom/glue + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + + pluginlib_LTLIBRARIES = libcodesnippets.la +diff --git a/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp b/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp +index 65e6af5..ffbdc01 100644 +--- a/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp ++++ b/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp +@@ -41,7 +41,6 @@ + //-#else + //-#endif + +-#include + #include "snippetitemdata.h" + #include "codesnippetstreectrl.h" + #include "codesnippetswindow.h" +diff --git a/src/plugins/contrib/codesnippets/codesnippetstreectrl.h b/src/plugins/contrib/codesnippets/codesnippetstreectrl.h +index e5778ae..8bcccd7 100644 +--- a/src/plugins/contrib/codesnippets/codesnippetstreectrl.h ++++ b/src/plugins/contrib/codesnippets/codesnippetstreectrl.h +@@ -30,7 +30,7 @@ class TiXmlElement; + #include "wx/mimetype.h" + + #include "snippetitemdata.h" +-#include ++#include + #include "snippetproperty.h" + #include "codesnippetsevent.h" + #include "snippetsconfig.h" +diff --git a/src/plugins/contrib/codesnippets/codesnippetswindow.cpp b/src/plugins/contrib/codesnippets/codesnippetswindow.cpp +index c0d1db7..64c7dcb 100644 +--- a/src/plugins/contrib/codesnippets/codesnippetswindow.cpp ++++ b/src/plugins/contrib/codesnippets/codesnippetswindow.cpp +@@ -63,7 +63,7 @@ + #include "version.h" + #include "codesnippetswindow.h" + #include "snippetitemdata.h" +-#include ++#include + #include "snippetsconfig.h" + #include "snippetsimages.h" + #include "codesnippetstreectrl.h" +-- +1.8.1.4 + + +From f443969492824ed84097acd031c62c4ed1cae191 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Sat, 16 May 2009 12:39:05 +0200 +Subject: [PATCH 09/36] update envvars plugin + +--- + src/plugins/contrib/envvars/Makefile.am | 4 ++++ + src/plugins/contrib/envvars/envvars.cpp | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/plugins/contrib/envvars/Makefile.am b/src/plugins/contrib/envvars/Makefile.am +index 4d3aa5e..3452cca 100644 +--- a/src/plugins/contrib/envvars/Makefile.am ++++ b/src/plugins/contrib/envvars/Makefile.am +@@ -5,6 +5,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include/scripting/bindings \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + pkgdata_DATA = envvars.zip + +diff --git a/src/plugins/contrib/envvars/envvars.cpp b/src/plugins/contrib/envvars/envvars.cpp +index 1290b5a..bf72252 100644 +--- a/src/plugins/contrib/envvars/envvars.cpp ++++ b/src/plugins/contrib/envvars/envvars.cpp +@@ -15,7 +15,7 @@ + #include + #include + +- #include ++ #include + + #include "cbproject.h" + #include "globals.h" +-- +1.8.1.4 + + +From 8c61ee941dbc3d845f1ab47f2d080ebdc10d86d2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Sat, 16 May 2009 12:40:11 +0200 +Subject: [PATCH 10/36] update BrowseTracker plugin + +--- + src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp | 2 +- + src/plugins/contrib/BrowseTracker/Makefile.am | 4 ++++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp b/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp +index edeb044..44c3ae2 100644 +--- a/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp ++++ b/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp +@@ -46,7 +46,7 @@ + #endif + + #include +-#include "tinyxml/tinyxml.h" ++#include + #include "tinywxuni.h" + + #include "BrowseTrackerLayout.h" +diff --git a/src/plugins/contrib/BrowseTracker/Makefile.am b/src/plugins/contrib/BrowseTracker/Makefile.am +index ebd5650..7115870 100644 +--- a/src/plugins/contrib/BrowseTracker/Makefile.am ++++ b/src/plugins/contrib/BrowseTracker/Makefile.am +@@ -2,6 +2,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + + pluginlib_LTLIBRARIES = libBrowseTracker.la +-- +1.8.1.4 + + +From b0ba74a8d284c1c54f3c0f8cad9d1110ffa73337 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Sat, 16 May 2009 12:41:03 +0200 +Subject: [PATCH 11/36] update Valgrind plugin + +--- + src/plugins/contrib/Valgrind/Makefile.am | 4 ++++ + src/plugins/contrib/Valgrind/Valgrind.cpp | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/plugins/contrib/Valgrind/Makefile.am b/src/plugins/contrib/Valgrind/Makefile.am +index 755bd3e..826ad7d 100644 +--- a/src/plugins/contrib/Valgrind/Makefile.am ++++ b/src/plugins/contrib/Valgrind/Makefile.am +@@ -4,6 +4,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + + pluginlib_LTLIBRARIES = libValgrind.la +diff --git a/src/plugins/contrib/Valgrind/Valgrind.cpp b/src/plugins/contrib/Valgrind/Valgrind.cpp +index cfd399e..cbcec86 100644 +--- a/src/plugins/contrib/Valgrind/Valgrind.cpp ++++ b/src/plugins/contrib/Valgrind/Valgrind.cpp +@@ -25,7 +25,7 @@ + #include "macrosmanager.h" + #endif + #include +-#include "tinyxml/tinyxml.h" ++#include + #include "loggers.h" + #include "Valgrind.h" + #include "ValgrindListLog.h" +-- +1.8.1.4 + + +From 2a11b3af7b9dc71075d9c5c2ed797ec6b806b8ff Mon Sep 17 00:00:00 2001 +From: Dan Horak +Date: Sat, 16 May 2009 12:04:35 +0200 +Subject: [PATCH 12/36] convert AutoVersioning plugin + +--- + src/plugins/contrib/AutoVersioning/AutoVersioning.cpp | 4 ++-- + src/plugins/contrib/AutoVersioning/Makefile.am | 4 ++++ + src/plugins/contrib/AutoVersioning/avSvnRevision.cpp | 2 +- + 3 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/plugins/contrib/AutoVersioning/AutoVersioning.cpp b/src/plugins/contrib/AutoVersioning/AutoVersioning.cpp +index f8603df..e049b07 100644 +--- a/src/plugins/contrib/AutoVersioning/AutoVersioning.cpp ++++ b/src/plugins/contrib/AutoVersioning/AutoVersioning.cpp +@@ -17,9 +17,9 @@ + #include + #include + #include +-#include ++#include + #endif +-#include ++#include + #include + + #include "projectloader_hooks.h" +diff --git a/src/plugins/contrib/AutoVersioning/Makefile.am b/src/plugins/contrib/AutoVersioning/Makefile.am +index 54012bf..e60f5fc 100644 +--- a/src/plugins/contrib/AutoVersioning/Makefile.am ++++ b/src/plugins/contrib/AutoVersioning/Makefile.am +@@ -2,6 +2,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + + pluginlib_LTLIBRARIES = libAutoVersioning.la +diff --git a/src/plugins/contrib/AutoVersioning/avSvnRevision.cpp b/src/plugins/contrib/AutoVersioning/avSvnRevision.cpp +index f99bd02..522a86f 100644 +--- a/src/plugins/contrib/AutoVersioning/avSvnRevision.cpp ++++ b/src/plugins/contrib/AutoVersioning/avSvnRevision.cpp +@@ -3,7 +3,7 @@ + #include + #include + #include +-#include ++#include + #include + + bool QuerySvn(const wxString& workingDir, wxString& revision, wxString& date) +-- +1.8.1.4 + + +From 321776b3c0b1d2c64f7c71480d012ef379c0cb93 Mon Sep 17 00:00:00 2001 +From: Dan Horak +Date: Sat, 16 May 2009 12:10:45 +0200 +Subject: [PATCH 13/36] convert lib_finder plugin + +--- + src/plugins/contrib/lib_finder/Makefile.am | 4 ++++ + src/plugins/contrib/lib_finder/lib_finder.h | 2 +- + src/plugins/contrib/lib_finder/librarydetectionmanager.cpp | 2 +- + src/plugins/contrib/lib_finder/projectconfiguration.h | 2 +- + 4 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/plugins/contrib/lib_finder/Makefile.am b/src/plugins/contrib/lib_finder/Makefile.am +index 8c40ff0..c92550a 100644 +--- a/src/plugins/contrib/lib_finder/Makefile.am ++++ b/src/plugins/contrib/lib_finder/Makefile.am +@@ -15,6 +15,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include/mozilla_chardet/xpcom/base \ + -I$(top_srcdir)/src/include/mozilla_chardet/xpcom/glue + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + + pluginlib_LTLIBRARIES = liblib_finder.la +diff --git a/src/plugins/contrib/lib_finder/lib_finder.h b/src/plugins/contrib/lib_finder/lib_finder.h +index 0b03a40..9e0aa3a 100644 +--- a/src/plugins/contrib/lib_finder/lib_finder.h ++++ b/src/plugins/contrib/lib_finder/lib_finder.h +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include + + #include "librarydetectionmanager.h" + #include "resultmap.h" +diff --git a/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp b/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp +index a58776f..1c6985d 100644 +--- a/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp ++++ b/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp +@@ -21,7 +21,7 @@ + * $HeadURL: http://svn.code.sf.net/p/codeblocks/code/branches/release-xx.yy/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp $ + */ + +-#include ++#include + #include + + #include +diff --git a/src/plugins/contrib/lib_finder/projectconfiguration.h b/src/plugins/contrib/lib_finder/projectconfiguration.h +index e7a337b..6416f09 100644 +--- a/src/plugins/contrib/lib_finder/projectconfiguration.h ++++ b/src/plugins/contrib/lib_finder/projectconfiguration.h +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include + #include + + /** \brief Configuration of one project */ +-- +1.8.1.4 + + +From 3e7ad38521cc950da2d2b26b01d14d36afb66bbf Mon Sep 17 00:00:00 2001 +From: Dan Horak +Date: Sat, 16 May 2009 12:20:55 +0200 +Subject: [PATCH 14/36] convert wxSmith plugin + +--- + src/plugins/contrib/wxSmith/Makefile.am | 4 ++++ + src/plugins/contrib/wxSmith/properties/Makefile.am | 4 ++++ + src/plugins/contrib/wxSmith/properties/wxsproperty.h | 2 +- + src/plugins/contrib/wxSmith/wxsgui.h | 2 +- + src/plugins/contrib/wxSmith/wxsmith.h | 2 +- + src/plugins/contrib/wxSmith/wxsproject.h | 2 +- + src/plugins/contrib/wxSmith/wxsversionconverter.h | 2 +- + src/plugins/contrib/wxSmith/wxwidgets/Makefile.am | 4 ++++ + src/plugins/contrib/wxSmith/wxwidgets/wxsevents.h | 2 +- + src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdataobject.h | 2 +- + 10 files changed, 19 insertions(+), 7 deletions(-) + +diff --git a/src/plugins/contrib/wxSmith/Makefile.am b/src/plugins/contrib/wxSmith/Makefile.am +index 97fcb68..866be15 100644 +--- a/src/plugins/contrib/wxSmith/Makefile.am ++++ b/src/plugins/contrib/wxSmith/Makefile.am +@@ -15,6 +15,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include/mozilla_chardet/xpcom/base \ + -I$(top_srcdir)/src/include/mozilla_chardet/xpcom/glue + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + lib_LTLIBRARIES = libwxsmithlib.la + + libwxsmithlib_la_LDFLAGS = -version-info 0:1:0 -shared +diff --git a/src/plugins/contrib/wxSmith/properties/Makefile.am b/src/plugins/contrib/wxSmith/properties/Makefile.am +index aaa869d..356ace9 100644 +--- a/src/plugins/contrib/wxSmith/properties/Makefile.am ++++ b/src/plugins/contrib/wxSmith/properties/Makefile.am +@@ -3,6 +3,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/sdk/wxscintilla/include \ + $(WXPROPGRID_INCLUDE) + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + noinst_LTLIBRARIES = libwxsmith_properties.la + + libwxsmith_properties_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version +diff --git a/src/plugins/contrib/wxSmith/properties/wxsproperty.h b/src/plugins/contrib/wxSmith/properties/wxsproperty.h +index 390924f..3cafe19 100644 +--- a/src/plugins/contrib/wxSmith/properties/wxsproperty.h ++++ b/src/plugins/contrib/wxSmith/properties/wxsproperty.h +@@ -34,7 +34,7 @@ + #include + #include + +-#include ++#include + #include + + #include "wxspropertystream.h" +diff --git a/src/plugins/contrib/wxSmith/wxsgui.h b/src/plugins/contrib/wxSmith/wxsgui.h +index 7694750..48a06e3 100644 +--- a/src/plugins/contrib/wxSmith/wxsgui.h ++++ b/src/plugins/contrib/wxSmith/wxsgui.h +@@ -24,7 +24,7 @@ + #define WXSGUI_H + + #include +-#include ++#include + #include "wxsguifactory.h" + #include "wxsproject.h" + +diff --git a/src/plugins/contrib/wxSmith/wxsmith.h b/src/plugins/contrib/wxSmith/wxsmith.h +index bf7e712..00efe02 100644 +--- a/src/plugins/contrib/wxSmith/wxsmith.h ++++ b/src/plugins/contrib/wxSmith/wxsmith.h +@@ -29,7 +29,7 @@ + #include + #include + #include +-#include ++#include + + #include "wxsstoringsplitterwindow.h" + #include "wxsresourcetree.h" +diff --git a/src/plugins/contrib/wxSmith/wxsproject.h b/src/plugins/contrib/wxSmith/wxsproject.h +index 7809091..dde9f20 100644 +--- a/src/plugins/contrib/wxSmith/wxsproject.h ++++ b/src/plugins/contrib/wxSmith/wxsproject.h +@@ -24,7 +24,7 @@ + #define WXSPROJECT_H + + #include +-#include ++#include + #include "wxsresourcetree.h" + + class wxSmith; +diff --git a/src/plugins/contrib/wxSmith/wxsversionconverter.h b/src/plugins/contrib/wxSmith/wxsversionconverter.h +index 3502492..b4b5eb2 100644 +--- a/src/plugins/contrib/wxSmith/wxsversionconverter.h ++++ b/src/plugins/contrib/wxSmith/wxsversionconverter.h +@@ -23,7 +23,7 @@ + #ifndef WXSVERSIONCONVERTER_H + #define WXSVERSIONCONVERTER_H + +-#include ++#include + #include + + class wxsProject; +diff --git a/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am b/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am +index 76d111b..313f2e4 100644 +--- a/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am ++++ b/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am +@@ -9,6 +9,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include/scripting/sqplus \ + -I$(top_srcdir)/src/include/scripting/bindings + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + noinst_LTLIBRARIES = libwxsmith_wxwidgets.la + + libwxsmith_wxwidgets_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version +diff --git a/src/plugins/contrib/wxSmith/wxwidgets/wxsevents.h b/src/plugins/contrib/wxSmith/wxwidgets/wxsevents.h +index 3d0e599..80bffc0 100644 +--- a/src/plugins/contrib/wxSmith/wxwidgets/wxsevents.h ++++ b/src/plugins/contrib/wxSmith/wxwidgets/wxsevents.h +@@ -24,7 +24,7 @@ + #define WXSEVENTS_H + + #include +-#include ++#include + #include + + #include "wxscodercontext.h" +diff --git a/src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdataobject.h b/src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdataobject.h +index de6c60d..7a6dee2 100644 +--- a/src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdataobject.h ++++ b/src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdataobject.h +@@ -24,7 +24,7 @@ + #define WXSITEMRESDATAOBJECT_H + + #include +-#include ++#include + + #define wxsDF_WIDGET _T("wxSmith XML") + +-- +1.8.1.4 + + +From 1a3450998fa22044ee0536a3ff22c9a0a972c1ee Mon Sep 17 00:00:00 2001 +From: Dan Horak +Date: Sat, 16 May 2009 12:23:54 +0200 +Subject: [PATCH 15/36] convert cb_share_config tool + +--- + src/tools/cb_share_config/Makefile.am | 7 ++++++- + src/tools/cb_share_config/mainframe.h | 3 +-- + 2 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/tools/cb_share_config/Makefile.am b/src/tools/cb_share_config/Makefile.am +index abba83d..689861a 100644 +--- a/src/tools/cb_share_config/Makefile.am ++++ b/src/tools/cb_share_config/Makefile.am +@@ -2,12 +2,17 @@ bin_PROGRAMS = cb_share_config + + AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ +- -I$(top_srcdir)/src/include/tinyxml + + cb_share_config_LDFLAGS = + ++if ! HAVE_TINYXML ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + cb_share_config_LDADD = ../../base/tinyxml/libtinyxml.la \ + $(WX_LIBS) ++else ++cb_share_config_LDADD = -ltinyxml $(WX_LIBS) ++endif ++ + + cb_share_config_SOURCES = app.cpp \ + mainframe.cpp +diff --git a/src/tools/cb_share_config/mainframe.h b/src/tools/cb_share_config/mainframe.h +index c49e790..b658bad 100644 +--- a/src/tools/cb_share_config/mainframe.h ++++ b/src/tools/cb_share_config/mainframe.h +@@ -20,8 +20,7 @@ + #include + #include + +-#include "tinyxml/tinystr.h" +-#include "tinyxml/tinyxml.h" ++#include + + class MainFrame: public wxFrame + { +-- +1.8.1.4 + + +From f1ba7b4854d59550af53f488e5c06d0194bdde0f Mon Sep 17 00:00:00 2001 +From: Dan Horak +Date: Sat, 16 May 2009 12:26:31 +0200 +Subject: [PATCH 16/36] build local copy of tinyxml library only when no system + tinyxml library exists + +--- + src/base/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/base/Makefile.am b/src/base/Makefile.am +index 34e0b85..eec0652 100644 +--- a/src/base/Makefile.am ++++ b/src/base/Makefile.am +@@ -1,3 +1,5 @@ ++if ! HAVE_TINYXML + SUBDIRS = tinyxml ++endif + + EXTRA_DIST = exchndl +-- +1.8.1.4 + + +From 81f96b81b2e5cecd76aac48f137c11d72d9981ed Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Sat, 16 May 2009 13:07:12 +0200 +Subject: [PATCH 17/36] fix include dirs for the main app when system tinyxml + is not present + +--- + src/plugins/autosave/Makefile.am | 4 ++++ + src/plugins/contrib/HexEditor/Makefile.am | 4 ++++ + src/plugins/contrib/ThreadSearch/Makefile.am | 4 ++++ + src/plugins/contrib/byogames/Makefile.am | 4 ++++ + src/plugins/contrib/codesnippets/resources/Makefile.am | 4 ++++ + src/plugins/contrib/dragscroll/Makefile.am | 4 ++++ + src/plugins/contrib/headerfixup/Makefile.am | 4 ++++ + src/plugins/contrib/keybinder/Makefile.am | 4 ++++ + src/plugins/contrib/wxSmith/plugin/Makefile.am | 4 ++++ + src/plugins/contrib/wxSmith/wxwidgets/defitems/Makefile.am | 4 ++++ + src/plugins/contrib/wxSmith/wxwidgets/properties/Makefile.am | 4 ++++ + src/plugins/contrib/wxSmithContribItems/Makefile.am | 4 ++++ + src/plugins/openfileslist/Makefile.am | 4 ++++ + src/plugins/projectsimporter/Makefile.am | 3 +++ + src/plugins/scriptedwizard/Makefile.am | 4 ++++ + src/src/Makefile.am | 4 ++++ + 16 files changed, 63 insertions(+) + +diff --git a/src/plugins/autosave/Makefile.am b/src/plugins/autosave/Makefile.am +index 48ef8ea..0c34bed 100644 +--- a/src/plugins/autosave/Makefile.am ++++ b/src/plugins/autosave/Makefile.am +@@ -2,6 +2,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + + pluginlib_LTLIBRARIES = libautosave.la +diff --git a/src/plugins/contrib/HexEditor/Makefile.am b/src/plugins/contrib/HexEditor/Makefile.am +index 1fc237e..e0207df 100644 +--- a/src/plugins/contrib/HexEditor/Makefile.am ++++ b/src/plugins/contrib/HexEditor/Makefile.am +@@ -2,6 +2,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + + pluginlib_LTLIBRARIES = libHexEditor.la +diff --git a/src/plugins/contrib/ThreadSearch/Makefile.am b/src/plugins/contrib/ThreadSearch/Makefile.am +index f4a9e1b..9bdd975 100644 +--- a/src/plugins/contrib/ThreadSearch/Makefile.am ++++ b/src/plugins/contrib/ThreadSearch/Makefile.am +@@ -11,6 +11,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include/mozilla_chardet/xpcom/glue \ + -I$(srcdir)/../wxContribItems/wxthings/include + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + + pluginlib_LTLIBRARIES = libThreadSearch.la +diff --git a/src/plugins/contrib/byogames/Makefile.am b/src/plugins/contrib/byogames/Makefile.am +index 953d50a..d550aa9 100644 +--- a/src/plugins/contrib/byogames/Makefile.am ++++ b/src/plugins/contrib/byogames/Makefile.am +@@ -2,6 +2,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + + pluginlib_LTLIBRARIES = libbyogames.la +diff --git a/src/plugins/contrib/codesnippets/resources/Makefile.am b/src/plugins/contrib/codesnippets/resources/Makefile.am +index b8c2402..94a0273 100644 +--- a/src/plugins/contrib/codesnippets/resources/Makefile.am ++++ b/src/plugins/contrib/codesnippets/resources/Makefile.am +@@ -13,6 +13,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include/mozilla_chardet/xpcom/base \ + -I$(top_srcdir)/src/include/mozilla_chardet/xpcom/glue + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + + ##pluginlib_LTLIBRARIES = codesnippets +diff --git a/src/plugins/contrib/dragscroll/Makefile.am b/src/plugins/contrib/dragscroll/Makefile.am +index 0773b14..766000a 100644 +--- a/src/plugins/contrib/dragscroll/Makefile.am ++++ b/src/plugins/contrib/dragscroll/Makefile.am +@@ -3,6 +3,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/src \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + + pluginlib_LTLIBRARIES = libdragscroll.la +diff --git a/src/plugins/contrib/headerfixup/Makefile.am b/src/plugins/contrib/headerfixup/Makefile.am +index 54ba93c..94ded5f 100644 +--- a/src/plugins/contrib/headerfixup/Makefile.am ++++ b/src/plugins/contrib/headerfixup/Makefile.am +@@ -2,6 +2,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + CXXFLAGS = @CXXFLAGS@ -O0 + + pluginlibdir = $(pkglibdir)/plugins +diff --git a/src/plugins/contrib/keybinder/Makefile.am b/src/plugins/contrib/keybinder/Makefile.am +index f672f5b..3647ee9 100644 +--- a/src/plugins/contrib/keybinder/Makefile.am ++++ b/src/plugins/contrib/keybinder/Makefile.am +@@ -2,6 +2,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + + pluginlib_LTLIBRARIES = libkeybinder.la +diff --git a/src/plugins/contrib/wxSmith/plugin/Makefile.am b/src/plugins/contrib/wxSmith/plugin/Makefile.am +index 79c5c83..869d4eb 100644 +--- a/src/plugins/contrib/wxSmith/plugin/Makefile.am ++++ b/src/plugins/contrib/wxSmith/plugin/Makefile.am +@@ -3,6 +3,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/sdk/wxscintilla/include \ + $(WXPROPGRID_INCLUDE) + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + pluginlib_LTLIBRARIES = libwxsmith.la + + pluginlibdir = $(pkglibdir)/plugins +diff --git a/src/plugins/contrib/wxSmith/wxwidgets/defitems/Makefile.am b/src/plugins/contrib/wxSmith/wxwidgets/defitems/Makefile.am +index df7b1e3..3b68116 100644 +--- a/src/plugins/contrib/wxSmith/wxwidgets/defitems/Makefile.am ++++ b/src/plugins/contrib/wxSmith/wxwidgets/defitems/Makefile.am +@@ -3,6 +3,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/sdk/wxscintilla/include \ + $(WXPROPGRID_INCLUDE) + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + noinst_LTLIBRARIES = libwxsmith_wxwidgets_defitems.la + + libwxsmith_wxwidgets_defitems_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version +diff --git a/src/plugins/contrib/wxSmith/wxwidgets/properties/Makefile.am b/src/plugins/contrib/wxSmith/wxwidgets/properties/Makefile.am +index fd07ebb..56dfa9b 100644 +--- a/src/plugins/contrib/wxSmith/wxwidgets/properties/Makefile.am ++++ b/src/plugins/contrib/wxSmith/wxwidgets/properties/Makefile.am +@@ -3,6 +3,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/sdk/wxscintilla/include \ + $(WXPROPGRID_INCLUDE) + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + noinst_LTLIBRARIES = libwxsmith_wxwidgets_properties.la + + libwxsmith_wxwidgets_properties_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version +diff --git a/src/plugins/contrib/wxSmithContribItems/Makefile.am b/src/plugins/contrib/wxSmithContribItems/Makefile.am +index f0cca74..ea94ec3 100644 +--- a/src/plugins/contrib/wxSmithContribItems/Makefile.am ++++ b/src/plugins/contrib/wxSmithContribItems/Makefile.am +@@ -19,6 +19,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(srcdir)/../wxContribItems/wxled/ledpanel/include + + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + + pluginlib_LTLIBRARIES = libwxsmithcontribitems.la +diff --git a/src/plugins/openfileslist/Makefile.am b/src/plugins/openfileslist/Makefile.am +index 9f863e0..1ddb747 100644 +--- a/src/plugins/openfileslist/Makefile.am ++++ b/src/plugins/openfileslist/Makefile.am +@@ -2,6 +2,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + + pluginlib_LTLIBRARIES = libopenfileslist.la +diff --git a/src/plugins/projectsimporter/Makefile.am b/src/plugins/projectsimporter/Makefile.am +index d22b42a..bb0205b 100644 +--- a/src/plugins/projectsimporter/Makefile.am ++++ b/src/plugins/projectsimporter/Makefile.am +@@ -10,6 +10,9 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include/mozilla_chardet/xpcom/base \ + -I$(top_srcdir)/src/include/mozilla_chardet/xpcom/glue + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif + + pluginlibdir = $(pkglibdir)/plugins + +diff --git a/src/plugins/scriptedwizard/Makefile.am b/src/plugins/scriptedwizard/Makefile.am +index e14945c..a116b98 100644 +--- a/src/plugins/scriptedwizard/Makefile.am ++++ b/src/plugins/scriptedwizard/Makefile.am +@@ -6,6 +6,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include/scripting/include \ + -I$(top_srcdir)/src/include/scripting/sqplus + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + + pluginlib_LTLIBRARIES = libscriptedwizard.la +diff --git a/src/src/Makefile.am b/src/src/Makefile.am +index 76059eb..fa8c325 100644 +--- a/src/src/Makefile.am ++++ b/src/src/Makefile.am +@@ -13,6 +13,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include/mozilla_chardet/xpcom/base \ + -I$(top_srcdir)/src/include/mozilla_chardet/xpcom/glue + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + if GTK_NOTEBOOK + GTK_NOTEBOOK_FLAGS = -DUSE_GTK_NOTEBOOK + endif +-- +1.8.1.4 + + +From 4395f32aac48dc210dfca123142055c4062d11fb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Tue, 18 Aug 2009 13:21:38 +0200 +Subject: [PATCH 18/36] use/install local timyxml headers only when a + system-wide instance doesn't exist + +--- + src/include/Makefile.am | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/include/Makefile.am b/src/include/Makefile.am +index f7d7382..bfe01c6 100644 +--- a/src/include/Makefile.am ++++ b/src/include/Makefile.am +@@ -1,4 +1,4 @@ +-SUBDIRS = scripting tinyxml ++SUBDIRS = scripting + + if PRECOMPILE_HEADERS + BUILT_SOURCES = $(top_builddir)/src/include/sdk.h.gch \ +@@ -10,7 +10,6 @@ endif + AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include \ +- -I$(top_srcdir)/src/include/tinyxml \ + -I$(top_srcdir)/src/include/scripting/include \ + -I$(top_srcdir)/src/include/scripting/sqplus \ + -I$(top_srcdir)/src/include/mozilla_chardet \ +@@ -20,6 +19,11 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include/mozilla_chardet/xpcom/base \ + -I$(top_srcdir)/src/include/mozilla_chardet/xpcom/glue + ++if ! HAVE_TINYXML ++SUBDIRS += tinyxml ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + # Because we are not generating any programs/libraries with this makefile, + # $(CXXCOMPILE) is empty. + # Create the basic one here: +-- +1.8.1.4 + + +From 1463a4bf2b556267a18e6298377785017f581fb1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Tue, 18 Aug 2009 13:56:15 +0200 +Subject: [PATCH 19/36] fix linking with tinyxml in the codesnippets plugin + +--- + src/plugins/contrib/codesnippets/resources/Makefile.am | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/src/plugins/contrib/codesnippets/resources/Makefile.am b/src/plugins/contrib/codesnippets/resources/Makefile.am +index 94a0273..54cd35d 100644 +--- a/src/plugins/contrib/codesnippets/resources/Makefile.am ++++ b/src/plugins/contrib/codesnippets/resources/Makefile.am +@@ -13,10 +13,6 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include/mozilla_chardet/xpcom/base \ + -I$(top_srcdir)/src/include/mozilla_chardet/xpcom/glue + +-if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml +-endif +- + pluginlibdir = $(pkglibdir)/plugins + + ##pluginlib_LTLIBRARIES = codesnippets +@@ -25,9 +21,14 @@ bin_PROGRAMS = codesnippets + ##codesnippets_LIBADD = $(WX_LIBS) ../../../../sdk/libcodeblocks.la + ##codesnippets_LDADD = $(WX_LIBS) ../../../../sdk/libcodeblocks.la + codesnippets_LDADD = -L../../../../sdk ../../../../sdk/libcodeblocks.la \ +- ../../../../base/tinyxml/libtinyxml.la \ ++ -ltinyxml \ + $(WX_LIBS) $(WX_GTK2_LIBS) $(WX_X11_LIBS) + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++codesnippets_LDADD += -L../../../../base/tinyxml ++endif ++ + codesnippets_SOURCES = $(srcdir)/../version.cpp \ + $(srcdir)/../Search/DirectoryParamsPanel.cpp \ + $(srcdir)/../Search/InsertIndexManager.cpp \ +-- +1.8.1.4 + + +From 035e1aee923d1678a9ab8afb5f3fe4bef4b5c078 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Mon, 15 Feb 2010 21:34:45 +0100 +Subject: [PATCH 20/36] fix tinyxml includes in the help plugin + +--- + src/plugins/contrib/help_plugin/Makefile.am | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/plugins/contrib/help_plugin/Makefile.am b/src/plugins/contrib/help_plugin/Makefile.am +index d71d32e..181a54d 100644 +--- a/src/plugins/contrib/help_plugin/Makefile.am ++++ b/src/plugins/contrib/help_plugin/Makefile.am +@@ -37,6 +37,10 @@ else + libhelp_plugin_la_LIBADD += -lz + endif + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + libhelp_plugin_la_SOURCES = help_common.cpp \ + HelpConfigDialog.cpp \ + help_plugin.cpp \ +-- +1.8.1.4 + + +From 7899a4b1c0afb576a92d9f014cef7398e467fcc9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Mon, 15 Feb 2010 21:37:48 +0100 +Subject: [PATCH 21/36] fix tinyxml includes in the wxSmithAui plugin + +--- + src/plugins/contrib/wxSmithAui/Makefile.am | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/plugins/contrib/wxSmithAui/Makefile.am b/src/plugins/contrib/wxSmithAui/Makefile.am +index 097bae1..367d04f 100644 +--- a/src/plugins/contrib/wxSmithAui/Makefile.am ++++ b/src/plugins/contrib/wxSmithAui/Makefile.am +@@ -7,6 +7,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(srcdir)/wxAuiNotebook \ + -I$(srcdir)/wxAuiToolBar + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + + pluginlib_LTLIBRARIES = libwxSmithAui.la +-- +1.8.1.4 + + +From 8986bf6d90ad640e7ae1a628725eb5810dc6ee91 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Mon, 15 Feb 2010 21:39:14 +0100 +Subject: [PATCH 22/36] fix tinyxml includes in the MouseSap plugin + +--- + src/plugins/contrib/MouseSap/Makefile.am | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/plugins/contrib/MouseSap/Makefile.am b/src/plugins/contrib/MouseSap/Makefile.am +index c13907e..3c887ae 100644 +--- a/src/plugins/contrib/MouseSap/Makefile.am ++++ b/src/plugins/contrib/MouseSap/Makefile.am +@@ -3,6 +3,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + + pluginlib_LTLIBRARIES = libMouseSap.la +-- +1.8.1.4 + + +From 3e821940a0c7dfec7f46c1b875f97189a1177205 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Tue, 24 Aug 2010 08:55:17 +0200 +Subject: [PATCH 23/36] fix tinyxml includes in the DoxyBlocks plugin + +--- + src/plugins/contrib/DoxyBlocks/DoxyBlocks.cpp | 2 +- + src/plugins/contrib/DoxyBlocks/Makefile.am | 4 ++++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/plugins/contrib/DoxyBlocks/DoxyBlocks.cpp b/src/plugins/contrib/DoxyBlocks/DoxyBlocks.cpp +index a7d1273..403996b 100644 +--- a/src/plugins/contrib/DoxyBlocks/DoxyBlocks.cpp ++++ b/src/plugins/contrib/DoxyBlocks/DoxyBlocks.cpp +@@ -40,7 +40,7 @@ + #include + #include + #include +-#include ++#include + + #include + #include +diff --git a/src/plugins/contrib/DoxyBlocks/Makefile.am b/src/plugins/contrib/DoxyBlocks/Makefile.am +index 76a9ad5..eab64ae 100644 +--- a/src/plugins/contrib/DoxyBlocks/Makefile.am ++++ b/src/plugins/contrib/DoxyBlocks/Makefile.am +@@ -4,6 +4,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + + pluginlib_LTLIBRARIES = libDoxyBlocks.la +-- +1.8.1.4 + + +From 5cf0e20d5b59410c5103c318fad44f6c73288c8d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Tue, 24 Aug 2010 09:55:32 +0200 +Subject: [PATCH 24/36] fix tinyxml includes in the NassiShneiderman plugin + +--- + src/plugins/contrib/NassiShneiderman/Makefile.am | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/plugins/contrib/NassiShneiderman/Makefile.am b/src/plugins/contrib/NassiShneiderman/Makefile.am +index c6342a2..7ad0175 100644 +--- a/src/plugins/contrib/NassiShneiderman/Makefile.am ++++ b/src/plugins/contrib/NassiShneiderman/Makefile.am +@@ -2,6 +2,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + + pluginlib_LTLIBRARIES = libNassiShneiderman.la +-- +1.8.1.4 + + +From de25009da8e358ede39832ce564f35c846243247 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Sun, 23 Jan 2011 09:38:55 +0100 +Subject: [PATCH 25/36] fix tinyxml includes in the ReopenEditor plugin + +--- + src/plugins/contrib/ReopenEditor/Makefile.am | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/plugins/contrib/ReopenEditor/Makefile.am b/src/plugins/contrib/ReopenEditor/Makefile.am +index 2b8a355..6d66e53 100644 +--- a/src/plugins/contrib/ReopenEditor/Makefile.am ++++ b/src/plugins/contrib/ReopenEditor/Makefile.am +@@ -2,6 +2,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + + pluginlib_LTLIBRARIES = libReopenEditor.la +-- +1.8.1.4 + + +From 9ee64d3cf3b806463dba4e78f3bad12ec2eba941 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Sat, 14 Jan 2012 23:50:27 +0100 +Subject: [PATCH 26/36] fix tinyxml includes in the DoxyBlock plugin + +--- + src/plugins/contrib/DoxyBlocks/ConfigPanel.cpp | 2 +- + src/plugins/contrib/DoxyBlocks/DoxyBlocks.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/plugins/contrib/DoxyBlocks/ConfigPanel.cpp b/src/plugins/contrib/DoxyBlocks/ConfigPanel.cpp +index 3a62a02..79499a5 100644 +--- a/src/plugins/contrib/DoxyBlocks/ConfigPanel.cpp ++++ b/src/plugins/contrib/DoxyBlocks/ConfigPanel.cpp +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + + #include "version.h" + +diff --git a/src/plugins/contrib/DoxyBlocks/DoxyBlocks.h b/src/plugins/contrib/DoxyBlocks/DoxyBlocks.h +index daa0b5b..dfc7541 100644 +--- a/src/plugins/contrib/DoxyBlocks/DoxyBlocks.h ++++ b/src/plugins/contrib/DoxyBlocks/DoxyBlocks.h +@@ -25,7 +25,7 @@ + + #include + #include +-#include ++#include + + #include "Config.h" + +-- +1.8.1.4 + + +From dfe05fa173c9fc198f8f62ac1be7496eab1678ec Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Sat, 14 Jan 2012 23:51:39 +0100 +Subject: [PATCH 27/36] fix tinyxml includes in the CppCheck plugin + +--- + src/plugins/contrib/CppCheck/CppCheck.cpp | 2 +- + src/plugins/contrib/CppCheck/Makefile.am | 4 ++++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/plugins/contrib/CppCheck/CppCheck.cpp b/src/plugins/contrib/CppCheck/CppCheck.cpp +index 19445fa..953d395 100644 +--- a/src/plugins/contrib/CppCheck/CppCheck.cpp ++++ b/src/plugins/contrib/CppCheck/CppCheck.cpp +@@ -32,7 +32,7 @@ + #include + #include + +-#include "tinyxml/tinyxml.h" ++#include + #include "filefilters.h" + #include "loggers.h" + +diff --git a/src/plugins/contrib/CppCheck/Makefile.am b/src/plugins/contrib/CppCheck/Makefile.am +index 0e3550f..b46e2b7 100644 +--- a/src/plugins/contrib/CppCheck/Makefile.am ++++ b/src/plugins/contrib/CppCheck/Makefile.am +@@ -4,6 +4,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + + pluginlib_LTLIBRARIES = libCppCheck.la +-- +1.8.1.4 + + +From da633ad64298c9c4e12cd8f9a8896c4bdba40a92 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Sat, 16 May 2009 13:07:12 +0200 +Subject: [PATCH 28/36] fix include dirs for the main app when system tinyxml + is not present + +--- + src/plugins/contrib/codesnippets/resources/Makefile.am | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/plugins/contrib/codesnippets/resources/Makefile.am b/src/plugins/contrib/codesnippets/resources/Makefile.am +index 54cd35d..5735fec 100644 +--- a/src/plugins/contrib/codesnippets/resources/Makefile.am ++++ b/src/plugins/contrib/codesnippets/resources/Makefile.am +@@ -13,6 +13,10 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include/mozilla_chardet/xpcom/base \ + -I$(top_srcdir)/src/include/mozilla_chardet/xpcom/glue + ++if ! HAVE_TINYXML ++INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + + ##pluginlib_LTLIBRARIES = codesnippets +-- +1.8.1.4 + + +From 8ea1b6175a0ca367f59a6edea90b3ec87b14412c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Sun, 2 Sep 2012 15:34:58 +0200 +Subject: [PATCH 29/36] fix tinyxml includes in projectimporter plugin + +--- + src/plugins/projectsimporter/msvc10loader.cpp | 2 +- + src/plugins/projectsimporter/msvc7loader.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/plugins/projectsimporter/msvc10loader.cpp b/src/plugins/projectsimporter/msvc10loader.cpp +index e6c6856..f071c43 100644 +--- a/src/plugins/projectsimporter/msvc10loader.cpp ++++ b/src/plugins/projectsimporter/msvc10loader.cpp +@@ -23,7 +23,7 @@ + + #include + +-#include ++#include + + #include "prep.h" + #include "msvc10loader.h" +diff --git a/src/plugins/projectsimporter/msvc7loader.cpp b/src/plugins/projectsimporter/msvc7loader.cpp +index 7d1aae8..3eee8d0 100644 +--- a/src/plugins/projectsimporter/msvc7loader.cpp ++++ b/src/plugins/projectsimporter/msvc7loader.cpp +@@ -23,7 +23,7 @@ + + #include + +-#include ++#include + + #include "prep.h" + #include "msvc7loader.h" +-- +1.8.1.4 + + +From 19a01f30c3fa30d87531a60354d1b75624921e2b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Sat, 14 Jan 2012 17:35:30 +0100 +Subject: [PATCH 30/36] add check for squirrel to configure.in + +--- + configure.ac | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 9997857..2617746 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -71,11 +71,19 @@ AC_CHECK_HEADER(tinyxml.h, [HAVE_TINYXML=yes], [HAVE_TINYXML=no]) + CC=$save_CC + CPP=$save_CPP + +- + AM_CONDITIONAL([HAVE_ZLIB], [test "$HAVE_ZLIB" = yes]) + AM_CONDITIONAL([HAVE_BZIP2], [test "$HAVE_BZIP2" = yes]) + AM_CONDITIONAL([HAVE_TINYXML], [test "$HAVE_TINYXML" = yes]) + ++AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes, no) ++PKG_PROG_PKG_CONFIG ++PKG_CHECK_MODULES([SQUIRREL], [squirrel], [HAVE_SQUIRREL=yes], [HAVE_SQUIRREL=no]) ++AM_CONDITIONAL([HAVE_SQUIRREL], [test "$HAVE_SQUIRREL" = yes]) ++CB_SQUIRREL_CFLAGS="$SQUIRREL_CFLAGS" ++CB_SQUIRREL_LIBS="$SQUIRREL_LIBS" ++AC_SUBST(CB_SQUIRREL_CFLAGS) ++AC_SUBST(CB_SQUIRREL_LIBS) ++ + dnl versioning info for libtool + dnl Note this is the ABI version which is not the same as our actual library version + CODEBLOCKS_CURRENT=0 +-- +1.8.1.4 + + +From 83caea37982546a1cfe632c6b52b6f87a06020bb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Sat, 14 Jan 2012 23:28:16 +0100 +Subject: [PATCH 31/36] disable unicode for squirrel + +--- + src/include/scripting/sqplus/sqplus.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/include/scripting/sqplus/sqplus.h b/src/include/scripting/sqplus/sqplus.h +index a44ad3e..123bc20 100644 +--- a/src/include/scripting/sqplus/sqplus.h ++++ b/src/include/scripting/sqplus/sqplus.h +@@ -47,6 +47,7 @@ + #define SQ_CALL_RAISE_ERROR SQFalse + #endif + ++#undef _UNICODE + #include "squirrel.h" + + // C::B patch: so it builds on 64bit, ecapsulate bool/int/float using Squirrel types (this patch applies everywhere, where threse types are used) +-- +1.8.1.4 + + +From 0cd7273c88ba6ed3d3415b5ed221e2488c0e1d50 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Sat, 14 Jan 2012 23:33:13 +0100 +Subject: [PATCH 32/36] convert includes to system squirrel + +--- + src/include/Makefile.am | 7 ++++++- + src/include/scripting/Makefile.am | 5 ++++- + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/src/include/Makefile.am b/src/include/Makefile.am +index bfe01c6..e49497c 100644 +--- a/src/include/Makefile.am ++++ b/src/include/Makefile.am +@@ -10,7 +10,6 @@ endif + AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include \ +- -I$(top_srcdir)/src/include/scripting/include \ + -I$(top_srcdir)/src/include/scripting/sqplus \ + -I$(top_srcdir)/src/include/mozilla_chardet \ + -I$(top_srcdir)/src/include/mozilla_chardet/mfbt \ +@@ -24,6 +23,12 @@ SUBDIRS += tinyxml + INCLUDES += -I$(top_srcdir)/src/include/tinyxml + endif + ++if HAVE_SQUIRREL ++INCLUDES += $(SQUIRREL_CFLAGS) ++else ++INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++endif ++ + # Because we are not generating any programs/libraries with this makefile, + # $(CXXCOMPILE) is empty. + # Create the basic one here: +diff --git a/src/include/scripting/Makefile.am b/src/include/scripting/Makefile.am +index 39ea807..36adf08 100644 +--- a/src/include/scripting/Makefile.am ++++ b/src/include/scripting/Makefile.am +@@ -1 +1,4 @@ +-SUBDIRS = squirrel sqstdlib sqplus bindings include ++SUBDIRS = sqplus bindings ++if ! HAVE_SQUIRREL ++SUBDIRS += squirrel sqstdlib include ++endif +-- +1.8.1.4 + + +From 6d58c3828d7210a1e65288f027fd273b3126cf19 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Sat, 14 Jan 2012 23:34:17 +0100 +Subject: [PATCH 33/36] convert sdk to system squirrel + +--- + src/sdk/Makefile.am | 11 ++++++++--- + src/sdk/scripting/Makefile.am | 6 +++++- + src/sdk/scripting/bindings/Makefile.am | 8 +++++++- + src/sdk/scripting/sqplus/Makefile.am | 9 +++++++-- + 4 files changed, 27 insertions(+), 7 deletions(-) + +diff --git a/src/sdk/Makefile.am b/src/sdk/Makefile.am +index 6f81492..ff75090 100644 +--- a/src/sdk/Makefile.am ++++ b/src/sdk/Makefile.am +@@ -4,7 +4,6 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include \ + $(WXPROPGRID_INCLUDE) \ +- -I$(top_srcdir)/src/include/scripting/include \ + -I$(top_srcdir)/src/include/scripting/bindings \ + -I$(top_srcdir)/src/include/scripting/sqplus \ + -I$(top_srcdir)/src/include/mozilla_chardet \ +@@ -20,8 +19,6 @@ libcodeblocks_la_LDFLAGS = -version-info @CODEBLOCKS_VERSION_INFO@ + + libcodeblocks_la_LIBADD = scripting/bindings/libsqbindings.la \ + scripting/sqplus/libsqplus.la \ +- scripting/sqstdlib/libsqstdlib.la \ +- scripting/squirrel/libsquirrel.la \ + wxscintilla/libwxscintilla.la \ + $(WX_LIBS) \ + $(WXPROPGRID_LIB) +@@ -33,6 +30,14 @@ else + libcodeblocks_la_LIBADD += -ltinyxml + endif + ++if HAVE_SQUIRREL ++INCLUDES += $(SQUIRREL_CFLAGS) ++libcodeblocks_la_LIBADD += $(SQUIRREL_LIBS) ++else ++INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++libcodeblocks_la_LIBADD += scripting/squirrel/libsquirrel.la scripting/sqstdlib/libsqstdlib.la ++endif ++ + libcodeblocks_la_SOURCES = annoyingdialog.cpp \ + autodetectcompilers.cpp \ + base64.cpp \ +diff --git a/src/sdk/scripting/Makefile.am b/src/sdk/scripting/Makefile.am +index f2bff06..f1a5d1c 100644 +--- a/src/sdk/scripting/Makefile.am ++++ b/src/sdk/scripting/Makefile.am +@@ -1 +1,5 @@ +-SUBDIRS = squirrel sqstdlib sqplus bindings ++SUBDIRS = sqplus bindings ++if ! HAVE_SQUIRREL ++SUBDIRS += squirrel sqstdlib ++endif ++ +diff --git a/src/sdk/scripting/bindings/Makefile.am b/src/sdk/scripting/bindings/Makefile.am +index 51a05c9..21bef47 100644 +--- a/src/sdk/scripting/bindings/Makefile.am ++++ b/src/sdk/scripting/bindings/Makefile.am +@@ -1,10 +1,16 @@ + AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include \ +- -I$(top_srcdir)/src/include/scripting/include \ + -I$(top_srcdir)/src/include/scripting/bindings \ + -I$(top_srcdir)/src/include/scripting/sqplus + ++if HAVE_SQUIRREL ++INCLUDES += $(SQUIRREL_CFLAGS) ++else ++INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++endif ++ ++ + noinst_LTLIBRARIES = libsqbindings.la + + libsqbindings_la_SOURCES = scriptbindings.cpp \ +diff --git a/src/sdk/scripting/sqplus/Makefile.am b/src/sdk/scripting/sqplus/Makefile.am +index 2cdd579..4c0cf53 100644 +--- a/src/sdk/scripting/sqplus/Makefile.am ++++ b/src/sdk/scripting/sqplus/Makefile.am +@@ -1,5 +1,10 @@ +-AM_CPPFLAGS = -I$(top_srcdir)/src/include/scripting/include \ +- -I$(top_srcdir)/src/include/scripting/sqplus ++if HAVE_SQUIRREL ++AM_CPPFLAGS = $(SQUIRREL_CFLAGS) ++else ++AM_CPPFLAGS = -I$(top_srcdir)/src/include/scripting/include ++endif ++ ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/scripting/sqplus + + noinst_LTLIBRARIES = libsqplus.la + +-- +1.8.1.4 + + +From 9c37f768fae5af4f6960b4b36e82d05034054b29 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Sat, 14 Jan 2012 23:34:53 +0100 +Subject: [PATCH 34/36] convert main to system squirrel + +--- + src/src/Makefile.am | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/src/Makefile.am b/src/src/Makefile.am +index fa8c325..4176634 100644 +--- a/src/src/Makefile.am ++++ b/src/src/Makefile.am +@@ -4,7 +4,6 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/sdk/wxscintilla/include \ + $(WXPROPGRID_INCLUDE) \ + -I$(top_srcdir)/src/include \ +- -I$(top_srcdir)/src/include/scripting/include \ + -I$(top_srcdir)/src/include/scripting/sqplus \ + -I$(top_srcdir)/src/include/mozilla_chardet \ + -I$(top_srcdir)/src/include/mozilla_chardet/mfbt \ +@@ -17,6 +16,13 @@ if ! HAVE_TINYXML + INCLUDES += -I$(top_srcdir)/src/include/tinyxml + endif + ++if HAVE_SQUIRREL ++INCLUDES += $(SQUIRREL_CFLAGS) ++else ++INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++endif ++ ++ + if GTK_NOTEBOOK + GTK_NOTEBOOK_FLAGS = -DUSE_GTK_NOTEBOOK + endif +-- +1.8.1.4 + + +From 9054307262f98d1220d80d45ac3cce1b6e363f00 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Sat, 14 Jan 2012 23:35:32 +0100 +Subject: [PATCH 35/36] convert plugins to system squirrel + +--- + src/plugins/abbreviations/Makefile.am | 6 +++++- + src/plugins/compilergcc/Makefile.am | 7 ++++++- + src/plugins/contrib/envvars/Makefile.am | 7 ++++++- + src/plugins/contrib/help_plugin/Makefile.am | 10 +++++++++- + src/plugins/contrib/lib_finder/Makefile.am | 8 ++++++-- + src/plugins/contrib/wxSmith/Makefile.am | 8 ++++++-- + src/plugins/contrib/wxSmith/wxwidgets/Makefile.am | 8 ++++++-- + src/plugins/debuggergdb/Makefile.am | 7 ++++++- + src/plugins/scriptedwizard/Makefile.am | 7 ++++++- + 9 files changed, 56 insertions(+), 12 deletions(-) + +diff --git a/src/plugins/abbreviations/Makefile.am b/src/plugins/abbreviations/Makefile.am +index 09d408e..e6bd0fc 100644 +--- a/src/plugins/abbreviations/Makefile.am ++++ b/src/plugins/abbreviations/Makefile.am +@@ -3,10 +3,14 @@ SUBDIRS = resources + AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include \ +- -I$(top_srcdir)/src/include/scripting/include \ + -I$(top_srcdir)/src/include/scripting/sqplus \ + -I$(top_srcdir)/src/include/scripting/bindings + ++if HAVE_SQUIRREL ++INCLUDES += $(SQUIRREL_CFLAGS) ++else ++INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++endif + + pluginlibdir = $(pkglibdir)/plugins + +diff --git a/src/plugins/compilergcc/Makefile.am b/src/plugins/compilergcc/Makefile.am +index e5b7318..99a6318 100644 +--- a/src/plugins/compilergcc/Makefile.am ++++ b/src/plugins/compilergcc/Makefile.am +@@ -3,10 +3,15 @@ SUBDIRS = depslib resources + AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include \ +- -I$(top_srcdir)/src/include/scripting/include \ + -I$(top_srcdir)/src/include/scripting/sqplus \ + -I$(top_srcdir)/src/plugins/compilergcc/depslib/src + ++if HAVE_SQUIRREL ++INCLUDES += $(SQUIRREL_CFLAGS) ++else ++INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++endif ++ + AM_CXXFLAGS = -DDEPSLIB_UNIX + + pluginlibdir = $(pkglibdir)/plugins +diff --git a/src/plugins/contrib/envvars/Makefile.am b/src/plugins/contrib/envvars/Makefile.am +index 3452cca..4298b7f 100644 +--- a/src/plugins/contrib/envvars/Makefile.am ++++ b/src/plugins/contrib/envvars/Makefile.am +@@ -1,6 +1,5 @@ + AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ +- -I$(top_srcdir)/src/include/scripting/include \ + -I$(top_srcdir)/src/include/scripting/sqplus \ + -I$(top_srcdir)/src/include/scripting/bindings \ + -I$(top_srcdir)/src/sdk/wxscintilla/include +@@ -9,6 +8,12 @@ if ! HAVE_TINYXML + INCLUDES += -I$(top_srcdir)/src/include/tinyxml + endif + ++if HAVE_SQUIRREL ++INCLUDES += $(SQUIRREL_CFLAGS) ++else ++INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + pkgdata_DATA = envvars.zip + +diff --git a/src/plugins/contrib/help_plugin/Makefile.am b/src/plugins/contrib/help_plugin/Makefile.am +index 181a54d..ce77e72 100644 +--- a/src/plugins/contrib/help_plugin/Makefile.am ++++ b/src/plugins/contrib/help_plugin/Makefile.am +@@ -10,7 +10,6 @@ endif + AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include \ +- -I$(top_srcdir)/src/include/scripting/include \ + -I$(top_srcdir)/src/include/scripting/bindings \ + -I$(top_srcdir)/src/include/scripting/sqplus + +@@ -41,6 +40,15 @@ if ! HAVE_TINYXML + INCLUDES += -I$(top_srcdir)/src/include/tinyxml + endif + ++if HAVE_SQUIRREL ++INCLUDES += $(SQUIRREL_CFLAGS) ++libhelp_plugin_la_LIBADD += $(SQUIRREL_LIBS) ++else ++INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++libhelp_plugin_la_LIBADD += ../../../sdk/scripting/sqstdlib/libsqstdlib.la \ ++ ../../../sdk/scripting/squirrel/libsquirrel.la ++endif ++ + libhelp_plugin_la_SOURCES = help_common.cpp \ + HelpConfigDialog.cpp \ + help_plugin.cpp \ +diff --git a/src/plugins/contrib/lib_finder/Makefile.am b/src/plugins/contrib/lib_finder/Makefile.am +index c92550a..e68a735 100644 +--- a/src/plugins/contrib/lib_finder/Makefile.am ++++ b/src/plugins/contrib/lib_finder/Makefile.am +@@ -4,9 +4,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include \ + -I$(srcdir)/../wxContribItems/wxFlatNotebook/include \ +- -I$(top_srcdir)/src/include/scripting/include \ + -I$(top_srcdir)/src/include/scripting/sqplus \ +- -I$(top_srcdir)/src/include/scripting/squirrel \ + -I$(top_srcdir)/src/include/scripting/bindings \ + -I$(top_srcdir)/src/include/mozilla_chardet \ + -I$(top_srcdir)/src/include/mozilla_chardet/mfbt \ +@@ -19,6 +17,12 @@ if ! HAVE_TINYXML + INCLUDES += -I$(top_srcdir)/src/include/tinyxml + endif + ++if HAVE_SQUIRREL ++INCLUDES += $(SQUIRREL_CFLAGS) ++else ++INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + + pluginlib_LTLIBRARIES = liblib_finder.la +diff --git a/src/plugins/contrib/wxSmith/Makefile.am b/src/plugins/contrib/wxSmith/Makefile.am +index 866be15..f06659c 100644 +--- a/src/plugins/contrib/wxSmith/Makefile.am ++++ b/src/plugins/contrib/wxSmith/Makefile.am +@@ -4,8 +4,6 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include \ + $(WXPROPGRID_INCLUDE) \ +- -I$(top_srcdir)/src/include/scripting/include \ +- -I$(top_srcdir)/src/include/scripting/squirrel \ + -I$(top_srcdir)/src/include/scripting/sqplus \ + -I$(top_srcdir)/src/include/scripting/bindings \ + -I$(top_srcdir)/src/include/mozilla_chardet \ +@@ -19,6 +17,12 @@ if ! HAVE_TINYXML + INCLUDES += -I$(top_srcdir)/src/include/tinyxml + endif + ++if HAVE_SQUIRREL ++INCLUDES += $(SQUIRREL_CFLAGS) ++else ++INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++endif ++ + lib_LTLIBRARIES = libwxsmithlib.la + + libwxsmithlib_la_LDFLAGS = -version-info 0:1:0 -shared +diff --git a/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am b/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am +index 313f2e4..f7e524d 100644 +--- a/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am ++++ b/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am +@@ -4,8 +4,6 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include \ + $(WXPROPGRID_INCLUDE) \ +- -I$(top_srcdir)/src/include/scripting/include \ +- -I$(top_srcdir)/src/include/scripting/squirrel \ + -I$(top_srcdir)/src/include/scripting/sqplus \ + -I$(top_srcdir)/src/include/scripting/bindings + +@@ -13,6 +11,12 @@ if ! HAVE_TINYXML + INCLUDES += -I$(top_srcdir)/src/include/tinyxml + endif + ++if HAVE_SQUIRREL ++INCLUDES += $(SQUIRREL_CFLAGS) ++else ++INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++endif ++ + noinst_LTLIBRARIES = libwxsmith_wxwidgets.la + + libwxsmith_wxwidgets_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version +diff --git a/src/plugins/debuggergdb/Makefile.am b/src/plugins/debuggergdb/Makefile.am +index e17c114..b482325 100644 +--- a/src/plugins/debuggergdb/Makefile.am ++++ b/src/plugins/debuggergdb/Makefile.am +@@ -3,9 +3,14 @@ SUBDIRS = resources + AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include \ +- -I$(top_srcdir)/src/include/scripting/include \ + -I$(top_srcdir)/src/include/scripting/sqplus + ++if HAVE_SQUIRREL ++INCLUDES += $(SQUIRREL_CFLAGS) ++else ++INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + + pluginlib_LTLIBRARIES = libdebugger.la +diff --git a/src/plugins/scriptedwizard/Makefile.am b/src/plugins/scriptedwizard/Makefile.am +index a116b98..352d5b9 100644 +--- a/src/plugins/scriptedwizard/Makefile.am ++++ b/src/plugins/scriptedwizard/Makefile.am +@@ -3,13 +3,18 @@ SUBDIRS = resources + AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include \ +- -I$(top_srcdir)/src/include/scripting/include \ + -I$(top_srcdir)/src/include/scripting/sqplus + + if ! HAVE_TINYXML + INCLUDES += -I$(top_srcdir)/src/include/tinyxml + endif + ++if HAVE_SQUIRREL ++INCLUDES += $(SQUIRREL_CFLAGS) ++else ++INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + + pluginlib_LTLIBRARIES = libscriptedwizard.la +-- +1.8.1.4 + + +From a7d4fda515ae6f4377a7df9fbc058e703a6dfd26 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Sat, 7 Dec 2013 12:51:52 +0100 +Subject: [PATCH 36/36] switch to AM_CPPFLAGS from INCLUDES + +--- + src/include/Makefile.am | 6 +++--- + src/plugins/abbreviations/Makefile.am | 4 ++-- + src/plugins/autosave/Makefile.am | 2 +- + src/plugins/codecompletion/Makefile.am | 2 +- + src/plugins/compilergcc/Makefile.am | 4 ++-- + src/plugins/contrib/AutoVersioning/Makefile.am | 2 +- + src/plugins/contrib/BrowseTracker/Makefile.am | 2 +- + src/plugins/contrib/CppCheck/Makefile.am | 2 +- + src/plugins/contrib/DoxyBlocks/Makefile.am | 2 +- + src/plugins/contrib/HexEditor/Makefile.am | 2 +- + src/plugins/contrib/MouseSap/Makefile.am | 2 +- + src/plugins/contrib/NassiShneiderman/Makefile.am | 2 +- + src/plugins/contrib/ReopenEditor/Makefile.am | 2 +- + src/plugins/contrib/ThreadSearch/Makefile.am | 2 +- + src/plugins/contrib/Valgrind/Makefile.am | 2 +- + src/plugins/contrib/byogames/Makefile.am | 2 +- + src/plugins/contrib/codesnippets/Makefile.am | 2 +- + src/plugins/contrib/codesnippets/resources/Makefile.am | 4 ++-- + src/plugins/contrib/dragscroll/Makefile.am | 2 +- + src/plugins/contrib/envvars/Makefile.am | 6 +++--- + src/plugins/contrib/headerfixup/Makefile.am | 2 +- + src/plugins/contrib/help_plugin/Makefile.am | 6 +++--- + src/plugins/contrib/keybinder/Makefile.am | 2 +- + src/plugins/contrib/lib_finder/Makefile.am | 6 +++--- + src/plugins/contrib/wxSmith/Makefile.am | 6 +++--- + src/plugins/contrib/wxSmith/plugin/Makefile.am | 2 +- + src/plugins/contrib/wxSmith/properties/Makefile.am | 2 +- + src/plugins/contrib/wxSmith/wxwidgets/Makefile.am | 6 +++--- + src/plugins/contrib/wxSmith/wxwidgets/defitems/Makefile.am | 2 +- + src/plugins/contrib/wxSmith/wxwidgets/properties/Makefile.am | 2 +- + src/plugins/contrib/wxSmithAui/Makefile.am | 2 +- + src/plugins/contrib/wxSmithContribItems/Makefile.am | 2 +- + src/plugins/debuggergdb/Makefile.am | 4 ++-- + src/plugins/openfileslist/Makefile.am | 2 +- + src/plugins/projectsimporter/Makefile.am | 2 +- + src/plugins/scriptedwizard/Makefile.am | 6 +++--- + src/sdk/Makefile.am | 6 +++--- + src/sdk/scripting/bindings/Makefile.am | 4 ++-- + src/src/Makefile.am | 6 +++--- + src/tools/cb_share_config/Makefile.am | 2 +- + 40 files changed, 63 insertions(+), 63 deletions(-) + +diff --git a/src/include/Makefile.am b/src/include/Makefile.am +index e49497c..61dc555 100644 +--- a/src/include/Makefile.am ++++ b/src/include/Makefile.am +@@ -20,13 +20,13 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + + if ! HAVE_TINYXML + SUBDIRS += tinyxml +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + if HAVE_SQUIRREL +-INCLUDES += $(SQUIRREL_CFLAGS) ++AM_CPPFLAGS += $(SQUIRREL_CFLAGS) + else +-INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/scripting/include + endif + + # Because we are not generating any programs/libraries with this makefile, +diff --git a/src/plugins/abbreviations/Makefile.am b/src/plugins/abbreviations/Makefile.am +index e6bd0fc..4e08744 100644 +--- a/src/plugins/abbreviations/Makefile.am ++++ b/src/plugins/abbreviations/Makefile.am +@@ -7,9 +7,9 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include/scripting/bindings + + if HAVE_SQUIRREL +-INCLUDES += $(SQUIRREL_CFLAGS) ++AM_CPPFLAGS += $(SQUIRREL_CFLAGS) + else +-INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/scripting/include + endif + + pluginlibdir = $(pkglibdir)/plugins +diff --git a/src/plugins/autosave/Makefile.am b/src/plugins/autosave/Makefile.am +index 0c34bed..f239600 100644 +--- a/src/plugins/autosave/Makefile.am ++++ b/src/plugins/autosave/Makefile.am +@@ -3,7 +3,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + pluginlibdir = $(pkglibdir)/plugins +diff --git a/src/plugins/codecompletion/Makefile.am b/src/plugins/codecompletion/Makefile.am +index 4a86cec..34fe3c0 100644 +--- a/src/plugins/codecompletion/Makefile.am ++++ b/src/plugins/codecompletion/Makefile.am +@@ -11,7 +11,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include/mozilla_chardet/xpcom/glue + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + pluginlibdir = $(pkglibdir)/plugins +diff --git a/src/plugins/compilergcc/Makefile.am b/src/plugins/compilergcc/Makefile.am +index 99a6318..fdeb668 100644 +--- a/src/plugins/compilergcc/Makefile.am ++++ b/src/plugins/compilergcc/Makefile.am +@@ -7,9 +7,9 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/plugins/compilergcc/depslib/src + + if HAVE_SQUIRREL +-INCLUDES += $(SQUIRREL_CFLAGS) ++AM_CPPFLAGS += $(SQUIRREL_CFLAGS) + else +-INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/scripting/include + endif + + AM_CXXFLAGS = -DDEPSLIB_UNIX +diff --git a/src/plugins/contrib/AutoVersioning/Makefile.am b/src/plugins/contrib/AutoVersioning/Makefile.am +index e60f5fc..a2c7834 100644 +--- a/src/plugins/contrib/AutoVersioning/Makefile.am ++++ b/src/plugins/contrib/AutoVersioning/Makefile.am +@@ -3,7 +3,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + pluginlibdir = $(pkglibdir)/plugins +diff --git a/src/plugins/contrib/BrowseTracker/Makefile.am b/src/plugins/contrib/BrowseTracker/Makefile.am +index 7115870..27a42fb 100644 +--- a/src/plugins/contrib/BrowseTracker/Makefile.am ++++ b/src/plugins/contrib/BrowseTracker/Makefile.am +@@ -3,7 +3,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + pluginlibdir = $(pkglibdir)/plugins +diff --git a/src/plugins/contrib/CppCheck/Makefile.am b/src/plugins/contrib/CppCheck/Makefile.am +index b46e2b7..ab81d19 100644 +--- a/src/plugins/contrib/CppCheck/Makefile.am ++++ b/src/plugins/contrib/CppCheck/Makefile.am +@@ -5,7 +5,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + pluginlibdir = $(pkglibdir)/plugins +diff --git a/src/plugins/contrib/DoxyBlocks/Makefile.am b/src/plugins/contrib/DoxyBlocks/Makefile.am +index eab64ae..250c28c 100644 +--- a/src/plugins/contrib/DoxyBlocks/Makefile.am ++++ b/src/plugins/contrib/DoxyBlocks/Makefile.am +@@ -5,7 +5,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + pluginlibdir = $(pkglibdir)/plugins +diff --git a/src/plugins/contrib/HexEditor/Makefile.am b/src/plugins/contrib/HexEditor/Makefile.am +index e0207df..68d1e06 100644 +--- a/src/plugins/contrib/HexEditor/Makefile.am ++++ b/src/plugins/contrib/HexEditor/Makefile.am +@@ -3,7 +3,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + pluginlibdir = $(pkglibdir)/plugins +diff --git a/src/plugins/contrib/MouseSap/Makefile.am b/src/plugins/contrib/MouseSap/Makefile.am +index 3c887ae..c4a19e7 100644 +--- a/src/plugins/contrib/MouseSap/Makefile.am ++++ b/src/plugins/contrib/MouseSap/Makefile.am +@@ -4,7 +4,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + pluginlibdir = $(pkglibdir)/plugins +diff --git a/src/plugins/contrib/NassiShneiderman/Makefile.am b/src/plugins/contrib/NassiShneiderman/Makefile.am +index 7ad0175..807e40f 100644 +--- a/src/plugins/contrib/NassiShneiderman/Makefile.am ++++ b/src/plugins/contrib/NassiShneiderman/Makefile.am +@@ -3,7 +3,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + pluginlibdir = $(pkglibdir)/plugins +diff --git a/src/plugins/contrib/ReopenEditor/Makefile.am b/src/plugins/contrib/ReopenEditor/Makefile.am +index 6d66e53..ef43ef2 100644 +--- a/src/plugins/contrib/ReopenEditor/Makefile.am ++++ b/src/plugins/contrib/ReopenEditor/Makefile.am +@@ -3,7 +3,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + pluginlibdir = $(pkglibdir)/plugins +diff --git a/src/plugins/contrib/ThreadSearch/Makefile.am b/src/plugins/contrib/ThreadSearch/Makefile.am +index 9bdd975..0e1c694 100644 +--- a/src/plugins/contrib/ThreadSearch/Makefile.am ++++ b/src/plugins/contrib/ThreadSearch/Makefile.am +@@ -12,7 +12,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(srcdir)/../wxContribItems/wxthings/include + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + pluginlibdir = $(pkglibdir)/plugins +diff --git a/src/plugins/contrib/Valgrind/Makefile.am b/src/plugins/contrib/Valgrind/Makefile.am +index 826ad7d..ad36cc2 100644 +--- a/src/plugins/contrib/Valgrind/Makefile.am ++++ b/src/plugins/contrib/Valgrind/Makefile.am +@@ -5,7 +5,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + pluginlibdir = $(pkglibdir)/plugins +diff --git a/src/plugins/contrib/byogames/Makefile.am b/src/plugins/contrib/byogames/Makefile.am +index d550aa9..fa21af4 100644 +--- a/src/plugins/contrib/byogames/Makefile.am ++++ b/src/plugins/contrib/byogames/Makefile.am +@@ -3,7 +3,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + pluginlibdir = $(pkglibdir)/plugins +diff --git a/src/plugins/contrib/codesnippets/Makefile.am b/src/plugins/contrib/codesnippets/Makefile.am +index f4c9911..2d12f0c 100644 +--- a/src/plugins/contrib/codesnippets/Makefile.am ++++ b/src/plugins/contrib/codesnippets/Makefile.am +@@ -16,7 +16,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include/mozilla_chardet/xpcom/glue + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + pluginlibdir = $(pkglibdir)/plugins +diff --git a/src/plugins/contrib/codesnippets/resources/Makefile.am b/src/plugins/contrib/codesnippets/resources/Makefile.am +index 5735fec..0811383 100644 +--- a/src/plugins/contrib/codesnippets/resources/Makefile.am ++++ b/src/plugins/contrib/codesnippets/resources/Makefile.am +@@ -14,7 +14,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include/mozilla_chardet/xpcom/glue + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + pluginlibdir = $(pkglibdir)/plugins +@@ -29,7 +29,7 @@ codesnippets_LDADD = -L../../../../sdk ../../../../sdk/libcodeblocks.la \ + $(WX_LIBS) $(WX_GTK2_LIBS) $(WX_X11_LIBS) + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + codesnippets_LDADD += -L../../../../base/tinyxml + endif + +diff --git a/src/plugins/contrib/dragscroll/Makefile.am b/src/plugins/contrib/dragscroll/Makefile.am +index 766000a..49b986b 100644 +--- a/src/plugins/contrib/dragscroll/Makefile.am ++++ b/src/plugins/contrib/dragscroll/Makefile.am +@@ -4,7 +4,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + pluginlibdir = $(pkglibdir)/plugins +diff --git a/src/plugins/contrib/envvars/Makefile.am b/src/plugins/contrib/envvars/Makefile.am +index 4298b7f..a2a6663 100644 +--- a/src/plugins/contrib/envvars/Makefile.am ++++ b/src/plugins/contrib/envvars/Makefile.am +@@ -5,13 +5,13 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + if HAVE_SQUIRREL +-INCLUDES += $(SQUIRREL_CFLAGS) ++AM_CPPFLAGS += $(SQUIRREL_CFLAGS) + else +-INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/scripting/include + endif + + pluginlibdir = $(pkglibdir)/plugins +diff --git a/src/plugins/contrib/headerfixup/Makefile.am b/src/plugins/contrib/headerfixup/Makefile.am +index 94ded5f..ac96bb0 100644 +--- a/src/plugins/contrib/headerfixup/Makefile.am ++++ b/src/plugins/contrib/headerfixup/Makefile.am +@@ -3,7 +3,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + CXXFLAGS = @CXXFLAGS@ -O0 +diff --git a/src/plugins/contrib/help_plugin/Makefile.am b/src/plugins/contrib/help_plugin/Makefile.am +index ce77e72..daa73b1 100644 +--- a/src/plugins/contrib/help_plugin/Makefile.am ++++ b/src/plugins/contrib/help_plugin/Makefile.am +@@ -37,14 +37,14 @@ libhelp_plugin_la_LIBADD += -lz + endif + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + if HAVE_SQUIRREL +-INCLUDES += $(SQUIRREL_CFLAGS) ++AM_CPPFLAGS += $(SQUIRREL_CFLAGS) + libhelp_plugin_la_LIBADD += $(SQUIRREL_LIBS) + else +-INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/scripting/include + libhelp_plugin_la_LIBADD += ../../../sdk/scripting/sqstdlib/libsqstdlib.la \ + ../../../sdk/scripting/squirrel/libsquirrel.la + endif +diff --git a/src/plugins/contrib/keybinder/Makefile.am b/src/plugins/contrib/keybinder/Makefile.am +index 3647ee9..d2cfcb9 100644 +--- a/src/plugins/contrib/keybinder/Makefile.am ++++ b/src/plugins/contrib/keybinder/Makefile.am +@@ -3,7 +3,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + pluginlibdir = $(pkglibdir)/plugins +diff --git a/src/plugins/contrib/lib_finder/Makefile.am b/src/plugins/contrib/lib_finder/Makefile.am +index e68a735..884ebcf 100644 +--- a/src/plugins/contrib/lib_finder/Makefile.am ++++ b/src/plugins/contrib/lib_finder/Makefile.am +@@ -14,13 +14,13 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include/mozilla_chardet/xpcom/glue + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + if HAVE_SQUIRREL +-INCLUDES += $(SQUIRREL_CFLAGS) ++AM_CPPFLAGS += $(SQUIRREL_CFLAGS) + else +-INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/scripting/include + endif + + pluginlibdir = $(pkglibdir)/plugins +diff --git a/src/plugins/contrib/wxSmith/Makefile.am b/src/plugins/contrib/wxSmith/Makefile.am +index f06659c..642ac78 100644 +--- a/src/plugins/contrib/wxSmith/Makefile.am ++++ b/src/plugins/contrib/wxSmith/Makefile.am +@@ -14,13 +14,13 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include/mozilla_chardet/xpcom/glue + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + if HAVE_SQUIRREL +-INCLUDES += $(SQUIRREL_CFLAGS) ++AM_CPPFLAGS += $(SQUIRREL_CFLAGS) + else +-INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/scripting/include + endif + + lib_LTLIBRARIES = libwxsmithlib.la +diff --git a/src/plugins/contrib/wxSmith/plugin/Makefile.am b/src/plugins/contrib/wxSmith/plugin/Makefile.am +index 869d4eb..a350758 100644 +--- a/src/plugins/contrib/wxSmith/plugin/Makefile.am ++++ b/src/plugins/contrib/wxSmith/plugin/Makefile.am +@@ -4,7 +4,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + $(WXPROPGRID_INCLUDE) + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + pluginlib_LTLIBRARIES = libwxsmith.la +diff --git a/src/plugins/contrib/wxSmith/properties/Makefile.am b/src/plugins/contrib/wxSmith/properties/Makefile.am +index 356ace9..2ab4923 100644 +--- a/src/plugins/contrib/wxSmith/properties/Makefile.am ++++ b/src/plugins/contrib/wxSmith/properties/Makefile.am +@@ -4,7 +4,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + $(WXPROPGRID_INCLUDE) + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + noinst_LTLIBRARIES = libwxsmith_properties.la +diff --git a/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am b/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am +index f7e524d..2b48671 100644 +--- a/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am ++++ b/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am +@@ -8,13 +8,13 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include/scripting/bindings + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + if HAVE_SQUIRREL +-INCLUDES += $(SQUIRREL_CFLAGS) ++AM_CPPFLAGS += $(SQUIRREL_CFLAGS) + else +-INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/scripting/include + endif + + noinst_LTLIBRARIES = libwxsmith_wxwidgets.la +diff --git a/src/plugins/contrib/wxSmith/wxwidgets/defitems/Makefile.am b/src/plugins/contrib/wxSmith/wxwidgets/defitems/Makefile.am +index 3b68116..76442e2 100644 +--- a/src/plugins/contrib/wxSmith/wxwidgets/defitems/Makefile.am ++++ b/src/plugins/contrib/wxSmith/wxwidgets/defitems/Makefile.am +@@ -4,7 +4,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + $(WXPROPGRID_INCLUDE) + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + noinst_LTLIBRARIES = libwxsmith_wxwidgets_defitems.la +diff --git a/src/plugins/contrib/wxSmith/wxwidgets/properties/Makefile.am b/src/plugins/contrib/wxSmith/wxwidgets/properties/Makefile.am +index 56dfa9b..9e09652 100644 +--- a/src/plugins/contrib/wxSmith/wxwidgets/properties/Makefile.am ++++ b/src/plugins/contrib/wxSmith/wxwidgets/properties/Makefile.am +@@ -4,7 +4,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + $(WXPROPGRID_INCLUDE) + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + noinst_LTLIBRARIES = libwxsmith_wxwidgets_properties.la +diff --git a/src/plugins/contrib/wxSmithAui/Makefile.am b/src/plugins/contrib/wxSmithAui/Makefile.am +index 367d04f..1453f26 100644 +--- a/src/plugins/contrib/wxSmithAui/Makefile.am ++++ b/src/plugins/contrib/wxSmithAui/Makefile.am +@@ -8,7 +8,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(srcdir)/wxAuiToolBar + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + pluginlibdir = $(pkglibdir)/plugins +diff --git a/src/plugins/contrib/wxSmithContribItems/Makefile.am b/src/plugins/contrib/wxSmithContribItems/Makefile.am +index ea94ec3..031944e 100644 +--- a/src/plugins/contrib/wxSmithContribItems/Makefile.am ++++ b/src/plugins/contrib/wxSmithContribItems/Makefile.am +@@ -20,7 +20,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + pluginlibdir = $(pkglibdir)/plugins +diff --git a/src/plugins/debuggergdb/Makefile.am b/src/plugins/debuggergdb/Makefile.am +index b482325..6c648e9 100644 +--- a/src/plugins/debuggergdb/Makefile.am ++++ b/src/plugins/debuggergdb/Makefile.am +@@ -6,9 +6,9 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include/scripting/sqplus + + if HAVE_SQUIRREL +-INCLUDES += $(SQUIRREL_CFLAGS) ++AM_CPPFLAGS += $(SQUIRREL_CFLAGS) + else +-INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/scripting/include + endif + + pluginlibdir = $(pkglibdir)/plugins +diff --git a/src/plugins/openfileslist/Makefile.am b/src/plugins/openfileslist/Makefile.am +index 1ddb747..9f546d2 100644 +--- a/src/plugins/openfileslist/Makefile.am ++++ b/src/plugins/openfileslist/Makefile.am +@@ -3,7 +3,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/sdk/wxscintilla/include + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + pluginlibdir = $(pkglibdir)/plugins +diff --git a/src/plugins/projectsimporter/Makefile.am b/src/plugins/projectsimporter/Makefile.am +index bb0205b..ca63562 100644 +--- a/src/plugins/projectsimporter/Makefile.am ++++ b/src/plugins/projectsimporter/Makefile.am +@@ -11,7 +11,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include/mozilla_chardet/xpcom/glue + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + pluginlibdir = $(pkglibdir)/plugins +diff --git a/src/plugins/scriptedwizard/Makefile.am b/src/plugins/scriptedwizard/Makefile.am +index 352d5b9..6969eea 100644 +--- a/src/plugins/scriptedwizard/Makefile.am ++++ b/src/plugins/scriptedwizard/Makefile.am +@@ -6,13 +6,13 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include/scripting/sqplus + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + if HAVE_SQUIRREL +-INCLUDES += $(SQUIRREL_CFLAGS) ++AM_CPPFLAGS += $(SQUIRREL_CFLAGS) + else +-INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/scripting/include + endif + + pluginlibdir = $(pkglibdir)/plugins +diff --git a/src/sdk/Makefile.am b/src/sdk/Makefile.am +index ff75090..b1cfa7e 100644 +--- a/src/sdk/Makefile.am ++++ b/src/sdk/Makefile.am +@@ -24,17 +24,17 @@ libcodeblocks_la_LIBADD = scripting/bindings/libsqbindings.la \ + $(WXPROPGRID_LIB) + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + libcodeblocks_la_LIBADD += ../base/tinyxml/libtinyxml.la + else + libcodeblocks_la_LIBADD += -ltinyxml + endif + + if HAVE_SQUIRREL +-INCLUDES += $(SQUIRREL_CFLAGS) ++AM_CPPFLAGS += $(SQUIRREL_CFLAGS) + libcodeblocks_la_LIBADD += $(SQUIRREL_LIBS) + else +-INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/scripting/include + libcodeblocks_la_LIBADD += scripting/squirrel/libsquirrel.la scripting/sqstdlib/libsqstdlib.la + endif + +diff --git a/src/sdk/scripting/bindings/Makefile.am b/src/sdk/scripting/bindings/Makefile.am +index 21bef47..c684c53 100644 +--- a/src/sdk/scripting/bindings/Makefile.am ++++ b/src/sdk/scripting/bindings/Makefile.am +@@ -5,9 +5,9 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include/scripting/sqplus + + if HAVE_SQUIRREL +-INCLUDES += $(SQUIRREL_CFLAGS) ++AM_CPPFLAGS += $(SQUIRREL_CFLAGS) + else +-INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/scripting/include + endif + + +diff --git a/src/src/Makefile.am b/src/src/Makefile.am +index 4176634..1279ab4 100644 +--- a/src/src/Makefile.am ++++ b/src/src/Makefile.am +@@ -13,13 +13,13 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include/mozilla_chardet/xpcom/glue + + if ! HAVE_TINYXML +-INCLUDES += -I$(top_srcdir)/src/include/tinyxml ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/tinyxml + endif + + if HAVE_SQUIRREL +-INCLUDES += $(SQUIRREL_CFLAGS) ++AM_CPPFLAGS += $(SQUIRREL_CFLAGS) + else +-INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++AM_CPPFLAGS += -I$(top_srcdir)/src/include/scripting/include + endif + + +diff --git a/src/tools/cb_share_config/Makefile.am b/src/tools/cb_share_config/Makefile.am +index 689861a..9f94d47 100644 +--- a/src/tools/cb_share_config/Makefile.am ++++ b/src/tools/cb_share_config/Makefile.am +@@ -1,7 +1,7 @@ + bin_PROGRAMS = cb_share_config + + AM_CPPFLAGS = $(WX_CXXFLAGS) \ +- -I$(top_srcdir)/src/include \ ++ -I$(top_srcdir)/src/include + + cb_share_config_LDFLAGS = + +-- +1.8.1.4 + diff --git a/codeblocks-squirrel.patch b/codeblocks-squirrel.patch deleted file mode 100644 index 74e9ecf..0000000 --- a/codeblocks-squirrel.patch +++ /dev/null @@ -1,489 +0,0 @@ -From 780fd5112ef72573c0075ef7ab12d63fad9cbbb9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Sat, 14 Jan 2012 17:35:30 +0100 -Subject: [PATCH 1/6] add check for squirrel to configure.in - ---- - configure.in | 10 +++++++++- - 1 files changed, 9 insertions(+), 1 deletions(-) - -diff --git a/configure.in b/configure.in -index 50097b2..bbe7b32 100644 ---- a/configure.in -+++ b/configure.in -@@ -64,11 +64,19 @@ AC_CHECK_HEADER(tinyxml.h, [HAVE_TINYXML=yes], [HAVE_TINYXML=no]) - CC=$save_CC - CPP=$save_CPP - -- - AM_CONDITIONAL([HAVE_ZLIB], [test "$HAVE_ZLIB" = yes]) - AM_CONDITIONAL([HAVE_BZIP2], [test "$HAVE_BZIP2" = yes]) - AM_CONDITIONAL([HAVE_TINYXML], [test "$HAVE_TINYXML" = yes]) - -+AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes, no) -+PKG_PROG_PKG_CONFIG -+PKG_CHECK_MODULES([SQUIRREL], [squirrel], [HAVE_SQUIRREL=yes], [HAVE_SQUIRREL=no]) -+AM_CONDITIONAL([HAVE_SQUIRREL], [test "$HAVE_SQUIRREL" = yes]) -+CB_SQUIRREL_CFLAGS="$SQUIRREL_CFLAGS" -+CB_SQUIRREL_LIBS="$SQUIRREL_LIBS" -+AC_SUBST(CB_SQUIRREL_CFLAGS) -+AC_SUBST(CB_SQUIRREL_LIBS) -+ - dnl versioning info for libtool - dnl Note this is the ABI version which is not the same as our actual library version - CODEBLOCKS_CURRENT=0 --- -1.7.7.6 - - -From e8f27ca532788640482fc416f34b2420bcaf7860 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Sat, 14 Jan 2012 23:28:16 +0100 -Subject: [PATCH 2/6] disable unicode for squirrel - ---- - src/include/scripting/sqplus/sqplus.h | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/src/include/scripting/sqplus/sqplus.h b/src/include/scripting/sqplus/sqplus.h -index c114ccc..a0df415 100644 ---- a/src/include/scripting/sqplus/sqplus.h -+++ b/src/include/scripting/sqplus/sqplus.h -@@ -47,6 +47,7 @@ - #define SQ_CALL_RAISE_ERROR SQFalse - #endif - -+#undef _UNICODE - #include "squirrel.h" - - // C::B patch: so it builds on 64bit, ecapsulate bool/int/float using Squirrel types --- -1.7.7.6 - - -From 5f2ad259400f0acdd9e20e246cde9a3574bacd77 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Sat, 14 Jan 2012 23:33:13 +0100 -Subject: [PATCH 3/6] convert includes to system squirrel - ---- - src/include/Makefile.am | 7 ++++++- - src/include/scripting/Makefile.am | 5 ++++- - 2 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/src/include/Makefile.am b/src/include/Makefile.am -index 4783386..1dd5411 100644 ---- a/src/include/Makefile.am -+++ b/src/include/Makefile.am -@@ -10,7 +10,6 @@ endif - INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include \ -- -I$(top_srcdir)/src/include/scripting/include \ - -I$(top_srcdir)/src/include/scripting/sqplus \ - -I$(top_srcdir)/src/include/mozilla_chardet - -@@ -19,6 +18,12 @@ SUBDIRS += tinyxml - INCLUDES += -I$(top_srcdir)/src/include/tinyxml - endif - -+if HAVE_SQUIRREL -+INCLUDES += $(SQUIRREL_CFLAGS) -+else -+INCLUDES += -I$(top_srcdir)/src/include/scripting/include -+endif -+ - # Because we are not generating any programs/libraries with this makefile, - # $(CXXCOMPILE) is empty. - # Create the basic one here: -diff --git a/src/include/scripting/Makefile.am b/src/include/scripting/Makefile.am -index 39ea807..36adf08 100644 ---- a/src/include/scripting/Makefile.am -+++ b/src/include/scripting/Makefile.am -@@ -1 +1,4 @@ --SUBDIRS = squirrel sqstdlib sqplus bindings include -+SUBDIRS = sqplus bindings -+if ! HAVE_SQUIRREL -+SUBDIRS += squirrel sqstdlib include -+endif --- -1.7.7.6 - - -From 4d5570557c4ba8a936b3edcb5876b63d9324b3f4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Sat, 14 Jan 2012 23:34:17 +0100 -Subject: [PATCH 4/6] convert sdk to system squirrel - ---- - src/sdk/Makefile.am | 11 ++++++++--- - src/sdk/scripting/Makefile.am | 6 +++++- - src/sdk/scripting/bindings/Makefile.am | 8 +++++++- - src/sdk/scripting/sqplus/Makefile.am | 9 +++++++-- - 4 files changed, 27 insertions(+), 7 deletions(-) - -diff --git a/src/sdk/Makefile.am b/src/sdk/Makefile.am -index eefb3d8..4bc90ec 100644 ---- a/src/sdk/Makefile.am -+++ b/src/sdk/Makefile.am -@@ -4,7 +4,6 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include \ - $(WXPROPGRID_INCLUDE) \ -- -I$(top_srcdir)/src/include/scripting/include \ - -I$(top_srcdir)/src/include/scripting/bindings \ - -I$(top_srcdir)/src/include/scripting/sqplus \ - -I$(top_srcdir)/src/include/mozilla_chardet -@@ -16,8 +15,6 @@ libcodeblocks_la_LDFLAGS = -version-info @CODEBLOCKS_VERSION_INFO@ - libcodeblocks_la_LIBADD = $(WX_LIBS) \ - scripting/bindings/libsqbindings.la \ - scripting/sqplus/libsqplus.la \ -- scripting/sqstdlib/libsqstdlib.la \ -- scripting/squirrel/libsquirrel.la \ - wxscintilla/libwxscintilla.la \ - $(WXPROPGRID_LIB) - -@@ -28,6 +25,14 @@ else - libcodeblocks_la_LIBADD += -ltinyxml - endif - -+if HAVE_SQUIRREL -+INCLUDES += $(SQUIRREL_CFLAGS) -+libcodeblocks_la_LIBADD += $(SQUIRREL_LIBS) -+else -+INCLUDES += -I$(top_srcdir)/src/include/scripting/include -+libcodeblocks_la_LIBADD += scripting/squirrel/libsquirrel.la scripting/sqstdlib/libsqstdlib.la -+endif -+ - libcodeblocks_la_SOURCES = annoyingdialog.cpp \ - autodetectcompilers.cpp \ - base64.cpp \ -diff --git a/src/sdk/scripting/Makefile.am b/src/sdk/scripting/Makefile.am -index f2bff06..f1a5d1c 100644 ---- a/src/sdk/scripting/Makefile.am -+++ b/src/sdk/scripting/Makefile.am -@@ -1 +1,5 @@ --SUBDIRS = squirrel sqstdlib sqplus bindings -+SUBDIRS = sqplus bindings -+if ! HAVE_SQUIRREL -+SUBDIRS += squirrel sqstdlib -+endif -+ -diff --git a/src/sdk/scripting/bindings/Makefile.am b/src/sdk/scripting/bindings/Makefile.am -index ecf1fc8..0e632d5 100644 ---- a/src/sdk/scripting/bindings/Makefile.am -+++ b/src/sdk/scripting/bindings/Makefile.am -@@ -1,10 +1,16 @@ - INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include \ -- -I$(top_srcdir)/src/include/scripting/include \ - -I$(top_srcdir)/src/include/scripting/bindings \ - -I$(top_srcdir)/src/include/scripting/sqplus - -+if HAVE_SQUIRREL -+INCLUDES += $(SQUIRREL_CFLAGS) -+else -+INCLUDES += -I$(top_srcdir)/src/include/scripting/include -+endif -+ -+ - noinst_LTLIBRARIES = libsqbindings.la - - libsqbindings_la_SOURCES = scriptbindings.cpp \ -diff --git a/src/sdk/scripting/sqplus/Makefile.am b/src/sdk/scripting/sqplus/Makefile.am -index deb87f3..fbf351b 100644 ---- a/src/sdk/scripting/sqplus/Makefile.am -+++ b/src/sdk/scripting/sqplus/Makefile.am -@@ -1,5 +1,10 @@ --INCLUDES = -I$(top_srcdir)/src/include/scripting/include \ -- -I$(top_srcdir)/src/include/scripting/sqplus -+if HAVE_SQUIRREL -+INCLUDES = $(SQUIRREL_CFLAGS) -+else -+INCLUDES = -I$(top_srcdir)/src/include/scripting/include -+endif -+ -+INCLUDES += -I$(top_srcdir)/src/include/scripting/sqplus - - noinst_LTLIBRARIES = libsqplus.la - --- -1.7.7.6 - - -From 94bfad10d512a0314f28a9db5b03ab3a189daaad Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Sat, 14 Jan 2012 23:34:53 +0100 -Subject: [PATCH 5/6] convert main to system squirrel - ---- - src/src/Makefile.am | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -diff --git a/src/src/Makefile.am b/src/src/Makefile.am -index f1f79fb..02bcfcb 100644 ---- a/src/src/Makefile.am -+++ b/src/src/Makefile.am -@@ -4,7 +4,6 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/sdk/wxscintilla/include \ - $(WXPROPGRID_INCLUDE) \ - -I$(top_srcdir)/src/include \ -- -I$(top_srcdir)/src/include/scripting/include \ - -I$(top_srcdir)/src/include/scripting/sqplus \ - -I$(top_srcdir)/src/include/mozilla_chardet - -@@ -12,6 +11,13 @@ if ! HAVE_TINYXML - INCLUDES += -I$(top_srcdir)/src/include/tinyxml - endif - -+if HAVE_SQUIRREL -+INCLUDES += $(SQUIRREL_CFLAGS) -+else -+INCLUDES += -I$(top_srcdir)/src/include/scripting/include -+endif -+ -+ - if GTK_NOTEBOOK - GTK_NOTEBOOK_FLAGS = -DUSE_GTK_NOTEBOOK - endif --- -1.7.7.6 - - -From 796368d5adfe62f8c96fa8bc93ddab458a692304 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Sat, 14 Jan 2012 23:35:32 +0100 -Subject: [PATCH 6/6] convert plugins to system squirrel - ---- - src/plugins/abbreviations/Makefile.am | 6 +++++- - src/plugins/compilergcc/Makefile.am | 7 ++++++- - src/plugins/contrib/envvars/Makefile.am | 7 ++++++- - src/plugins/contrib/help_plugin/Makefile.am | 10 +++++++++- - src/plugins/contrib/lib_finder/Makefile.am | 8 ++++++-- - src/plugins/contrib/wxSmith/Makefile.am | 8 ++++++-- - src/plugins/contrib/wxSmith/wxwidgets/Makefile.am | 8 ++++++-- - src/plugins/debuggergdb/Makefile.am | 7 ++++++- - src/plugins/scriptedwizard/Makefile.am | 7 ++++++- - 9 files changed, 56 insertions(+), 12 deletions(-) - -diff --git a/src/plugins/abbreviations/Makefile.am b/src/plugins/abbreviations/Makefile.am -index 0cc25a0..dcf7605 100644 ---- a/src/plugins/abbreviations/Makefile.am -+++ b/src/plugins/abbreviations/Makefile.am -@@ -3,10 +3,14 @@ SUBDIRS = resources - INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include \ -- -I$(top_srcdir)/src/include/scripting/include \ - -I$(top_srcdir)/src/include/scripting/sqplus \ - -I$(top_srcdir)/src/include/scripting/bindings - -+if HAVE_SQUIRREL -+INCLUDES += $(SQUIRREL_CFLAGS) -+else -+INCLUDES += -I$(top_srcdir)/src/include/scripting/include -+endif - - pluginlibdir = $(pkglibdir)/plugins - -diff --git a/src/plugins/compilergcc/Makefile.am b/src/plugins/compilergcc/Makefile.am -index 470a04a..8c80ce9 100644 ---- a/src/plugins/compilergcc/Makefile.am -+++ b/src/plugins/compilergcc/Makefile.am -@@ -3,10 +3,15 @@ SUBDIRS = depslib resources - INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include \ -- -I$(top_srcdir)/src/include/scripting/include \ - -I$(top_srcdir)/src/include/scripting/sqplus \ - -I$(top_srcdir)/src/plugins/compilergcc/depslib/src - -+if HAVE_SQUIRREL -+INCLUDES += $(SQUIRREL_CFLAGS) -+else -+INCLUDES += -I$(top_srcdir)/src/include/scripting/include -+endif -+ - AM_CXXFLAGS = -DDEPSLIB_UNIX - - pluginlibdir = $(pkglibdir)/plugins -diff --git a/src/plugins/contrib/envvars/Makefile.am b/src/plugins/contrib/envvars/Makefile.am -index 854498d..f419c87 100644 ---- a/src/plugins/contrib/envvars/Makefile.am -+++ b/src/plugins/contrib/envvars/Makefile.am -@@ -1,6 +1,5 @@ - INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ -- -I$(top_srcdir)/src/include/scripting/include \ - -I$(top_srcdir)/src/include/scripting/sqplus \ - -I$(top_srcdir)/src/include/scripting/bindings \ - -I$(top_srcdir)/src/sdk/wxscintilla/include -@@ -9,6 +8,12 @@ if ! HAVE_TINYXML - INCLUDES += -I$(top_srcdir)/src/include/tinyxml - endif - -+if HAVE_SQUIRREL -+INCLUDES += $(SQUIRREL_CFLAGS) -+else -+INCLUDES += -I$(top_srcdir)/src/include/scripting/include -+endif -+ - pluginlibdir = $(pkglibdir)/plugins - pkgdata_DATA = envvars.zip - -diff --git a/src/plugins/contrib/help_plugin/Makefile.am b/src/plugins/contrib/help_plugin/Makefile.am -index 1fbb566..96def6f 100644 ---- a/src/plugins/contrib/help_plugin/Makefile.am -+++ b/src/plugins/contrib/help_plugin/Makefile.am -@@ -10,7 +10,6 @@ endif - INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include \ -- -I$(top_srcdir)/src/include/scripting/include \ - -I$(top_srcdir)/src/include/scripting/bindings \ - -I$(top_srcdir)/src/include/scripting/sqplus - -@@ -40,6 +39,15 @@ if ! HAVE_TINYXML - INCLUDES += -I$(top_srcdir)/src/include/tinyxml - endif - -+if HAVE_SQUIRREL -+INCLUDES += $(SQUIRREL_CFLAGS) -+libhelp_plugin_la_LIBADD += $(SQUIRREL_LIBS) -+else -+INCLUDES += -I$(top_srcdir)/src/include/scripting/include -+libhelp_plugin_la_LIBADD += ../../../sdk/scripting/sqstdlib/libsqstdlib.la \ -+ ../../../sdk/scripting/squirrel/libsquirrel.la -+endif -+ - libhelp_plugin_la_SOURCES = help_common.cpp \ - HelpConfigDialog.cpp \ - help_plugin.cpp \ -diff --git a/src/plugins/contrib/lib_finder/Makefile.am b/src/plugins/contrib/lib_finder/Makefile.am -index 3422f9f..e5de339 100644 ---- a/src/plugins/contrib/lib_finder/Makefile.am -+++ b/src/plugins/contrib/lib_finder/Makefile.am -@@ -4,9 +4,7 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include \ - -I$(srcdir)/../wxContribItems/wxFlatNotebook/include \ -- -I$(top_srcdir)/src/include/scripting/include \ - -I$(top_srcdir)/src/include/scripting/sqplus \ -- -I$(top_srcdir)/src/include/scripting/squirrel \ - -I$(top_srcdir)/src/include/scripting/bindings \ - -I$(top_srcdir)/src/include/mozilla_chardet - -@@ -14,6 +12,12 @@ if ! HAVE_TINYXML - INCLUDES += -I$(top_srcdir)/src/include/tinyxml - endif - -+if HAVE_SQUIRREL -+INCLUDES += $(SQUIRREL_CFLAGS) -+else -+INCLUDES += -I$(top_srcdir)/src/include/scripting/include -+endif -+ - pluginlibdir = $(pkglibdir)/plugins - - pluginlib_LTLIBRARIES = liblib_finder.la -diff --git a/src/plugins/contrib/wxSmith/Makefile.am b/src/plugins/contrib/wxSmith/Makefile.am -index 2227929..dbfafc6 100644 ---- a/src/plugins/contrib/wxSmith/Makefile.am -+++ b/src/plugins/contrib/wxSmith/Makefile.am -@@ -4,8 +4,6 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include \ - $(WXPROPGRID_INCLUDE) \ -- -I$(top_srcdir)/src/include/scripting/include \ -- -I$(top_srcdir)/src/include/scripting/squirrel \ - -I$(top_srcdir)/src/include/scripting/sqplus \ - -I$(top_srcdir)/src/include/scripting/bindings \ - -I$(top_srcdir)/src/include/mozilla_chardet -@@ -14,6 +12,12 @@ if ! HAVE_TINYXML - INCLUDES += -I$(top_srcdir)/src/include/tinyxml - endif - -+if HAVE_SQUIRREL -+INCLUDES += $(SQUIRREL_CFLAGS) -+else -+INCLUDES += -I$(top_srcdir)/src/include/scripting/include -+endif -+ - lib_LTLIBRARIES = libwxsmithlib.la - - libwxsmithlib_la_LDFLAGS = -version-info 0:1:0 -shared -diff --git a/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am b/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am -index abbc6a1..331bf10 100644 ---- a/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am -+++ b/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am -@@ -4,8 +4,6 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include \ - $(WXPROPGRID_INCLUDE) \ -- -I$(top_srcdir)/src/include/scripting/include \ -- -I$(top_srcdir)/src/include/scripting/squirrel \ - -I$(top_srcdir)/src/include/scripting/sqplus \ - -I$(top_srcdir)/src/include/scripting/bindings - -@@ -13,6 +11,12 @@ if ! HAVE_TINYXML - INCLUDES += -I$(top_srcdir)/src/include/tinyxml - endif - -+if HAVE_SQUIRREL -+INCLUDES += $(SQUIRREL_CFLAGS) -+else -+INCLUDES += -I$(top_srcdir)/src/include/scripting/include -+endif -+ - noinst_LTLIBRARIES = libwxsmith_wxwidgets.la - - libwxsmith_wxwidgets_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version -diff --git a/src/plugins/debuggergdb/Makefile.am b/src/plugins/debuggergdb/Makefile.am -index e0517f2..38cf567 100644 ---- a/src/plugins/debuggergdb/Makefile.am -+++ b/src/plugins/debuggergdb/Makefile.am -@@ -3,9 +3,14 @@ SUBDIRS = resources - INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include \ -- -I$(top_srcdir)/src/include/scripting/include \ - -I$(top_srcdir)/src/include/scripting/sqplus - -+if HAVE_SQUIRREL -+INCLUDES += $(SQUIRREL_CFLAGS) -+else -+INCLUDES += -I$(top_srcdir)/src/include/scripting/include -+endif -+ - pluginlibdir = $(pkglibdir)/plugins - - pluginlib_LTLIBRARIES = libdebugger.la -diff --git a/src/plugins/scriptedwizard/Makefile.am b/src/plugins/scriptedwizard/Makefile.am -index 5ef7f7a..432ce18 100644 ---- a/src/plugins/scriptedwizard/Makefile.am -+++ b/src/plugins/scriptedwizard/Makefile.am -@@ -3,13 +3,18 @@ SUBDIRS = resources - INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include \ -- -I$(top_srcdir)/src/include/scripting/include \ - -I$(top_srcdir)/src/include/scripting/sqplus - - if ! HAVE_TINYXML - INCLUDES += -I$(top_srcdir)/src/include/tinyxml - endif - -+if HAVE_SQUIRREL -+INCLUDES += $(SQUIRREL_CFLAGS) -+else -+INCLUDES += -I$(top_srcdir)/src/include/scripting/include -+endif -+ - pluginlibdir = $(pkglibdir)/plugins - - pluginlib_LTLIBRARIES = libscriptedwizard.la --- -1.7.7.6 - diff --git a/codeblocks-tinyxml.patch b/codeblocks-tinyxml.patch deleted file mode 100644 index 1201082..0000000 --- a/codeblocks-tinyxml.patch +++ /dev/null @@ -1,1975 +0,0 @@ -From 2e4212dcfa48ec2f8102eb90e65289517e123902 Mon Sep 17 00:00:00 2001 -From: Dan Horak -Date: Wed, 13 May 2009 10:21:19 +0200 -Subject: [PATCH 01/29] add check for tinyxml into configure - ---- - configure.in | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -diff --git a/configure.in b/configure.in -index d87be4e..50097b2 100644 ---- a/configure.in -+++ b/configure.in -@@ -56,9 +56,18 @@ AC_SEARCH_LIBS(gzopen, z, [HAVE_ZLIB=yes], [HAVE_ZLIB=no]) - LIBS=$save_LIBS - AC_SEARCH_LIBS(BZ2_bzopen, bz2, [HAVE_BZIP2=yes], [HAVE_BZIP2=no]) - LIBS=$save_LIBS -+save_CC=$CC -+save_CPP=$CPP -+CC=$CXX -+CPP=$CXXCPP -+AC_CHECK_HEADER(tinyxml.h, [HAVE_TINYXML=yes], [HAVE_TINYXML=no]) -+CC=$save_CC -+CPP=$save_CPP -+ - - AM_CONDITIONAL([HAVE_ZLIB], [test "$HAVE_ZLIB" = yes]) - AM_CONDITIONAL([HAVE_BZIP2], [test "$HAVE_BZIP2" = yes]) -+AM_CONDITIONAL([HAVE_TINYXML], [test "$HAVE_TINYXML" = yes]) - - dnl versioning info for libtool - dnl Note this is the ABI version which is not the same as our actual library version --- -1.7.7.6 - - -From 9c0c4e8074095be021698e17edec24f8b0ee5f63 Mon Sep 17 00:00:00 2001 -From: Dan Horak -Date: Wed, 13 May 2009 16:53:29 +0200 -Subject: [PATCH 02/29] move tinywxuni.h header from tinyxml into sdk - ---- - src/include/Makefile.am | 1 + - src/include/tinywxuni.h | 15 +++++++++++++++ - src/include/tinyxml/Makefile.am | 2 +- - src/include/tinyxml/tinywxuni.h | 15 --------------- - .../contrib/BrowseTracker/BrowseTrackerLayout.cpp | 2 +- - .../contrib/lib_finder/librarydetectionmanager.cpp | 2 +- - .../contrib/wxSmith/wxsversionconverter.cpp | 2 +- - .../contrib/wxSmith/wxwidgets/wxsitemresdata.cpp | 2 +- - .../wxSmith/wxwidgets/wxwidgetsresfactory.cpp | 2 +- - src/sdk/configmanager.cpp | 2 +- - src/sdk/globals.cpp | 2 +- - src/sdk/projectlayoutloader.cpp | 2 +- - src/sdk/projectloader.cpp | 2 +- - src/sdk/workspaceloader.cpp | 2 +- - src/tools/cb_share_config/mainframe.cpp | 2 +- - 15 files changed, 28 insertions(+), 27 deletions(-) - create mode 100644 src/include/tinywxuni.h - delete mode 100644 src/include/tinyxml/tinywxuni.h - -diff --git a/src/include/Makefile.am b/src/include/Makefile.am -index f093bf9..d510a22 100644 ---- a/src/include/Makefile.am -+++ b/src/include/Makefile.am -@@ -124,6 +124,7 @@ ALLHEADERS = annoyingdialog.h \ - selecttargetdlg.h \ - settings.h \ - templatemanager.h \ -+ tinywxuni.h \ - toolsmanager.h \ - uservarmanager.h \ - virtualbuildtargetsdlg.h \ -diff --git a/src/include/tinywxuni.h b/src/include/tinywxuni.h -new file mode 100644 -index 0000000..b9433cc ---- /dev/null -+++ b/src/include/tinywxuni.h -@@ -0,0 +1,15 @@ -+#ifndef TINYWXUNI_H -+#define TINYWXUNI_H -+ -+class wxString; -+class TiXmlDocument; -+ -+namespace TinyXML -+{ -+ bool LoadDocument(const wxString& filename, TiXmlDocument *doc); -+ TiXmlDocument* LoadDocument(const wxString& filename); -+ -+ bool SaveDocument(const wxString& filename, TiXmlDocument* doc); -+} -+ -+#endif -diff --git a/src/include/tinyxml/Makefile.am b/src/include/tinyxml/Makefile.am -index fdfa2c5..c22e938 100644 ---- a/src/include/tinyxml/Makefile.am -+++ b/src/include/tinyxml/Makefile.am -@@ -1,3 +1,3 @@ - sdkdir=$(includedir)/codeblocks/tinyxml - --sdk_HEADERS = tinystr.h tinyxml.h tinywxuni.h -+sdk_HEADERS = tinystr.h tinyxml.h -diff --git a/src/include/tinyxml/tinywxuni.h b/src/include/tinyxml/tinywxuni.h -deleted file mode 100644 -index b9433cc..0000000 ---- a/src/include/tinyxml/tinywxuni.h -+++ /dev/null -@@ -1,15 +0,0 @@ --#ifndef TINYWXUNI_H --#define TINYWXUNI_H -- --class wxString; --class TiXmlDocument; -- --namespace TinyXML --{ -- bool LoadDocument(const wxString& filename, TiXmlDocument *doc); -- TiXmlDocument* LoadDocument(const wxString& filename); -- -- bool SaveDocument(const wxString& filename, TiXmlDocument* doc); --} -- --#endif -diff --git a/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp b/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp -index c6358a4..271ba52 100644 ---- a/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp -+++ b/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp -@@ -47,7 +47,7 @@ - - #include - #include "tinyxml/tinyxml.h" --#include "tinyxml/tinywxuni.h" -+#include "tinywxuni.h" - - #include "BrowseTrackerLayout.h" - #include "BrowseMarks.h" -diff --git a/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp b/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp -index 886bbb7..a58776f 100644 ---- a/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp -+++ b/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp -@@ -22,7 +22,7 @@ - */ - - #include --#include -+#include - - #include - #include -diff --git a/src/plugins/contrib/wxSmith/wxsversionconverter.cpp b/src/plugins/contrib/wxSmith/wxsversionconverter.cpp -index b03ceaa..8c2ca85 100644 ---- a/src/plugins/contrib/wxSmith/wxsversionconverter.cpp -+++ b/src/plugins/contrib/wxSmith/wxsversionconverter.cpp -@@ -26,7 +26,7 @@ - - #include - #include --#include -+#include - - // TODO: This is same as in wxsproject.h, make one set instead of two - namespace -diff --git a/src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdata.cpp b/src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdata.cpp -index bd87a9b..51a6cb1 100644 ---- a/src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdata.cpp -+++ b/src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdata.cpp -@@ -31,7 +31,7 @@ - #include - #include - #include --#include -+#include - - #if defined(__WXMSW__) && defined(LoadImage) - // Fix Windows winuser.h Header define of LoadImage. -diff --git a/src/plugins/contrib/wxSmith/wxwidgets/wxwidgetsresfactory.cpp b/src/plugins/contrib/wxSmith/wxwidgets/wxwidgetsresfactory.cpp -index 065dadf..5525ec8b 100644 ---- a/src/plugins/contrib/wxSmith/wxwidgets/wxwidgetsresfactory.cpp -+++ b/src/plugins/contrib/wxSmith/wxwidgets/wxwidgetsresfactory.cpp -@@ -31,7 +31,7 @@ - #include "../wxsmith.h" - - #include --#include -+#include - #include - #include - -diff --git a/src/sdk/configmanager.cpp b/src/sdk/configmanager.cpp -index ff5b265..77393d3 100644 ---- a/src/sdk/configmanager.cpp -+++ b/src/sdk/configmanager.cpp -@@ -43,7 +43,7 @@ - #include - #endif - --#include "tinyxml/tinywxuni.h" -+#include "tinywxuni.h" - #include - - template<> CfgMgrBldr* Mgr::instance = 0; -diff --git a/src/sdk/globals.cpp b/src/sdk/globals.cpp -index 384d6e8..36b797d 100644 ---- a/src/sdk/globals.cpp -+++ b/src/sdk/globals.cpp -@@ -38,7 +38,7 @@ - #include - - #include "filefilters.h" --#include "tinyxml/tinywxuni.h" -+#include "tinywxuni.h" - #include "filegroupsandmasks.h" - - #ifndef __WXMSW__ -diff --git a/src/sdk/projectlayoutloader.cpp b/src/sdk/projectlayoutloader.cpp -index 80f06cb..74a9612 100644 ---- a/src/sdk/projectlayoutloader.cpp -+++ b/src/sdk/projectlayoutloader.cpp -@@ -23,7 +23,7 @@ - - #include "projectlayoutloader.h" - #include "tinyxml/tinyxml.h" --#include "tinyxml/tinywxuni.h" -+#include "tinywxuni.h" - - ProjectLayoutLoader::ProjectLayoutLoader(cbProject* project) - : m_pProject(project), -diff --git a/src/sdk/projectloader.cpp b/src/sdk/projectloader.cpp -index 2b70928..162291d 100644 ---- a/src/sdk/projectloader.cpp -+++ b/src/sdk/projectloader.cpp -@@ -35,7 +35,7 @@ - #include "projectloader_hooks.h" - #include "annoyingdialog.h" - #include "configmanager.h" --#include "tinyxml/tinywxuni.h" -+#include "tinywxuni.h" - #include "filegroupsandmasks.h" - - ProjectLoader::ProjectLoader(cbProject* project) -diff --git a/src/sdk/workspaceloader.cpp b/src/sdk/workspaceloader.cpp -index 3423c08..9af27ff 100644 ---- a/src/sdk/workspaceloader.cpp -+++ b/src/sdk/workspaceloader.cpp -@@ -28,7 +28,7 @@ - - - #include "tinyxml/tinyxml.h" --#include "tinyxml/tinywxuni.h" -+#include "tinywxuni.h" - - WorkspaceLoader::WorkspaceLoader() - { -diff --git a/src/tools/cb_share_config/mainframe.cpp b/src/tools/cb_share_config/mainframe.cpp -index 335edd1..748e13e 100644 ---- a/src/tools/cb_share_config/mainframe.cpp -+++ b/src/tools/cb_share_config/mainframe.cpp -@@ -24,7 +24,7 @@ - #include - #endif - --#include "tinyxml/tinywxuni.h" -+#include "tinywxuni.h" - - //*********************************************************************** - --- -1.7.7.6 - - -From 6ae3dd683e0fe6db3da3bad3aa7af897a5a25a62 Mon Sep 17 00:00:00 2001 -From: Dan Horak -Date: Thu, 14 May 2009 09:42:37 +0200 -Subject: [PATCH 03/29] move tinywxuni.cpp implementation from tinyxml into - sdk - ---- - src/base/tinyxml/Makefile.am | 2 +- - src/base/tinyxml/tinywxuni.cpp | 56 ---------------------------------------- - src/sdk/Makefile.am | 1 + - src/sdk/tinywxuni.cpp | 56 ++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 58 insertions(+), 57 deletions(-) - delete mode 100644 src/base/tinyxml/tinywxuni.cpp - create mode 100644 src/sdk/tinywxuni.cpp - -diff --git a/src/base/tinyxml/Makefile.am b/src/base/tinyxml/Makefile.am -index bc3e89d..c480f0c 100644 ---- a/src/base/tinyxml/Makefile.am -+++ b/src/base/tinyxml/Makefile.am -@@ -5,4 +5,4 @@ INCLUDES = $(WX_CXXFLAGS) \ - - noinst_LTLIBRARIES = libtinyxml.la - --libtinyxml_la_SOURCES = tinystr.cpp tinyxml.cpp tinyxmlerror.cpp tinyxmlparser.cpp tinywxuni.cpp -+libtinyxml_la_SOURCES = tinystr.cpp tinyxml.cpp tinyxmlerror.cpp tinyxmlparser.cpp -diff --git a/src/base/tinyxml/tinywxuni.cpp b/src/base/tinyxml/tinywxuni.cpp -deleted file mode 100644 -index d156154..0000000 ---- a/src/base/tinyxml/tinywxuni.cpp -+++ /dev/null -@@ -1,56 +0,0 @@ --#include "sdk_precomp.h" -- --#ifndef CB_PRECOMP -- #include -- #include -- #include "filemanager.h" -- #include "manager.h" --#endif -- --#include "tinywxuni.h" --#include "tinyxml.h" -- --bool TinyXML::LoadDocument(const wxString& filename, TiXmlDocument *doc) --{ -- -- if (!doc || !wxFile::Access(filename, wxFile::read)) -- return false; -- -- wxFile file(filename); -- size_t len = file.Length(); -- -- if (!len) -- return false; -- -- char *input = new char[len+1]; -- input[len] = '\0'; -- file.Read(input, len); -- -- doc->Parse(input); -- delete[] input; -- return true; --} -- --TiXmlDocument* TinyXML::LoadDocument(const wxString& filename) --{ -- TiXmlDocument* doc = new TiXmlDocument(); -- -- if (TinyXML::LoadDocument(filename, doc)) -- return doc; -- -- delete doc; -- return 0; --} -- --bool TinyXML::SaveDocument(const wxString& filename, TiXmlDocument* doc) --{ -- if (!doc) -- return false; -- -- TiXmlPrinter printer; -- printer.SetIndent("\t"); -- doc->Accept(&printer); -- -- return Manager::Get()->GetFileManager()->Save(filename, printer.CStr(), printer.Size()); --} -- -diff --git a/src/sdk/Makefile.am b/src/sdk/Makefile.am -index ffb588e..aea1a75 100644 ---- a/src/sdk/Makefile.am -+++ b/src/sdk/Makefile.am -@@ -107,6 +107,7 @@ libcodeblocks_la_SOURCES = annoyingdialog.cpp \ - searchresultslog.cpp \ - selecttargetdlg.cpp \ - templatemanager.cpp \ -+ tinywxuni.cpp \ - toolsmanager.cpp \ - uservarmanager.cpp \ - virtualbuildtargetsdlg.cpp \ -diff --git a/src/sdk/tinywxuni.cpp b/src/sdk/tinywxuni.cpp -new file mode 100644 -index 0000000..d156154 ---- /dev/null -+++ b/src/sdk/tinywxuni.cpp -@@ -0,0 +1,56 @@ -+#include "sdk_precomp.h" -+ -+#ifndef CB_PRECOMP -+ #include -+ #include -+ #include "filemanager.h" -+ #include "manager.h" -+#endif -+ -+#include "tinywxuni.h" -+#include "tinyxml.h" -+ -+bool TinyXML::LoadDocument(const wxString& filename, TiXmlDocument *doc) -+{ -+ -+ if (!doc || !wxFile::Access(filename, wxFile::read)) -+ return false; -+ -+ wxFile file(filename); -+ size_t len = file.Length(); -+ -+ if (!len) -+ return false; -+ -+ char *input = new char[len+1]; -+ input[len] = '\0'; -+ file.Read(input, len); -+ -+ doc->Parse(input); -+ delete[] input; -+ return true; -+} -+ -+TiXmlDocument* TinyXML::LoadDocument(const wxString& filename) -+{ -+ TiXmlDocument* doc = new TiXmlDocument(); -+ -+ if (TinyXML::LoadDocument(filename, doc)) -+ return doc; -+ -+ delete doc; -+ return 0; -+} -+ -+bool TinyXML::SaveDocument(const wxString& filename, TiXmlDocument* doc) -+{ -+ if (!doc) -+ return false; -+ -+ TiXmlPrinter printer; -+ printer.SetIndent("\t"); -+ doc->Accept(&printer); -+ -+ return Manager::Get()->GetFileManager()->Save(filename, printer.CStr(), printer.Size()); -+} -+ --- -1.7.7.6 - - -From 79b6d9eddde59cde7b78087afec5a8b9a6e570b6 Mon Sep 17 00:00:00 2001 -From: Dan Horak -Date: Thu, 14 May 2009 10:04:35 +0200 -Subject: [PATCH 04/29] update C::B projects with new locations of tinywxuni - ---- - src/CodeBlocks-unix.cbp | 4 ++-- - src/CodeBlocks.cbp | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/CodeBlocks-unix.cbp b/src/CodeBlocks-unix.cbp -index 739c24a..ef6ddd1 100644 ---- a/src/CodeBlocks-unix.cbp -+++ b/src/CodeBlocks-unix.cbp -@@ -473,7 +473,7 @@ - - -- -+ - - -@@ -981,7 +981,7 @@ - - -- -+ - - -diff --git a/src/CodeBlocks.cbp b/src/CodeBlocks.cbp -index 9d8bdf5..f4d9a67 100644 ---- a/src/CodeBlocks.cbp -+++ b/src/CodeBlocks.cbp -@@ -714,7 +714,7 @@ - - -- -+ - - -@@ -1222,7 +1222,7 @@ - - -- -+ - - --- -1.7.7.6 - - -From 13646797c40e9c66f7b1c31a5f2f79815a3671e5 Mon Sep 17 00:00:00 2001 -From: Dan Horak -Date: Thu, 14 May 2009 10:05:42 +0200 -Subject: [PATCH 05/29] convert autorevision to new tinyxml handling - ---- - src/build_tools/autorevision/Makefile.am | 5 ++++- - src/build_tools/autorevision/autorevision.cpp | 3 +-- - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/build_tools/autorevision/Makefile.am b/src/build_tools/autorevision/Makefile.am -index db54806..62e6054 100644 ---- a/src/build_tools/autorevision/Makefile.am -+++ b/src/build_tools/autorevision/Makefile.am -@@ -1,9 +1,12 @@ - noinst_PROGRAMS = auto_revision - auto_revision_SOURCES = autorevision.cpp - -+if ! HAVE_TINYXML - INCLUDES = -I$(top_srcdir)/src/include -- - auto_revision_LDADD = ../../base/tinyxml/libtinyxml.la -+else -+auto_revision_LDADD = -ltinyxml -+endif - - all-local: auto_revision - ./auto_revision +int +wx +t $(top_srcdir) $(top_builddir)/src/include/autorevision.h -diff --git a/src/build_tools/autorevision/autorevision.cpp b/src/build_tools/autorevision/autorevision.cpp -index 8378eb1..8810e59 100644 ---- a/src/build_tools/autorevision/autorevision.cpp -+++ b/src/build_tools/autorevision/autorevision.cpp -@@ -11,8 +11,7 @@ - #include - #include - --#include "tinyxml/tinystr.h" --#include "tinyxml/tinyxml.h" -+#include - - using namespace std; - --- -1.7.7.6 - - -From 4690bce7dc7472372a4023b5fc736aa9f9e7f08f Mon Sep 17 00:00:00 2001 -From: Dan Horak -Date: Thu, 14 May 2009 17:33:02 +0200 -Subject: [PATCH 06/29] convert sdk to new tinyxml handling - ---- - src/include/configmanager.h | 3 +-- - src/include/projecttemplateloader.h | 2 +- - src/sdk/Makefile.am | 9 +++++++-- - src/sdk/globals.cpp | 2 +- - src/sdk/pluginmanager.cpp | 2 +- - src/sdk/projectlayoutloader.cpp | 2 +- - src/sdk/tinywxuni.cpp | 2 +- - src/sdk/workspaceloader.cpp | 2 +- - 8 files changed, 14 insertions(+), 10 deletions(-) - -diff --git a/src/include/configmanager.h b/src/include/configmanager.h -index f6a5297..b2849ba 100644 ---- a/src/include/configmanager.h -+++ b/src/include/configmanager.h -@@ -12,8 +12,7 @@ - #include "settings.h" - #include "globals.h" - --#include "tinyxml/tinystr.h" --#include "tinyxml/tinyxml.h" -+#include - #include "manager.h" - #include "base64.h" - -diff --git a/src/include/projecttemplateloader.h b/src/include/projecttemplateloader.h -index 82b5c68..9add87c 100644 ---- a/src/include/projecttemplateloader.h -+++ b/src/include/projecttemplateloader.h -@@ -6,7 +6,7 @@ - #ifndef PROJECTTEMPLATELOADER_H - #define PROJECTTEMPLATELOADER_H - --#include "tinyxml/tinyxml.h" -+#include - #include "settings.h" - - struct FileSetFile -diff --git a/src/sdk/Makefile.am b/src/sdk/Makefile.am -index aea1a75..eefb3d8 100644 ---- a/src/sdk/Makefile.am -+++ b/src/sdk/Makefile.am -@@ -4,7 +4,6 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include \ - $(WXPROPGRID_INCLUDE) \ -- -I$(top_srcdir)/src/include/tinyxml \ - -I$(top_srcdir)/src/include/scripting/include \ - -I$(top_srcdir)/src/include/scripting/bindings \ - -I$(top_srcdir)/src/include/scripting/sqplus \ -@@ -19,10 +18,16 @@ libcodeblocks_la_LIBADD = $(WX_LIBS) \ - scripting/sqplus/libsqplus.la \ - scripting/sqstdlib/libsqstdlib.la \ - scripting/squirrel/libsquirrel.la \ -- ../base/tinyxml/libtinyxml.la \ - wxscintilla/libwxscintilla.la \ - $(WXPROPGRID_LIB) - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+libcodeblocks_la_LIBADD += ../base/tinyxml/libtinyxml.la -+else -+libcodeblocks_la_LIBADD += -ltinyxml -+endif -+ - libcodeblocks_la_SOURCES = annoyingdialog.cpp \ - autodetectcompilers.cpp \ - base64.cpp \ -diff --git a/src/sdk/globals.cpp b/src/sdk/globals.cpp -index 36b797d..7905163 100644 ---- a/src/sdk/globals.cpp -+++ b/src/sdk/globals.cpp -@@ -26,7 +26,7 @@ - #include "projectmanager.h" - #endif - --#include "tinyxml/tinyxml.h" -+#include - - #include - #include -diff --git a/src/sdk/pluginmanager.cpp b/src/sdk/pluginmanager.cpp -index 2fa3262..d4192ff 100644 ---- a/src/sdk/pluginmanager.cpp -+++ b/src/sdk/pluginmanager.cpp -@@ -42,7 +42,7 @@ - #include - - #include "filefilters.h" --#include "tinyxml/tinyxml.h" -+#include - - #include "annoyingdialog.h" - #include "pluginsconfigurationdlg.h" -diff --git a/src/sdk/projectlayoutloader.cpp b/src/sdk/projectlayoutloader.cpp -index 74a9612..ef76036 100644 ---- a/src/sdk/projectlayoutloader.cpp -+++ b/src/sdk/projectlayoutloader.cpp -@@ -22,7 +22,7 @@ - #endif - - #include "projectlayoutloader.h" --#include "tinyxml/tinyxml.h" -+#include - #include "tinywxuni.h" - - ProjectLayoutLoader::ProjectLayoutLoader(cbProject* project) -diff --git a/src/sdk/tinywxuni.cpp b/src/sdk/tinywxuni.cpp -index d156154..09f897d 100644 ---- a/src/sdk/tinywxuni.cpp -+++ b/src/sdk/tinywxuni.cpp -@@ -8,7 +8,7 @@ - #endif - - #include "tinywxuni.h" --#include "tinyxml.h" -+#include - - bool TinyXML::LoadDocument(const wxString& filename, TiXmlDocument *doc) - { -diff --git a/src/sdk/workspaceloader.cpp b/src/sdk/workspaceloader.cpp -index 9af27ff..e298991 100644 ---- a/src/sdk/workspaceloader.cpp -+++ b/src/sdk/workspaceloader.cpp -@@ -27,7 +27,7 @@ - - - --#include "tinyxml/tinyxml.h" -+#include - #include "tinywxuni.h" - - WorkspaceLoader::WorkspaceLoader() --- -1.7.7.6 - - -From fe08dd5f933cd87e31cb746f6f3b9c0151e50eee Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Sat, 16 May 2009 12:36:33 +0200 -Subject: [PATCH 07/29] update codecompletion plugin - ---- - src/plugins/codecompletion/Makefile.am | 4 ++++ - src/plugins/codecompletion/nativeparser.cpp | 1 + - 2 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/src/plugins/codecompletion/Makefile.am b/src/plugins/codecompletion/Makefile.am -index 4f8152e..3825380 100644 ---- a/src/plugins/codecompletion/Makefile.am -+++ b/src/plugins/codecompletion/Makefile.am -@@ -5,6 +5,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/sdk/wxscintilla/include \ - -I$(top_srcdir)/src/include/mozilla_chardet - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - pluginlibdir = $(pkglibdir)/plugins - - pluginlib_LTLIBRARIES = libcodecompletion.la -diff --git a/src/plugins/codecompletion/nativeparser.cpp b/src/plugins/codecompletion/nativeparser.cpp -index f2588d9..85545ff 100644 ---- a/src/plugins/codecompletion/nativeparser.cpp -+++ b/src/plugins/codecompletion/nativeparser.cpp -@@ -39,6 +39,7 @@ - #include - #include - #include -+#include - - #include "nativeparser.h" - #include "classbrowser.h" --- -1.7.7.6 - - -From a2964067f8092b21726e8c47488eb73b61897150 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Sat, 16 May 2009 12:38:01 +0200 -Subject: [PATCH 08/29] update codesnippets plugin - ---- - src/plugins/contrib/codesnippets/Makefile.am | 4 ++++ - .../contrib/codesnippets/codesnippetstreectrl.cpp | 1 - - .../contrib/codesnippets/codesnippetstreectrl.h | 2 +- - .../contrib/codesnippets/codesnippetswindow.cpp | 2 +- - 4 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/src/plugins/contrib/codesnippets/Makefile.am b/src/plugins/contrib/codesnippets/Makefile.am -index a7cbaa5..6e86044 100644 ---- a/src/plugins/contrib/codesnippets/Makefile.am -+++ b/src/plugins/contrib/codesnippets/Makefile.am -@@ -10,6 +10,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/plugins/contrib/codesnippets/editor \ - -I$(top_srcdir)/src/include/mozilla_chardet - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - pluginlibdir = $(pkglibdir)/plugins - - pluginlib_LTLIBRARIES = libcodesnippets.la -diff --git a/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp b/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp -index 65e6af5..ffbdc01 100644 ---- a/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp -+++ b/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp -@@ -41,7 +41,6 @@ - //-#else - //-#endif - --#include - #include "snippetitemdata.h" - #include "codesnippetstreectrl.h" - #include "codesnippetswindow.h" -diff --git a/src/plugins/contrib/codesnippets/codesnippetstreectrl.h b/src/plugins/contrib/codesnippets/codesnippetstreectrl.h -index e5778ae..8bcccd7 100644 ---- a/src/plugins/contrib/codesnippets/codesnippetstreectrl.h -+++ b/src/plugins/contrib/codesnippets/codesnippetstreectrl.h -@@ -30,7 +30,7 @@ class TiXmlElement; - #include "wx/mimetype.h" - - #include "snippetitemdata.h" --#include -+#include - #include "snippetproperty.h" - #include "codesnippetsevent.h" - #include "snippetsconfig.h" -diff --git a/src/plugins/contrib/codesnippets/codesnippetswindow.cpp b/src/plugins/contrib/codesnippets/codesnippetswindow.cpp -index c0d1db7..64c7dcb 100644 ---- a/src/plugins/contrib/codesnippets/codesnippetswindow.cpp -+++ b/src/plugins/contrib/codesnippets/codesnippetswindow.cpp -@@ -63,7 +63,7 @@ - #include "version.h" - #include "codesnippetswindow.h" - #include "snippetitemdata.h" --#include -+#include - #include "snippetsconfig.h" - #include "snippetsimages.h" - #include "codesnippetstreectrl.h" --- -1.7.7.6 - - -From 5ac8f37b931a300a4e30df64d085e3d9beaab49e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Sat, 16 May 2009 12:39:05 +0200 -Subject: [PATCH 09/29] update envvars plugin - ---- - src/plugins/contrib/envvars/Makefile.am | 4 ++++ - src/plugins/contrib/envvars/envvars.cpp | 2 +- - 2 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/src/plugins/contrib/envvars/Makefile.am b/src/plugins/contrib/envvars/Makefile.am -index dc87160..854498d 100644 ---- a/src/plugins/contrib/envvars/Makefile.am -+++ b/src/plugins/contrib/envvars/Makefile.am -@@ -5,6 +5,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include/scripting/bindings \ - -I$(top_srcdir)/src/sdk/wxscintilla/include - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - pluginlibdir = $(pkglibdir)/plugins - pkgdata_DATA = envvars.zip - -diff --git a/src/plugins/contrib/envvars/envvars.cpp b/src/plugins/contrib/envvars/envvars.cpp -index 1290b5a..bf72252 100644 ---- a/src/plugins/contrib/envvars/envvars.cpp -+++ b/src/plugins/contrib/envvars/envvars.cpp -@@ -15,7 +15,7 @@ - #include - #include - -- #include -+ #include - - #include "cbproject.h" - #include "globals.h" --- -1.7.7.6 - - -From a2b68638b3dec7b626be622466dfae686794093f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Sat, 16 May 2009 12:40:11 +0200 -Subject: [PATCH 10/29] update BrowseTracker plugin - ---- - .../contrib/BrowseTracker/BrowseTrackerLayout.cpp | 2 +- - src/plugins/contrib/BrowseTracker/Makefile.am | 4 ++++ - 2 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp b/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp -index 271ba52..6dc3917 100644 ---- a/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp -+++ b/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp -@@ -46,7 +46,7 @@ - #endif - - #include --#include "tinyxml/tinyxml.h" -+#include - #include "tinywxuni.h" - - #include "BrowseTrackerLayout.h" -diff --git a/src/plugins/contrib/BrowseTracker/Makefile.am b/src/plugins/contrib/BrowseTracker/Makefile.am -index eba1b90..3c598dc 100644 ---- a/src/plugins/contrib/BrowseTracker/Makefile.am -+++ b/src/plugins/contrib/BrowseTracker/Makefile.am -@@ -2,6 +2,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - pluginlibdir = $(pkglibdir)/plugins - - pluginlib_LTLIBRARIES = libBrowseTracker.la --- -1.7.7.6 - - -From bc4e15e830cb8ca69446d72c32cf4fe9d95d6b09 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Sat, 16 May 2009 12:41:03 +0200 -Subject: [PATCH 11/29] update Valgrind plugin - ---- - src/plugins/contrib/Valgrind/Makefile.am | 6 +++++- - src/plugins/contrib/Valgrind/Valgrind.cpp | 2 +- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/plugins/contrib/Valgrind/Makefile.am b/src/plugins/contrib/Valgrind/Makefile.am -index df34a62..b5a97f9 100644 ---- a/src/plugins/contrib/Valgrind/Makefile.am -+++ b/src/plugins/contrib/Valgrind/Makefile.am -@@ -4,6 +4,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - pluginlibdir = $(pkglibdir)/plugins - - pluginlib_LTLIBRARIES = libValgrind.la -@@ -21,4 +25,4 @@ noinst_HEADERS = Valgrind.h \ - valgrind_config.h - - EXTRA_DIST = $(srcdir)/*.cbp \ -- wxsmith/valgrind_config_panel.wxs -\ No newline at end of file -+ wxsmith/valgrind_config_panel.wxs -diff --git a/src/plugins/contrib/Valgrind/Valgrind.cpp b/src/plugins/contrib/Valgrind/Valgrind.cpp -index 7cbdf9b..d1ca5d5 100644 ---- a/src/plugins/contrib/Valgrind/Valgrind.cpp -+++ b/src/plugins/contrib/Valgrind/Valgrind.cpp -@@ -25,7 +25,7 @@ - #include "macrosmanager.h" - #endif - #include --#include "tinyxml/tinyxml.h" -+#include - #include "loggers.h" - #include "Valgrind.h" - #include "ValgrindListLog.h" --- -1.7.7.6 - - -From 021c7efe33b989a6180d7d6641d4a9ac7d102278 Mon Sep 17 00:00:00 2001 -From: Dan Horak -Date: Sat, 16 May 2009 12:04:35 +0200 -Subject: [PATCH 12/29] convert AutoVersioning plugin - ---- - .../contrib/AutoVersioning/AutoVersioning.cpp | 4 ++-- - src/plugins/contrib/AutoVersioning/Makefile.am | 4 ++++ - .../contrib/AutoVersioning/avSvnRevision.cpp | 2 +- - 3 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/src/plugins/contrib/AutoVersioning/AutoVersioning.cpp b/src/plugins/contrib/AutoVersioning/AutoVersioning.cpp -index 9a1b647..ac0968c 100644 ---- a/src/plugins/contrib/AutoVersioning/AutoVersioning.cpp -+++ b/src/plugins/contrib/AutoVersioning/AutoVersioning.cpp -@@ -17,9 +17,9 @@ - #include - #include - #include --#include -+#include - #endif --#include -+#include - #include - - #include "projectloader_hooks.h" -diff --git a/src/plugins/contrib/AutoVersioning/Makefile.am b/src/plugins/contrib/AutoVersioning/Makefile.am -index 36a8072..eb85fd6 100644 ---- a/src/plugins/contrib/AutoVersioning/Makefile.am -+++ b/src/plugins/contrib/AutoVersioning/Makefile.am -@@ -2,6 +2,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - pluginlibdir = $(pkglibdir)/plugins - - pluginlib_LTLIBRARIES = libAutoVersioning.la -diff --git a/src/plugins/contrib/AutoVersioning/avSvnRevision.cpp b/src/plugins/contrib/AutoVersioning/avSvnRevision.cpp -index f99bd02..522a86f 100644 ---- a/src/plugins/contrib/AutoVersioning/avSvnRevision.cpp -+++ b/src/plugins/contrib/AutoVersioning/avSvnRevision.cpp -@@ -3,7 +3,7 @@ - #include - #include - #include --#include -+#include - #include - - bool QuerySvn(const wxString& workingDir, wxString& revision, wxString& date) --- -1.7.7.6 - - -From da0bea08a92bcfa1b6a5320834959543bf01c142 Mon Sep 17 00:00:00 2001 -From: Dan Horak -Date: Sat, 16 May 2009 12:10:45 +0200 -Subject: [PATCH 13/29] convert lib_finder plugin - ---- - src/plugins/contrib/lib_finder/Makefile.am | 4 ++++ - src/plugins/contrib/lib_finder/lib_finder.h | 2 +- - .../contrib/lib_finder/librarydetectionmanager.cpp | 2 +- - .../contrib/lib_finder/projectconfiguration.h | 2 +- - 4 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/src/plugins/contrib/lib_finder/Makefile.am b/src/plugins/contrib/lib_finder/Makefile.am -index ace8531..3422f9f 100644 ---- a/src/plugins/contrib/lib_finder/Makefile.am -+++ b/src/plugins/contrib/lib_finder/Makefile.am -@@ -10,6 +10,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include/scripting/bindings \ - -I$(top_srcdir)/src/include/mozilla_chardet - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - pluginlibdir = $(pkglibdir)/plugins - - pluginlib_LTLIBRARIES = liblib_finder.la -diff --git a/src/plugins/contrib/lib_finder/lib_finder.h b/src/plugins/contrib/lib_finder/lib_finder.h -index 0b03a40..9e0aa3a 100644 ---- a/src/plugins/contrib/lib_finder/lib_finder.h -+++ b/src/plugins/contrib/lib_finder/lib_finder.h -@@ -27,7 +27,7 @@ - #include - #include - #include --#include -+#include - - #include "librarydetectionmanager.h" - #include "resultmap.h" -diff --git a/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp b/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp -index a58776f..1c6985d 100644 ---- a/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp -+++ b/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp -@@ -21,7 +21,7 @@ - * $HeadURL$ - */ - --#include -+#include - #include - - #include -diff --git a/src/plugins/contrib/lib_finder/projectconfiguration.h b/src/plugins/contrib/lib_finder/projectconfiguration.h -index e7a337b..6416f09 100644 ---- a/src/plugins/contrib/lib_finder/projectconfiguration.h -+++ b/src/plugins/contrib/lib_finder/projectconfiguration.h -@@ -27,7 +27,7 @@ - #include - #include - #include --#include -+#include - #include - - /** \brief Configuration of one project */ --- -1.7.7.6 - - -From d7027aed78a37414648a023af1bcf5add08d089c Mon Sep 17 00:00:00 2001 -From: Dan Horak -Date: Sat, 16 May 2009 12:20:55 +0200 -Subject: [PATCH 14/29] convert wxSmith plugin - ---- - src/plugins/contrib/wxSmith/Makefile.am | 4 ++++ - src/plugins/contrib/wxSmith/properties/Makefile.am | 4 ++++ - .../contrib/wxSmith/properties/wxsproperty.h | 2 +- - src/plugins/contrib/wxSmith/wxsgui.h | 2 +- - src/plugins/contrib/wxSmith/wxsmith.h | 2 +- - src/plugins/contrib/wxSmith/wxsproject.h | 2 +- - src/plugins/contrib/wxSmith/wxsversionconverter.h | 2 +- - src/plugins/contrib/wxSmith/wxwidgets/Makefile.am | 4 ++++ - src/plugins/contrib/wxSmith/wxwidgets/wxsevents.h | 2 +- - .../wxSmith/wxwidgets/wxsitemresdataobject.h | 2 +- - 10 files changed, 19 insertions(+), 7 deletions(-) - -diff --git a/src/plugins/contrib/wxSmith/Makefile.am b/src/plugins/contrib/wxSmith/Makefile.am -index 4562b2e..2227929 100644 ---- a/src/plugins/contrib/wxSmith/Makefile.am -+++ b/src/plugins/contrib/wxSmith/Makefile.am -@@ -10,6 +10,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include/scripting/bindings \ - -I$(top_srcdir)/src/include/mozilla_chardet - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - lib_LTLIBRARIES = libwxsmithlib.la - - libwxsmithlib_la_LDFLAGS = -version-info 0:1:0 -shared -diff --git a/src/plugins/contrib/wxSmith/properties/Makefile.am b/src/plugins/contrib/wxSmith/properties/Makefile.am -index 9d0a744..ade7e5a 100644 ---- a/src/plugins/contrib/wxSmith/properties/Makefile.am -+++ b/src/plugins/contrib/wxSmith/properties/Makefile.am -@@ -3,6 +3,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/sdk/wxscintilla/include \ - $(WXPROPGRID_INCLUDE) - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - noinst_LTLIBRARIES = libwxsmith_properties.la - - libwxsmith_properties_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version -diff --git a/src/plugins/contrib/wxSmith/properties/wxsproperty.h b/src/plugins/contrib/wxSmith/properties/wxsproperty.h -index 6dcd7d6..5dcb866 100644 ---- a/src/plugins/contrib/wxSmith/properties/wxsproperty.h -+++ b/src/plugins/contrib/wxSmith/properties/wxsproperty.h -@@ -34,7 +34,7 @@ - #include - #include - --#include -+#include - #include "wxspropertystream.h" - - class wxsPropertyContainer; -diff --git a/src/plugins/contrib/wxSmith/wxsgui.h b/src/plugins/contrib/wxSmith/wxsgui.h -index 7694750..48a06e3 100644 ---- a/src/plugins/contrib/wxSmith/wxsgui.h -+++ b/src/plugins/contrib/wxSmith/wxsgui.h -@@ -24,7 +24,7 @@ - #define WXSGUI_H - - #include --#include -+#include - #include "wxsguifactory.h" - #include "wxsproject.h" - -diff --git a/src/plugins/contrib/wxSmith/wxsmith.h b/src/plugins/contrib/wxSmith/wxsmith.h -index bf7e712..00efe02 100644 ---- a/src/plugins/contrib/wxSmith/wxsmith.h -+++ b/src/plugins/contrib/wxSmith/wxsmith.h -@@ -29,7 +29,7 @@ - #include - #include - #include --#include -+#include - - #include "wxsstoringsplitterwindow.h" - #include "wxsresourcetree.h" -diff --git a/src/plugins/contrib/wxSmith/wxsproject.h b/src/plugins/contrib/wxSmith/wxsproject.h -index 7809091..dde9f20 100644 ---- a/src/plugins/contrib/wxSmith/wxsproject.h -+++ b/src/plugins/contrib/wxSmith/wxsproject.h -@@ -24,7 +24,7 @@ - #define WXSPROJECT_H - - #include --#include -+#include - #include "wxsresourcetree.h" - - class wxSmith; -diff --git a/src/plugins/contrib/wxSmith/wxsversionconverter.h b/src/plugins/contrib/wxSmith/wxsversionconverter.h -index 3502492..b4b5eb2 100644 ---- a/src/plugins/contrib/wxSmith/wxsversionconverter.h -+++ b/src/plugins/contrib/wxSmith/wxsversionconverter.h -@@ -23,7 +23,7 @@ - #ifndef WXSVERSIONCONVERTER_H - #define WXSVERSIONCONVERTER_H - --#include -+#include - #include - - class wxsProject; -diff --git a/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am b/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am -index ef95776..abbc6a1 100644 ---- a/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am -+++ b/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am -@@ -9,6 +9,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include/scripting/sqplus \ - -I$(top_srcdir)/src/include/scripting/bindings - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - noinst_LTLIBRARIES = libwxsmith_wxwidgets.la - - libwxsmith_wxwidgets_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version -diff --git a/src/plugins/contrib/wxSmith/wxwidgets/wxsevents.h b/src/plugins/contrib/wxSmith/wxwidgets/wxsevents.h -index 3d0e599..80bffc0 100644 ---- a/src/plugins/contrib/wxSmith/wxwidgets/wxsevents.h -+++ b/src/plugins/contrib/wxSmith/wxwidgets/wxsevents.h -@@ -24,7 +24,7 @@ - #define WXSEVENTS_H - - #include --#include -+#include - #include - - #include "wxscodercontext.h" -diff --git a/src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdataobject.h b/src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdataobject.h -index de6c60d..7a6dee2 100644 ---- a/src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdataobject.h -+++ b/src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdataobject.h -@@ -24,7 +24,7 @@ - #define WXSITEMRESDATAOBJECT_H - - #include --#include -+#include - - #define wxsDF_WIDGET _T("wxSmith XML") - --- -1.7.7.6 - - -From 169df0b47666bba548ae29a24709c879bdbf8b50 Mon Sep 17 00:00:00 2001 -From: Dan Horak -Date: Sat, 16 May 2009 12:23:54 +0200 -Subject: [PATCH 15/29] convert cb_share_config tool - ---- - src/tools/cb_share_config/Makefile.am | 9 +++++++-- - src/tools/cb_share_config/mainframe.h | 3 +-- - 2 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/src/tools/cb_share_config/Makefile.am b/src/tools/cb_share_config/Makefile.am -index fa88563..3eb9e5c 100644 ---- a/src/tools/cb_share_config/Makefile.am -+++ b/src/tools/cb_share_config/Makefile.am -@@ -1,13 +1,18 @@ - bin_PROGRAMS = cb_share_config - - INCLUDES = $(WX_CXXFLAGS) \ -- -I$(top_srcdir)/src/include \ -- -I$(top_srcdir)/src/include/tinyxml -+ -I$(top_srcdir)/src/include - - cb_share_config_LDFLAGS = - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml - cb_share_config_LDADD = -L../../base/tinyxml -ltinyxml \ - $(WX_LIBS) -+else -+cb_share_config_LDADD = -ltinyxml $(WX_LIBS) -+endif -+ - - cb_share_config_SOURCES = app.cpp \ - mainframe.cpp -diff --git a/src/tools/cb_share_config/mainframe.h b/src/tools/cb_share_config/mainframe.h -index c49e790..b658bad 100644 ---- a/src/tools/cb_share_config/mainframe.h -+++ b/src/tools/cb_share_config/mainframe.h -@@ -20,8 +20,7 @@ - #include - #include - --#include "tinyxml/tinystr.h" --#include "tinyxml/tinyxml.h" -+#include - - class MainFrame: public wxFrame - { --- -1.7.7.6 - - -From d6747c19d76a46a712528c43fa1ee9d2f42e07a3 Mon Sep 17 00:00:00 2001 -From: Dan Horak -Date: Sat, 16 May 2009 12:26:31 +0200 -Subject: [PATCH 16/29] build local copy of tinyxml library only when no - system tinyxml library exists - ---- - src/base/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/src/base/Makefile.am b/src/base/Makefile.am -index 34e0b85..eec0652 100644 ---- a/src/base/Makefile.am -+++ b/src/base/Makefile.am -@@ -1,3 +1,5 @@ -+if ! HAVE_TINYXML - SUBDIRS = tinyxml -+endif - - EXTRA_DIST = exchndl --- -1.7.7.6 - - -From 4e2e7d930917fd5480ae816b621a3202a21350f3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Sat, 16 May 2009 13:07:12 +0200 -Subject: [PATCH 17/29] fix include dirs for the main app when system tinyxml - is not present - ---- - src/plugins/autosave/Makefile.am | 4 ++++ - src/plugins/contrib/HexEditor/Makefile.am | 4 ++++ - src/plugins/contrib/ThreadSearch/Makefile.am | 4 ++++ - src/plugins/contrib/byogames/Makefile.am | 4 ++++ - .../contrib/codesnippets/resources/Makefile.am | 4 ++++ - src/plugins/contrib/dragscroll/Makefile.am | 4 ++++ - src/plugins/contrib/headerfixup/Makefile.am | 4 ++++ - src/plugins/contrib/keybinder/Makefile.am | 4 ++++ - src/plugins/contrib/wxSmith/plugin/Makefile.am | 4 ++++ - .../contrib/wxSmith/wxwidgets/defitems/Makefile.am | 4 ++++ - .../wxSmith/wxwidgets/properties/Makefile.am | 4 ++++ - .../contrib/wxSmithContribItems/Makefile.am | 4 ++++ - src/plugins/openfileslist/Makefile.am | 4 ++++ - src/plugins/projectsimporter/Makefile.am | 3 +++ - src/plugins/scriptedwizard/Makefile.am | 4 ++++ - src/src/Makefile.am | 4 ++++ - 16 files changed, 63 insertions(+), 0 deletions(-) - -diff --git a/src/plugins/autosave/Makefile.am b/src/plugins/autosave/Makefile.am -index 2ee7459..d184342 100644 ---- a/src/plugins/autosave/Makefile.am -+++ b/src/plugins/autosave/Makefile.am -@@ -2,6 +2,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - pluginlibdir = $(pkglibdir)/plugins - - pluginlib_LTLIBRARIES = libautosave.la -diff --git a/src/plugins/contrib/HexEditor/Makefile.am b/src/plugins/contrib/HexEditor/Makefile.am -index 1d30d9b..a2e2ccc 100644 ---- a/src/plugins/contrib/HexEditor/Makefile.am -+++ b/src/plugins/contrib/HexEditor/Makefile.am -@@ -2,6 +2,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - pluginlibdir = $(pkglibdir)/plugins - - pluginlib_LTLIBRARIES = libHexEditor.la -diff --git a/src/plugins/contrib/ThreadSearch/Makefile.am b/src/plugins/contrib/ThreadSearch/Makefile.am -index d06f8ff..ea164af 100644 ---- a/src/plugins/contrib/ThreadSearch/Makefile.am -+++ b/src/plugins/contrib/ThreadSearch/Makefile.am -@@ -6,6 +6,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include/mozilla_chardet \ - -I$(srcdir)/../wxContribItems/wxthings/include - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - pluginlibdir = $(pkglibdir)/plugins - - pluginlib_LTLIBRARIES = libThreadSearch.la -diff --git a/src/plugins/contrib/byogames/Makefile.am b/src/plugins/contrib/byogames/Makefile.am -index d66aa15..e329f54 100644 ---- a/src/plugins/contrib/byogames/Makefile.am -+++ b/src/plugins/contrib/byogames/Makefile.am -@@ -2,6 +2,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - pluginlibdir = $(pkglibdir)/plugins - - pluginlib_LTLIBRARIES = libbyogames.la -diff --git a/src/plugins/contrib/codesnippets/resources/Makefile.am b/src/plugins/contrib/codesnippets/resources/Makefile.am -index c41575d..7e17e7a 100644 ---- a/src/plugins/contrib/codesnippets/resources/Makefile.am -+++ b/src/plugins/contrib/codesnippets/resources/Makefile.am -@@ -8,6 +8,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/plugins/contrib/codesnippets/editor \ - -I$(top_srcdir)/src/include/mozilla_chardet - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - pluginlibdir = $(pkglibdir)/plugins - - ##pluginlib_LTLIBRARIES = codesnippets -diff --git a/src/plugins/contrib/dragscroll/Makefile.am b/src/plugins/contrib/dragscroll/Makefile.am -index a6520fb..c4aa031 100644 ---- a/src/plugins/contrib/dragscroll/Makefile.am -+++ b/src/plugins/contrib/dragscroll/Makefile.am -@@ -3,6 +3,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/src \ - -I$(top_srcdir)/src/sdk/wxscintilla/include - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - pluginlibdir = $(pkglibdir)/plugins - - pluginlib_LTLIBRARIES = libdragscroll.la -diff --git a/src/plugins/contrib/headerfixup/Makefile.am b/src/plugins/contrib/headerfixup/Makefile.am -index a4e9aab..c56abc2 100644 ---- a/src/plugins/contrib/headerfixup/Makefile.am -+++ b/src/plugins/contrib/headerfixup/Makefile.am -@@ -2,6 +2,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - CXXFLAGS = @CXXFLAGS@ -O0 - - pluginlibdir = $(pkglibdir)/plugins -diff --git a/src/plugins/contrib/keybinder/Makefile.am b/src/plugins/contrib/keybinder/Makefile.am -index d9116af..5da5553 100644 ---- a/src/plugins/contrib/keybinder/Makefile.am -+++ b/src/plugins/contrib/keybinder/Makefile.am -@@ -2,6 +2,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - pluginlibdir = $(pkglibdir)/plugins - - pluginlib_LTLIBRARIES = libkeybinder.la -diff --git a/src/plugins/contrib/wxSmith/plugin/Makefile.am b/src/plugins/contrib/wxSmith/plugin/Makefile.am -index 72ea186..21c7121 100644 ---- a/src/plugins/contrib/wxSmith/plugin/Makefile.am -+++ b/src/plugins/contrib/wxSmith/plugin/Makefile.am -@@ -3,6 +3,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/sdk/wxscintilla/include \ - $(WXPROPGRID_INCLUDE) - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - pluginlib_LTLIBRARIES = libwxsmith.la - - pluginlibdir = $(pkglibdir)/plugins -diff --git a/src/plugins/contrib/wxSmith/wxwidgets/defitems/Makefile.am b/src/plugins/contrib/wxSmith/wxwidgets/defitems/Makefile.am -index 5577946..4413537 100644 ---- a/src/plugins/contrib/wxSmith/wxwidgets/defitems/Makefile.am -+++ b/src/plugins/contrib/wxSmith/wxwidgets/defitems/Makefile.am -@@ -3,6 +3,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/sdk/wxscintilla/include \ - $(WXPROPGRID_INCLUDE) - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - noinst_LTLIBRARIES = libwxsmith_wxwidgets_defitems.la - - libwxsmith_wxwidgets_defitems_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version -diff --git a/src/plugins/contrib/wxSmith/wxwidgets/properties/Makefile.am b/src/plugins/contrib/wxSmith/wxwidgets/properties/Makefile.am -index 1e0a57f..f3c3f43 100644 ---- a/src/plugins/contrib/wxSmith/wxwidgets/properties/Makefile.am -+++ b/src/plugins/contrib/wxSmith/wxwidgets/properties/Makefile.am -@@ -3,6 +3,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/sdk/wxscintilla/include \ - $(WXPROPGRID_INCLUDE) - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - noinst_LTLIBRARIES = libwxsmith_wxwidgets_properties.la - - libwxsmith_wxwidgets_properties_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version -diff --git a/src/plugins/contrib/wxSmithContribItems/Makefile.am b/src/plugins/contrib/wxSmithContribItems/Makefile.am -index 9d83bff..5f5e8f6 100644 ---- a/src/plugins/contrib/wxSmithContribItems/Makefile.am -+++ b/src/plugins/contrib/wxSmithContribItems/Makefile.am -@@ -19,6 +19,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(srcdir)/../wxContribItems/wxled/ledpanel/include - - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - pluginlibdir = $(pkglibdir)/plugins - - pluginlib_LTLIBRARIES = libwxsmithcontribitems.la -diff --git a/src/plugins/openfileslist/Makefile.am b/src/plugins/openfileslist/Makefile.am -index 1b9f299..f9a737a 100644 ---- a/src/plugins/openfileslist/Makefile.am -+++ b/src/plugins/openfileslist/Makefile.am -@@ -2,6 +2,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - pluginlibdir = $(pkglibdir)/plugins - - pluginlib_LTLIBRARIES = libopenfileslist.la -diff --git a/src/plugins/projectsimporter/Makefile.am b/src/plugins/projectsimporter/Makefile.am -index 7fec77e..ac4c8b1 100644 ---- a/src/plugins/projectsimporter/Makefile.am -+++ b/src/plugins/projectsimporter/Makefile.am -@@ -5,6 +5,9 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/sdk/wxscintilla/include \ - -I$(top_srcdir)/src/include/mozilla_chardet - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif - - pluginlibdir = $(pkglibdir)/plugins - -diff --git a/src/plugins/scriptedwizard/Makefile.am b/src/plugins/scriptedwizard/Makefile.am -index eabbcd9..5ef7f7a 100644 ---- a/src/plugins/scriptedwizard/Makefile.am -+++ b/src/plugins/scriptedwizard/Makefile.am -@@ -6,6 +6,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include/scripting/include \ - -I$(top_srcdir)/src/include/scripting/sqplus - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - pluginlibdir = $(pkglibdir)/plugins - - pluginlib_LTLIBRARIES = libscriptedwizard.la -diff --git a/src/src/Makefile.am b/src/src/Makefile.am -index c994de6..f1f79fb 100644 ---- a/src/src/Makefile.am -+++ b/src/src/Makefile.am -@@ -8,6 +8,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include/scripting/sqplus \ - -I$(top_srcdir)/src/include/mozilla_chardet - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - if GTK_NOTEBOOK - GTK_NOTEBOOK_FLAGS = -DUSE_GTK_NOTEBOOK - endif --- -1.7.7.6 - - -From c3061d6056e632f62bfe204b592d230ea44474c7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Tue, 18 Aug 2009 13:21:38 +0200 -Subject: [PATCH 18/29] use/install local timyxml headers only when a - system-wide instance doesn't exist - ---- - src/include/Makefile.am | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/include/Makefile.am b/src/include/Makefile.am -index d510a22..4783386 100644 ---- a/src/include/Makefile.am -+++ b/src/include/Makefile.am -@@ -1,4 +1,4 @@ --SUBDIRS = scripting tinyxml -+SUBDIRS = scripting - - if PRECOMPILE_HEADERS - BUILT_SOURCES = $(top_builddir)/src/include/sdk.h.gch \ -@@ -10,11 +10,15 @@ endif - INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include \ -- -I$(top_srcdir)/src/include/tinyxml \ - -I$(top_srcdir)/src/include/scripting/include \ - -I$(top_srcdir)/src/include/scripting/sqplus \ - -I$(top_srcdir)/src/include/mozilla_chardet - -+if ! HAVE_TINYXML -+SUBDIRS += tinyxml -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - # Because we are not generating any programs/libraries with this makefile, - # $(CXXCOMPILE) is empty. - # Create the basic one here: --- -1.7.7.6 - - -From 8f9b98e9d5560f821a4df1f484c614c006a22770 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Tue, 18 Aug 2009 13:56:15 +0200 -Subject: [PATCH 19/29] fix linking with tinyxml in the codesnippets plugin - ---- - .../contrib/codesnippets/resources/Makefile.am | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/src/plugins/contrib/codesnippets/resources/Makefile.am b/src/plugins/contrib/codesnippets/resources/Makefile.am -index 7e17e7a..8a56df5 100644 ---- a/src/plugins/contrib/codesnippets/resources/Makefile.am -+++ b/src/plugins/contrib/codesnippets/resources/Makefile.am -@@ -8,10 +8,6 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/plugins/contrib/codesnippets/editor \ - -I$(top_srcdir)/src/include/mozilla_chardet - --if ! HAVE_TINYXML --INCLUDES += -I$(top_srcdir)/src/include/tinyxml --endif -- - pluginlibdir = $(pkglibdir)/plugins - - ##pluginlib_LTLIBRARIES = codesnippets -@@ -19,10 +15,15 @@ bin_PROGRAMS = codesnippets - - ##codesnippets_LIBADD = $(PLUGIN_WX_LIBS) ../../../../sdk/libcodeblocks.la - ##codesnippets_LDADD = $(PLUGIN_WX_LIBS) ../../../../sdk/libcodeblocks.la --codesnippets_LDADD = -L../../../../base/tinyxml -ltinyxml \ -+codesnippets_LDADD = -ltinyxml \ - -L../../../../sdk ../../../../sdk/libcodeblocks.la \ - $(PLUGIN_WX_LIBS) $(WX_LIBS) $(WX_GTK2_LIBS) $(WX_X11_LIBS) - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+codesnippets_LDADD += -L../../../../base/tinyxml -+endif -+ - codesnippets_SOURCES = $(srcdir)/../version.cpp \ - $(srcdir)/../Search/DirectoryParamsPanel.cpp \ - $(srcdir)/../Search/InsertIndexManager.cpp \ --- -1.7.7.6 - - -From 2aaee5d5761e9ca44ab843d51567bdfb85368da2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Mon, 15 Feb 2010 21:34:45 +0100 -Subject: [PATCH 20/29] fix tinyxml includes in the help plugin - ---- - src/plugins/contrib/help_plugin/Makefile.am | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/src/plugins/contrib/help_plugin/Makefile.am b/src/plugins/contrib/help_plugin/Makefile.am -index f38d145..1fbb566 100644 ---- a/src/plugins/contrib/help_plugin/Makefile.am -+++ b/src/plugins/contrib/help_plugin/Makefile.am -@@ -36,6 +36,10 @@ else - libhelp_plugin_la_LIBADD += -lz - endif - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - libhelp_plugin_la_SOURCES = help_common.cpp \ - HelpConfigDialog.cpp \ - help_plugin.cpp \ --- -1.7.7.6 - - -From d1cfe63e71a448a77d12f912cc85c498e0756220 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Mon, 15 Feb 2010 21:37:48 +0100 -Subject: [PATCH 21/29] fix tinyxml includes in the wxSmithAui plugin - ---- - src/plugins/contrib/wxSmithAui/Makefile.am | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/src/plugins/contrib/wxSmithAui/Makefile.am b/src/plugins/contrib/wxSmithAui/Makefile.am -index 74b08d7..b96a33e 100644 ---- a/src/plugins/contrib/wxSmithAui/Makefile.am -+++ b/src/plugins/contrib/wxSmithAui/Makefile.am -@@ -7,6 +7,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(srcdir)/wxAuiNotebook \ - -I$(srcdir)/wxAuiToolBar - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - pluginlibdir = $(pkglibdir)/plugins - - pluginlib_LTLIBRARIES = libwxSmithAui.la --- -1.7.7.6 - - -From 869a363727d997dcd07af0e64ad7e31a33d9b3bd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Mon, 15 Feb 2010 21:39:14 +0100 -Subject: [PATCH 22/29] fix tinyxml includes in the MouseSap plugin - ---- - src/plugins/contrib/MouseSap/Makefile.am | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/src/plugins/contrib/MouseSap/Makefile.am b/src/plugins/contrib/MouseSap/Makefile.am -index 2c38f84..b185834 100644 ---- a/src/plugins/contrib/MouseSap/Makefile.am -+++ b/src/plugins/contrib/MouseSap/Makefile.am -@@ -3,6 +3,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - pluginlibdir = $(pkglibdir)/plugins - - pluginlib_LTLIBRARIES = libMouseSap.la --- -1.7.7.6 - - -From d8d0a239a9b7d50aee1b7cc0434866b3c58126cc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Tue, 24 Aug 2010 08:55:17 +0200 -Subject: [PATCH 23/29] fix tinyxml includes in the DoxyBlocks plugin - ---- - src/plugins/contrib/DoxyBlocks/DoxyBlocks.cpp | 2 +- - src/plugins/contrib/DoxyBlocks/Makefile.am | 4 ++++ - 2 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/src/plugins/contrib/DoxyBlocks/DoxyBlocks.cpp b/src/plugins/contrib/DoxyBlocks/DoxyBlocks.cpp -index 4a31439..cb6b1b7 100644 ---- a/src/plugins/contrib/DoxyBlocks/DoxyBlocks.cpp -+++ b/src/plugins/contrib/DoxyBlocks/DoxyBlocks.cpp -@@ -40,7 +40,7 @@ - #include - #include - #include --#include -+#include - - #include - #include -diff --git a/src/plugins/contrib/DoxyBlocks/Makefile.am b/src/plugins/contrib/DoxyBlocks/Makefile.am -index f6f024b..f49c82d 100644 ---- a/src/plugins/contrib/DoxyBlocks/Makefile.am -+++ b/src/plugins/contrib/DoxyBlocks/Makefile.am -@@ -4,6 +4,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - pluginlibdir = $(pkglibdir)/plugins - - pluginlib_LTLIBRARIES = libDoxyBlocks.la --- -1.7.7.6 - - -From 1b9953ae90c7301d0af17b1d1b1eae43d4d51886 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Tue, 24 Aug 2010 09:55:32 +0200 -Subject: [PATCH 24/29] fix tinyxml includes in the NassiShneiderman plugin - ---- - src/plugins/contrib/NassiShneiderman/Makefile.am | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/src/plugins/contrib/NassiShneiderman/Makefile.am b/src/plugins/contrib/NassiShneiderman/Makefile.am -index afa6395..49ebdc4 100644 ---- a/src/plugins/contrib/NassiShneiderman/Makefile.am -+++ b/src/plugins/contrib/NassiShneiderman/Makefile.am -@@ -2,6 +2,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - pluginlibdir = $(pkglibdir)/plugins - - pluginlib_LTLIBRARIES = libNassiShneiderman.la --- -1.7.7.6 - - -From 166eaa8fce9dafdd3c7c7417d46a1c819339759c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Sun, 23 Jan 2011 09:38:55 +0100 -Subject: [PATCH 25/29] fix tinyxml includes in the ReopenEditor plugin - ---- - src/plugins/contrib/ReopenEditor/Makefile.am | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/src/plugins/contrib/ReopenEditor/Makefile.am b/src/plugins/contrib/ReopenEditor/Makefile.am -index 665dafa..dd80fc1 100644 ---- a/src/plugins/contrib/ReopenEditor/Makefile.am -+++ b/src/plugins/contrib/ReopenEditor/Makefile.am -@@ -2,6 +2,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - pluginlibdir = $(pkglibdir)/plugins - - pluginlib_LTLIBRARIES = libReopenEditor.la --- -1.7.7.6 - - -From 7524c119824604c96486e3ac24d6a63036da4809 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Sat, 14 Jan 2012 23:50:27 +0100 -Subject: [PATCH 26/29] fix tinyxml includes in the DoxyBlock plugin - ---- - src/plugins/contrib/DoxyBlocks/ConfigPanel.cpp | 2 +- - src/plugins/contrib/DoxyBlocks/DoxyBlocks.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/plugins/contrib/DoxyBlocks/ConfigPanel.cpp b/src/plugins/contrib/DoxyBlocks/ConfigPanel.cpp -index 3a62a02..79499a5 100644 ---- a/src/plugins/contrib/DoxyBlocks/ConfigPanel.cpp -+++ b/src/plugins/contrib/DoxyBlocks/ConfigPanel.cpp -@@ -33,7 +33,7 @@ - #include - #include - #include --#include -+#include - - #include "version.h" - -diff --git a/src/plugins/contrib/DoxyBlocks/DoxyBlocks.h b/src/plugins/contrib/DoxyBlocks/DoxyBlocks.h -index b827fe9..917d54a 100644 ---- a/src/plugins/contrib/DoxyBlocks/DoxyBlocks.h -+++ b/src/plugins/contrib/DoxyBlocks/DoxyBlocks.h -@@ -25,7 +25,7 @@ - - #include - #include --#include -+#include - - #include "Config.h" - --- -1.7.7.6 - - -From d8770eb881cdf8743ec42101fc9d7274c4cb23f7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Sat, 14 Jan 2012 23:51:39 +0100 -Subject: [PATCH 27/29] fix tinyxml includes in the CppCheck plugin - ---- - src/plugins/contrib/CppCheck/CppCheck.cpp | 2 +- - src/plugins/contrib/CppCheck/Makefile.am | 4 ++++ - 2 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/src/plugins/contrib/CppCheck/CppCheck.cpp b/src/plugins/contrib/CppCheck/CppCheck.cpp -index 19445fa..953d395 100644 ---- a/src/plugins/contrib/CppCheck/CppCheck.cpp -+++ b/src/plugins/contrib/CppCheck/CppCheck.cpp -@@ -32,7 +32,7 @@ - #include - #include - --#include "tinyxml/tinyxml.h" -+#include - #include "filefilters.h" - #include "loggers.h" - -diff --git a/src/plugins/contrib/CppCheck/Makefile.am b/src/plugins/contrib/CppCheck/Makefile.am -index 7ffdea8..c5dce20 100644 ---- a/src/plugins/contrib/CppCheck/Makefile.am -+++ b/src/plugins/contrib/CppCheck/Makefile.am -@@ -4,6 +4,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - pluginlibdir = $(pkglibdir)/plugins - - pluginlib_LTLIBRARIES = libCppCheck.la --- -1.7.7.6 - - -From a7b7a8014abfeb65405dfb552415d3fe464eae76 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Sat, 16 May 2009 13:07:12 +0200 -Subject: [PATCH 28/29] fix include dirs for the main app when system tinyxml - is not present - ---- - .../contrib/codesnippets/resources/Makefile.am | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/src/plugins/contrib/codesnippets/resources/Makefile.am b/src/plugins/contrib/codesnippets/resources/Makefile.am -index 8a56df5..e345e70 100644 ---- a/src/plugins/contrib/codesnippets/resources/Makefile.am -+++ b/src/plugins/contrib/codesnippets/resources/Makefile.am -@@ -8,6 +8,10 @@ INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/plugins/contrib/codesnippets/editor \ - -I$(top_srcdir)/src/include/mozilla_chardet - -+if ! HAVE_TINYXML -+INCLUDES += -I$(top_srcdir)/src/include/tinyxml -+endif -+ - pluginlibdir = $(pkglibdir)/plugins - - ##pluginlib_LTLIBRARIES = codesnippets --- -1.7.7.6 - - -From d0536beca6aa526e79a24559bcc0eebfd584732f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Sun, 2 Sep 2012 15:34:58 +0200 -Subject: [PATCH 29/29] fix tinyxml includes in projectimporter plugin - ---- - src/plugins/projectsimporter/msvc10loader.cpp | 2 +- - src/plugins/projectsimporter/msvc7loader.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/plugins/projectsimporter/msvc10loader.cpp b/src/plugins/projectsimporter/msvc10loader.cpp -index e6c6856..f071c43 100644 ---- a/src/plugins/projectsimporter/msvc10loader.cpp -+++ b/src/plugins/projectsimporter/msvc10loader.cpp -@@ -23,7 +23,7 @@ - - #include - --#include -+#include - - #include "prep.h" - #include "msvc10loader.h" -diff --git a/src/plugins/projectsimporter/msvc7loader.cpp b/src/plugins/projectsimporter/msvc7loader.cpp -index 06e1624..1aead20 100644 ---- a/src/plugins/projectsimporter/msvc7loader.cpp -+++ b/src/plugins/projectsimporter/msvc7loader.cpp -@@ -23,7 +23,7 @@ - - #include - --#include -+#include - - #include "prep.h" - #include "msvc7loader.h" --- -1.7.7.6 - diff --git a/codeblocks.spec b/codeblocks.spec index c273b7f..9ea2ff5 100644 --- a/codeblocks.spec +++ b/codeblocks.spec @@ -1,13 +1,13 @@ -#define svndate 20121021 -%define svnrev 8629 +#define svndate 20131225 +%define svnrev 9501 %define snapshot 0%{?svndate} %if %{snapshot} %define svnrelease .%{svndate}svn%{svnrev} %endif Name: codeblocks -Version: 12.11 -Release: 2%{?svnrelease}%{?dist} +Version: 13.12 +Release: 1%{?svnrelease}%{?dist} Summary: An open source, cross platform, free C++ IDE Group: Development/Tools License: GPLv3+ @@ -41,10 +41,8 @@ BuildRequires: desktop-file-utils Requires: %{name}-libs = %{version}-%{release} Requires: shared-mime-info Requires: xterm -# use system tinyxml library -Patch10: codeblocks-tinyxml.patch -# use system squirrel library -Patch11: codeblocks-squirrel.patch +# use system tinyxml and squirrel libraries +Patch10: codeblocks-13.12-unbundle.patch # wxTreeItemId needs to be initialized with long int Patch13: codeblocks-wxtreeitemid.patch @@ -120,10 +118,9 @@ Additional Code::Blocks plug-ins. %setup -q -n %{name} %patch0 -p1 %else -%setup -q -n %{name}-%{version}release%{svnrev} +%setup -q %endif %patch10 -p1 -%patch11 -p1 %patch13 -p1 %if %{snapshot} @@ -134,8 +131,6 @@ echo "m4_define([SVN_DATE], %{svndate})" >> revision.m4 ./bootstrap %else -# fix version inside the configure script -sed -i 's/%{version}release%{svnrev}/%{version}/g' revision.m4 autoreconf -f -i %endif @@ -268,6 +263,8 @@ update-mime-database /usr/share/mime &> /dev/null || : %{pkgdatadir}/start_here.zip %{pkgdatadir}/todo.zip %{pkgdatadir}/tips.txt +%dir %{pkgdatadir}/compilers +%{pkgdatadir}/compilers/*.xml %files libs %doc COPYING @@ -342,6 +339,7 @@ update-mime-database /usr/share/mime &> /dev/null || : %{pkgdatadir}/SpellChecker %endif %{pkgdatadir}/SmartIndent*.zip +%{pkgdatadir}/occurrenceshighlighting.zip %{plugindir}/libAutoVersioning.so %{plugindir}/libBrowseTracker.so @@ -383,9 +381,13 @@ update-mime-database /usr/share/mime &> /dev/null || : %{plugindir}/libSpellChecker.so %endif %{plugindir}/libSmartIndent*.so +%{plugindir}/liboccurrenceshighlighting.so %changelog +* Sun Dec 29 2013 Dan Horák - 13.12-1 +- update to final 13.12 release (svn revision 9501) + * Mon Nov 04 2013 Dan Horák - 12.11-2 - fix Requires diff --git a/sources b/sources index 8e9d29e..4c3bd64 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4fa8980a8c578b8b5589fceb9b0890d6 codeblocks_12.11-1.tar.gz +4b450f620d9f1875ecf6882ab3c11402 codeblocks_13.12-1.tar.gz