From e692a0a734171bb48a3edae053c63f6a1f06e74a Mon Sep 17 00:00:00 2001
From: Jens Lody <jens@codeblocks.org>
Date: Wed, 27 Jul 2016 02:05:13 +0200
Subject: Use system-provided astyle, squirrel and tinyxml (needed for
unbundling).
diff --git a/codeblocks.spec.in b/codeblocks.spec.in
index 7443ded..ef553df 100644
--- a/codeblocks.spec.in
+++ b/codeblocks.spec.in
@@ -277,7 +277,7 @@ wxSmith-plugins and to use the wxContribItems in own programs.
%{_bindir}/cb_console_runner
%{_bindir}/cb_share_config
%{plugindir}/libabbreviations.so
-%{plugindir}/libastyle.so
+%{plugindir}/libAstyle.so
%{plugindir}/libautosave.so
%{plugindir}/libclasswizard.so
%{plugindir}/libcodecompletion.so
@@ -306,7 +306,7 @@ wxSmith-plugins and to use the wxContribItems in own programs.
%{pkgdatadir}/scripts/*
%{pkgdatadir}/templates/*
%{pkgdatadir}/abbreviations.zip
-%{pkgdatadir}/astyle.zip
+%{pkgdatadir}/Astyle.zip
%{pkgdatadir}/autosave.zip
%{pkgdatadir}/classwizard.zip
%{pkgdatadir}/codecompletion.zip
diff --git a/configure.ac b/configure.ac
index 37cafae..7f80a3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,8 +71,33 @@ 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(astyle.h, [HAVE_ASTYLE=yes], [HAVE_ASTYLE=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_ASTYLE], [test "$HAVE_ASTYLE" = yes])
+
+AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes, no)
+
+ifdef([PKG_CHECK_MODULES],[],[
+ define([PKG_CHECK_MODULES],
+ [ echo "You don't have pkg.m4 properly installed" >&2
+ exit 1
+ ])
+])
+
+PKG_PROG_PKG_CONFIG
+PKG_CHECK_MODULES([SQUIRREL], [squirrel], [HAVE_SQUIRREL=yes], [HAVE_SQUIRREL=no])
+AM_CONDITIONAL([HAVE_SQUIRREL], [test "$HAVE_SQUIRREL" = yes])
+
+PKG_CHECK_MODULES([TINYXML], [tinyxml], [HAVE_TINYXML=yes], [HAVE_TINYXML=no])
+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
@@ -151,22 +176,6 @@ case $WX_BASENAME in
"x$GTK_NOTEBOOK_TRUE" = "x" -o \
"x$LINUX_TRUE" = "x" ; then
- AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes, no)
-
- ifdef([PKG_CHECK_MODULES],[],[
- define([PKG_CHECK_MODULES],
- [ echo "You don't have pkg.m4 properly installed" >&2
- exit 1
- ])
- ])
-
- dnl acoording to pkg-config's manpage this call is absolutely needed:
- dnl
- dnl "Note that if there is a possibility the first call to
- dnl PKG_CHECK_MODULES might not happen, you should be sure
- dnl to include an explicit call to PKG_PROG_PKG_CONFIG"
- PKG_PROG_PKG_CONFIG
-
if test "x$LINUX_TRUE" = "x" ; then
if test "x$HAVE_PKG_CONFIG" = "xyes"; then
PKG_CHECK_MODULES([GLIB2], [glib-2.0])
@@ -291,7 +300,26 @@ else
fi
fi
+if test "x$HAVE_SQUIRREL_TRUE" = "x" ; then
+ CB_SQUIRREL_CFLAGS="$SQUIRREL_CFLAGS"
+ CB_SQUIRREL_LIBS="$SQUIRREL_LIBS"
+else
+ CB_SQUIRREL_CFLAGS="-I\$(top_srcdir)/src/include/scripting/include"
+ CB_SQUIRREL_LIBS="\$(top_builddir)/src/sdk/scripting/squirrel/libsquirrel.la \$(top_builddir)/src/sdk/scripting/sqstdlib/libsqstdlib.la"
+fi
+
+if test "x$HAVE_TINYXML_TRUE" = "x" ; then
+ CB_TINYXML_CFLAGS="$TINYXML_CFLAGS"
+ CB_TINYXML_LIBS="$TINYXML_LIBS"
+else
+ CB_TINYXML_CFLAGS="-I\$(top_srcdir)/src/include/tinyxml -DTIXML_USE_STL=YES"
+ CB_TINYXML_LIBS="\$(top_builddir)/src/base/tinyxml/libtinyxml.la"
+fi
+AC_SUBST(CB_SQUIRREL_CFLAGS)
+AC_SUBST(CB_SQUIRREL_LIBS)
+AC_SUBST(CB_TINYXML_CFLAGS)
+AC_SUBST(CB_TINYXML_LIBS)
AC_SUBST(WX_GTK2_CFLAGS)
AC_SUBST(WX_GTK2_LIBS)
AC_SUBST(CB_GLIB2_CFLAGS)
@@ -329,7 +357,8 @@ case `uname` in
esac
AC_MSG_RESULT($PIC_FLAGS)
-CPPFLAGS="$CPPFLAGS -ansi -DTIXML_USE_STL"
+CFLAGS="$CFLAGS -std=c90"
+CPPFLAGS="$CPPFLAGS $CB_TINYXML_CFLAGS"
CXXFLAGS="$CXXFLAGS $PCH_FLAGS $PIC_FLAGS -fexceptions"
AC_SUBST(codeblocks_PCH_FLAGS, "$PCH_FLAGS")
diff --git a/src/CodeBlocks-unix.cbp b/src/CodeBlocks-unix.cbp
index 86da78f..19c1388 100644
--- a/src/CodeBlocks-unix.cbp
+++ b/src/CodeBlocks-unix.cbp
@@ -496,7 +496,7 @@
<Unit filename="base/tinyxml/tinystr.cpp">
<Option target="tinyXML" />
</Unit>
- <Unit filename="base/tinyxml/tinywxuni.cpp">
+ <Unit filename="sdk/tinywxuni.cpp">
<Option target="sdk" />
</Unit>
<Unit filename="base/tinyxml/tinyxml.cpp">
@@ -1049,7 +1049,7 @@
<Unit filename="include/tinyxml/tinystr.h">
<Option target="tinyXML" />
</Unit>
- <Unit filename="include/tinyxml/tinywxuni.h">
+ <Unit filename="include/tinywxuni.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/tinyxml/tinyxml.h">
diff --git a/src/CodeBlocks.cbp b/src/CodeBlocks.cbp
index 6b8b55a..c7a991e 100644
--- a/src/CodeBlocks.cbp
+++ b/src/CodeBlocks.cbp
@@ -744,7 +744,7 @@
<Unit filename="base/tinyxml/tinystr.cpp">
<Option target="tinyXML" />
</Unit>
- <Unit filename="base/tinyxml/tinywxuni.cpp">
+ <Unit filename="sdk/tinywxuni.cpp">
<Option target="sdk" />
</Unit>
<Unit filename="base/tinyxml/tinyxml.cpp">
@@ -1297,7 +1297,7 @@
<Unit filename="include/tinyxml/tinystr.h">
<Option target="tinyXML" />
</Unit>
- <Unit filename="include/tinyxml/tinywxuni.h">
+ <Unit filename="include/tinywxuni.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/tinyxml/tinyxml.h">
diff --git a/src/CodeBlocks_wx30-unix.cbp b/src/CodeBlocks_wx30-unix.cbp
index 4d1f749..752b072 100644
--- a/src/CodeBlocks_wx30-unix.cbp
+++ b/src/CodeBlocks_wx30-unix.cbp
@@ -539,7 +539,7 @@
<Unit filename="base/tinyxml/tinystr.cpp">
<Option target="tinyXML" />
</Unit>
- <Unit filename="base/tinyxml/tinywxuni.cpp">
+ <Unit filename="sdk/tinywxuni.cpp">
<Option target="sdk" />
</Unit>
<Unit filename="base/tinyxml/tinyxml.cpp">
@@ -1092,7 +1092,7 @@
<Unit filename="include/tinyxml/tinystr.h">
<Option target="tinyXML" />
</Unit>
- <Unit filename="include/tinyxml/tinywxuni.h">
+ <Unit filename="include/tinywxuni.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/tinyxml/tinyxml.h">
diff --git a/src/CodeBlocks_wx30.cbp b/src/CodeBlocks_wx30.cbp
index 3f63122..107c053 100644
--- a/src/CodeBlocks_wx30.cbp
+++ b/src/CodeBlocks_wx30.cbp
@@ -739,7 +739,7 @@
<Unit filename="base/tinyxml/tinystr.cpp">
<Option target="tinyXML" />
</Unit>
- <Unit filename="base/tinyxml/tinywxuni.cpp">
+ <Unit filename="sdk/tinywxuni.cpp">
<Option target="sdk" />
</Unit>
<Unit filename="base/tinyxml/tinyxml.cpp">
@@ -1290,7 +1290,7 @@
<Unit filename="include/tinyxml/tinystr.h">
<Option target="tinyXML" />
</Unit>
- <Unit filename="include/tinyxml/tinywxuni.h">
+ <Unit filename="include/tinywxuni.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/tinyxml/tinyxml.h">
diff --git a/src/CodeBlocks_wx30_64.cbp b/src/CodeBlocks_wx30_64.cbp
index afea144..8081a00 100644
--- a/src/CodeBlocks_wx30_64.cbp
+++ b/src/CodeBlocks_wx30_64.cbp
@@ -742,7 +742,7 @@
<Unit filename="base/tinyxml/tinystr.cpp">
<Option target="tinyXML" />
</Unit>
- <Unit filename="base/tinyxml/tinywxuni.cpp">
+ <Unit filename="sdk/tinywxuni.cpp">
<Option target="sdk" />
</Unit>
<Unit filename="base/tinyxml/tinyxml.cpp">
@@ -1293,7 +1293,7 @@
<Unit filename="include/tinyxml/tinystr.h">
<Option target="tinyXML" />
</Unit>
- <Unit filename="include/tinyxml/tinywxuni.h">
+ <Unit filename="include/tinywxuni.h">
<Option target="sdk" />
</Unit>
<Unit filename="include/tinyxml/tinyxml.h">
diff --git a/src/base/Makefile.am b/src/base/Makefile.am
index 62a6da1..ee01379 100644
--- a/src/base/Makefile.am
+++ b/src/base/Makefile.am
@@ -1 +1,4 @@
+if ! HAVE_TINYXML
SUBDIRS = tinyxml
+endif
+DIST_SUBDIRS = tinyxml
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 <wx/file.h>
- #include <wx/string.h>
- #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/build_tools/autorevision/Makefile.am b/src/build_tools/autorevision/Makefile.am
index dfb38a9..e7046fe 100644
--- a/src/build_tools/autorevision/Makefile.am
+++ b/src/build_tools/autorevision/Makefile.am
@@ -3,9 +3,8 @@ auto_revision_SOURCES = autorevision.cpp
AM_CPPFLAGS = -I$(top_srcdir)/src/include
-auto_revision_LDADD = ../../base/tinyxml/libtinyxml.la
-auto_revision_CXXFLAGS=-DTIXML_USE_STL
+auto_revision_LDADD = $(CB_TINYXML_LIBS)
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 0b24935..b3d41a1 100644
--- a/src/build_tools/autorevision/autorevision.cpp
+++ b/src/build_tools/autorevision/autorevision.cpp
@@ -11,8 +11,7 @@
#include <string>
#include <fstream>
-#include "tinyxml/tinystr.h"
-#include "tinyxml/tinyxml.h"
+#include <tinyxml.h>
using namespace std;
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index a490236..229a127 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -1,4 +1,8 @@
-SUBDIRS = scripting tinyxml
+SUBDIRS = scripting
+if ! HAVE_TINYXML
+SUBDIRS += tinyxml
+endif
+DIST_SUBDIRS = scripting tinyxml
if PRECOMPILE_HEADERS
BUILT_SOURCES = sdk.h.gch \
@@ -11,8 +15,6 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \
-I$(top_builddir)/src/include \
-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 \
-I$(top_srcdir)/src/include/mozilla_chardet/mfbt \
@@ -127,6 +129,7 @@ ALLHEADERS = annoyingdialog.h \
selecttargetdlg.h \
settings.h \
templatemanager.h \
+ tinywxuni.h \
toolsmanager.h \
uservarmanager.h \
workspaceloader.h \
diff --git a/src/include/configmanager.h b/src/include/configmanager.h
index 55d5219..4dd2512 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 <tinyxml.h>
#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 <tinyxml.h>
#include "settings.h"
struct FileSetFile
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/scripting/Makefile.am b/src/include/scripting/Makefile.am
index 39ea807..f987b87 100644
--- a/src/include/scripting/Makefile.am
+++ b/src/include/scripting/Makefile.am
@@ -1 +1,5 @@
-SUBDIRS = squirrel sqstdlib sqplus bindings include
+SUBDIRS = sqplus bindings
+DIST_SUBDIRS = squirrel sqstdlib sqplus bindings include
+if ! HAVE_SQUIRREL
+SUBDIRS += squirrel sqstdlib include
+endif
diff --git a/src/include/scripting/sqplus/sqplus.h b/src/include/scripting/sqplus/sqplus.h
index 609a515..00998cd 100644
--- a/src/include/scripting/sqplus/sqplus.h
+++ b/src/include/scripting/sqplus/sqplus.h
@@ -47,8 +47,15 @@
#define SQ_CALL_RAISE_ERROR SQFalse
#endif
-#include "squirrel.h"
-
+// this does the same as commenting out the "#ifdef _UNICODE"-stuff in our
+// bundled squirrel.h, but works also for system-squirrel
+#ifdef _UNICODE
+ #undef _UNICODE
+ #include "squirrel.h"
+ #define _UNICODE
+#else
+ #include "squirrel.h"
+#endif // _UNICODE
// C::B patch: so it builds on 64bit, ecapsulate bool/int/float using Squirrel types (this patch applies everywhere, where threse types are used)
typedef SQInteger BOOL_T;
typedef SQInteger INT_T;
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/abbreviations/Makefile.am b/src/plugins/abbreviations/Makefile.am
index 09d408e..64a45b1 100644
--- a/src/plugins/abbreviations/Makefile.am
+++ b/src/plugins/abbreviations/Makefile.am
@@ -1,13 +1,12 @@
SUBDIRS = resources
AM_CPPFLAGS = $(WX_CXXFLAGS) \
+ $(CB_SQUIRREL_CFLAGS) \
-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
-
pluginlibdir = $(pkglibdir)/plugins
pluginlib_LTLIBRARIES = libabbreviations.la
diff --git a/src/plugins/astyle/Makefile.am b/src/plugins/astyle/Makefile.am
index b03d10c..426755f 100644
--- a/src/plugins/astyle/Makefile.am
+++ b/src/plugins/astyle/Makefile.am
@@ -1,35 +1,29 @@
SUBDIRS = resources
AM_CPPFLAGS = $(WX_CXXFLAGS) \
- -I$(top_srcdir)/src/plugins/astyle/astyle \
-I$(top_srcdir)/src/include \
-I$(top_srcdir)/src/sdk/wxscintilla/include
pluginlibdir = $(pkglibdir)/plugins
-pluginlib_LTLIBRARIES = libastyle.la
+pluginlib_LTLIBRARIES = libAstyle.la
-libastyle_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
+libAstyle_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
-libastyle_la_LIBADD = ../../sdk/libcodeblocks.la $(WX_LIBS)
+libAstyle_la_LIBADD = ../../sdk/libcodeblocks.la $(WX_LIBS)
-libastyle_la_SOURCES = asstreamiterator.cpp \
+libAstyle_la_SOURCES = asstreamiterator.cpp \
astyleconfigdlg.cpp \
astyleplugin.cpp \
dlgformattersettings.cpp \
- formattersettings.cpp \
- astyle/ASBeautifier.cpp \
- astyle/ASEnhancer.cpp \
- astyle/ASFormatter.cpp \
- astyle/ASResource.cpp
+ formattersettings.cpp
noinst_HEADERS = asstreamiterator.h \
astyleconfigdlg.h \
astyleplugin.h \
astylepredefinedstyles.h \
dlgformattersettings.h \
- formattersettings.h \
- astyle/astyle.h
+ formattersettings.h
EXTRA_DIST = astyle/ASLocalizer.cpp \
astyle/ASLocalizer.h \
@@ -46,3 +40,19 @@ EXTRA_DIST = astyle/ASLocalizer.cpp \
astyle/styles.css \
astyle/subversion.html \
astyle/vsinstall.html
+
+if HAVE_ASTYLE
+libAstyle_la_LIBADD += -lastyle
+EXTRA_DIST += astyle/ASBeautifier.cpp \
+ astyle/ASEnhancer.cpp \
+ astyle/ASFormatter.cpp \
+ astyle/ASResource.cpp \
+ astyle/astyle.h
+else
+AM_CPPFLAGS += -I$(top_srcdir)/src/plugins/astyle/astyle
+libAstyle_la_SOURCES += astyle/ASBeautifier.cpp \
+ astyle/ASEnhancer.cpp \
+ astyle/ASFormatter.cpp \
+ astyle/ASResource.cpp
+noinst_HEADERS += astyle/astyle.h
+endif
diff --git a/src/plugins/astyle/asstreamiterator.h b/src/plugins/astyle/asstreamiterator.h
index f2061d8..105ca99 100644
--- a/src/plugins/astyle/asstreamiterator.h
+++ b/src/plugins/astyle/asstreamiterator.h
@@ -12,7 +12,7 @@
#include <cbeditor.h>
-#include "astyle/astyle.h"
+#include <astyle.h>
class ASStreamIterator : public astyle::ASSourceIterator
{
diff --git a/src/plugins/astyle/astyleplugin.cpp b/src/plugins/astyle/astyleplugin.cpp
index 26b11de..072a74a 100644
--- a/src/plugins/astyle/astyleplugin.cpp
+++ b/src/plugins/astyle/astyleplugin.cpp
@@ -63,8 +63,8 @@ AStylePlugin::AStylePlugin()
{
//ctor
- if (!Manager::LoadResource(_T("astyle.zip")))
- NotifyMissingFile(_T("astyle.zip"));
+ if (!Manager::LoadResource(_T("Astyle.zip")))
+ NotifyMissingFile(_T("Astyle.zip"));
}
AStylePlugin::~AStylePlugin()
diff --git a/src/plugins/astyle/dlgformattersettings.h b/src/plugins/astyle/dlgformattersettings.h
index 61d0520..ad2a313 100644
--- a/src/plugins/astyle/dlgformattersettings.h
+++ b/src/plugins/astyle/dlgformattersettings.h
@@ -10,7 +10,7 @@
#ifndef DLGFORMATTERSETTINGS_H
#define DLGFORMATTERSETTINGS_H
-#include "astyle/astyle.h"
+#include <astyle.h>
class wxWindow;
diff --git a/src/plugins/astyle/formattersettings.h b/src/plugins/astyle/formattersettings.h
index 0f88a3c..431d0fa 100644
--- a/src/plugins/astyle/formattersettings.h
+++ b/src/plugins/astyle/formattersettings.h
@@ -6,7 +6,7 @@
#ifndef FORMATTERSETTINGS_H
#define FORMATTERSETTINGS_H
-#include "astyle/astyle.h"
+#include <astyle.h>
class FormatterSettings
{
diff --git a/src/plugins/astyle/resources/Makefile.am b/src/plugins/astyle/resources/Makefile.am
index f7ca9bb..89c337a 100644
--- a/src/plugins/astyle/resources/Makefile.am
+++ b/src/plugins/astyle/resources/Makefile.am
@@ -1,7 +1,7 @@
EXTRA_DIST = configuration.xrc manifest.xml
-pkgdata_DATA = astyle.zip
+pkgdata_DATA = Astyle.zip
CLEANFILES = $(pkgdata_DATA)
-astyle.zip: $(EXTRA_DIST)
- PWD=`pwd` cd $(srcdir) && zip $(PWD)/astyle.zip manifest.xml *.xrc > /dev/null
+Astyle.zip: $(EXTRA_DIST)
+ PWD=`pwd` cd $(srcdir) && zip $(PWD)/Astyle.zip manifest.xml *.xrc > /dev/null
diff --git a/src/plugins/autosave/Makefile.am b/src/plugins/autosave/Makefile.am
index 48ef8ea..6aaf4fa 100644
--- a/src/plugins/autosave/Makefile.am
+++ b/src/plugins/autosave/Makefile.am
@@ -1,6 +1,6 @@
AM_CPPFLAGS = $(WX_CXXFLAGS) \
- -I$(top_srcdir)/src/include \
- -I$(top_srcdir)/src/sdk/wxscintilla/include
+ -I$(top_srcdir)/src/include \
+ -I$(top_srcdir)/src/sdk/wxscintilla/include
pluginlibdir = $(pkglibdir)/plugins
diff --git a/src/plugins/codecompletion/Makefile.am b/src/plugins/codecompletion/Makefile.am
index 5dcb693..09d025f 100644
--- a/src/plugins/codecompletion/Makefile.am
+++ b/src/plugins/codecompletion/Makefile.am
@@ -1,8 +1,8 @@
SUBDIRS = resources
AM_CPPFLAGS = $(WX_CXXFLAGS) \
- -I$(top_srcdir)/src/include \
- -I$(top_srcdir)/src/sdk/wxscintilla/include \
+ -I$(top_srcdir)/src/include \
+ -I$(top_srcdir)/src/sdk/wxscintilla/include \
-I$(top_srcdir)/src/include/mozilla_chardet \
-I$(top_srcdir)/src/include/mozilla_chardet/mfbt \
-I$(top_srcdir)/src/include/mozilla_chardet/nsprpub/pr/include \
diff --git a/src/plugins/codecompletion/nativeparser.cpp b/src/plugins/codecompletion/nativeparser.cpp
index 3db9a5e..11ade6c 100644
--- a/src/plugins/codecompletion/nativeparser.cpp
+++ b/src/plugins/codecompletion/nativeparser.cpp
@@ -39,6 +39,7 @@
#include <cbstyledtextctrl.h>
#include <compilercommandgenerator.h>
#include <projectloader_hooks.h>
+#include <tinyxml.h>
#include "nativeparser.h"
#include "classbrowser.h"
diff --git a/src/plugins/compilergcc/Makefile.am b/src/plugins/compilergcc/Makefile.am
index 266bebd..02a939d 100644
--- a/src/plugins/compilergcc/Makefile.am
+++ b/src/plugins/compilergcc/Makefile.am
@@ -1,10 +1,10 @@
SUBDIRS = depslib resources
AM_CPPFLAGS = $(WX_CXXFLAGS) \
+ $(CB_SQUIRREL_CFLAGS) \
-I$(top_srcdir)/src/include \
-I$(top_srcdir)/src/sdk/wxpropgrid/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
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 <manager.h>
#include <projectbuildtarget.h>
#include <projectmanager.h>
-#include <tinyxml/tinyxml.h>
+#include <tinyxml.h>
#endif
-#include <tinyxml/tinywxuni.h>
+#include <tinywxuni.h>
#include <wx/textfile.h>
#include "projectloader_hooks.h"
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 <wx/utils.h>
#include <wx/string.h>
#include <wx/arrstr.h>
-#include <tinyxml/tinyxml.h>
+#include <tinyxml.h>
#include <globals.h>
bool QuerySvn(const wxString& workingDir, wxString& revision, wxString& date)
diff --git a/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp b/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp
index 6fc3c1d..0eea6fe 100644
--- a/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp
+++ b/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp
@@ -46,8 +46,8 @@
#endif
#include <wx/tokenzr.h>
-#include "tinyxml/tinyxml.h"
-#include "tinyxml/tinywxuni.h"
+#include <tinyxml.h>
+#include "tinywxuni.h"
#include "BrowseTrackerLayout.h"
#include "BrowseMarks.h"
diff --git a/src/plugins/contrib/BrowseTracker/Makefile.am b/src/plugins/contrib/BrowseTracker/Makefile.am
index 30024b7..2f0a3a5 100644
--- a/src/plugins/contrib/BrowseTracker/Makefile.am
+++ b/src/plugins/contrib/BrowseTracker/Makefile.am
@@ -1,6 +1,6 @@
AM_CPPFLAGS = $(WX_CXXFLAGS) \
- -I$(top_srcdir)/src/include \
- -I$(top_srcdir)/src/sdk/wxscintilla/include
+ -I$(top_srcdir)/src/include \
+ -I$(top_srcdir)/src/sdk/wxscintilla/include
pluginlibdir = $(pkglibdir)/plugins
diff --git a/src/plugins/contrib/CppCheck/CppCheck.cpp b/src/plugins/contrib/CppCheck/CppCheck.cpp
index 3cbc16e..81bdac5 100644
--- a/src/plugins/contrib/CppCheck/CppCheck.cpp
+++ b/src/plugins/contrib/CppCheck/CppCheck.cpp
@@ -32,7 +32,7 @@
#include <wx/filefn.h>
#include <wx/utils.h>
-#include "tinyxml/tinyxml.h"
+#include <tinyxml.h>
#include "filefilters.h"
#include "loggers.h"
diff --git a/src/plugins/contrib/DoxyBlocks/ConfigPanel.cpp b/src/plugins/contrib/DoxyBlocks/ConfigPanel.cpp
index f83982b..f33a1ab 100644
--- a/src/plugins/contrib/DoxyBlocks/ConfigPanel.cpp
+++ b/src/plugins/contrib/DoxyBlocks/ConfigPanel.cpp
@@ -33,7 +33,7 @@
#include <configmanager.h>
#include <editorcolourset.h>
#include <editormanager.h>
-#include <tinyxml/tinyxml.h>
+#include <tinyxml.h>
#include "version.h"
diff --git a/src/plugins/contrib/DoxyBlocks/DoxyBlocks.cpp b/src/plugins/contrib/DoxyBlocks/DoxyBlocks.cpp
index 766f237..31227cb 100644
--- a/src/plugins/contrib/DoxyBlocks/DoxyBlocks.cpp
+++ b/src/plugins/contrib/DoxyBlocks/DoxyBlocks.cpp
@@ -40,7 +40,7 @@
#include <cbstyledtextctrl.h>
#include <configurationpanel.h>
#include <projectloader_hooks.h>
-#include <tinyxml/tinywxuni.h>
+#include <tinywxuni.h>
#include <wx/tokenzr.h>
#include <wx/textfile.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 <cbplugin.h>
#include <cbstyledtextctrl.h>
-#include <tinyxml/tinyxml.h>
+#include <tinyxml.h>
#include "Config.h"
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 <wx/filefn.h>
-#include "tinyxml/tinyxml.h"
+#include <tinyxml.h>
#include "loggers.h"
#include "Valgrind.h"
#include "ValgrindListLog.h"
diff --git a/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp b/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp
index 6f7c505..a9722c5 100644
--- a/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp
+++ b/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp
@@ -44,7 +44,6 @@
//-#else
//-#endif
-#include <tinyxml/tinyxml.h>
#include "cbstyledtextctrl.h"
#include "snippetitemdata.h"
#include "codesnippetstreectrl.h"
diff --git a/src/plugins/contrib/codesnippets/codesnippetstreectrl.h b/src/plugins/contrib/codesnippets/codesnippetstreectrl.h
index 784f9eb..7bcaff0 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 <tinyxml/tinyxml.h>
+#include <tinyxml.h>
#include "snippetproperty.h"
#include "snippetsconfig.h"
#include "cbeditor.h"
diff --git a/src/plugins/contrib/codesnippets/codesnippetswindow.cpp b/src/plugins/contrib/codesnippets/codesnippetswindow.cpp
index 7ea883c..6f64c20 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 <tinyxml/tinyxml.h>
+#include <tinyxml.h>
#include "snippetsconfig.h"
#include "snippetsimages.h"
#include "codesnippetstreectrl.h"
diff --git a/src/plugins/contrib/envvars/Makefile.am b/src/plugins/contrib/envvars/Makefile.am
index 4d3aa5e..06a4cdd 100644
--- a/src/plugins/contrib/envvars/Makefile.am
+++ b/src/plugins/contrib/envvars/Makefile.am
@@ -1,6 +1,6 @@
AM_CPPFLAGS = $(WX_CXXFLAGS) \
+ $(CB_SQUIRREL_CFLAGS) \
-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
diff --git a/src/plugins/contrib/envvars/envvars.cpp b/src/plugins/contrib/envvars/envvars.cpp
index 124655b..e17ed1c 100644
--- a/src/plugins/contrib/envvars/envvars.cpp
+++ b/src/plugins/contrib/envvars/envvars.cpp
@@ -15,7 +15,7 @@
#include <wx/menu.h>
#include <wx/toolbar.h>
- #include <tinyxml/tinyxml.h>
+ #include <tinyxml.h>
#include "cbproject.h"
#include "globals.h"
diff --git a/src/plugins/contrib/headerfixup/Makefile.am b/src/plugins/contrib/headerfixup/Makefile.am
index 54ba93c..716da7b 100644
--- a/src/plugins/contrib/headerfixup/Makefile.am
+++ b/src/plugins/contrib/headerfixup/Makefile.am
@@ -1,6 +1,6 @@
AM_CPPFLAGS = $(WX_CXXFLAGS) \
- -I$(top_srcdir)/src/include \
- -I$(top_srcdir)/src/sdk/wxscintilla/include
+ -I$(top_srcdir)/src/include \
+ -I$(top_srcdir)/src/sdk/wxscintilla/include
CXXFLAGS = @CXXFLAGS@ -O0
diff --git a/src/plugins/contrib/help_plugin/Makefile.am b/src/plugins/contrib/help_plugin/Makefile.am
index d71d32e..f267a12 100644
--- a/src/plugins/contrib/help_plugin/Makefile.am
+++ b/src/plugins/contrib/help_plugin/Makefile.am
@@ -8,9 +8,9 @@ SUBDIRS += zlib
endif
AM_CPPFLAGS = $(WX_CXXFLAGS) \
+ $(CB_SQUIRREL_CFLAGS) \
-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
@@ -21,7 +21,8 @@ pluginlib_LTLIBRARIES = libhelp_plugin.la
libhelp_plugin_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
libhelp_plugin_la_LIBADD = ../../../sdk/libcodeblocks.la \
- $(WX_LIBS)
+ $(WX_LIBS) \
+ $(CB_SQUIRREL_LIBS)
if ! HAVE_BZIP2
diff --git a/src/plugins/contrib/lib_finder/Makefile.am b/src/plugins/contrib/lib_finder/Makefile.am
index 8c40ff0..d7c0557 100644
--- a/src/plugins/contrib/lib_finder/Makefile.am
+++ b/src/plugins/contrib/lib_finder/Makefile.am
@@ -1,12 +1,11 @@
SUBDIRS = lib_finder
AM_CPPFLAGS = $(WX_CXXFLAGS) \
+ $(CB_SQUIRREL_CFLAGS) \
-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 \
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 <cbplugin.h>
#include <settings.h>
#include <sdk_events.h>
-#include <tinyxml/tinyxml.h>
+#include <tinyxml.h>
#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 886bbb7..1c6985d 100644
--- a/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp
+++ b/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp
@@ -21,8 +21,8 @@
* $HeadURL: http://svn.code.sf.net/p/codeblocks/code/branches/release-16.xx/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp $
*/
-#include <tinyxml/tinyxml.h>
-#include <tinyxml/tinywxuni.h>
+#include <tinyxml.h>
+#include <tinywxuni.h>
#include <wx/arrstr.h>
#include <wx/dir.h>
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 <wx/arrstr.h>
#include <wx/string.h>
#include <wx/hashmap.h>
-#include <tinyxml/tinyxml.h>
+#include <tinyxml.h>
#include <cbproject.h>
/** \brief Configuration of one project */
diff --git a/src/plugins/contrib/wxSmith/Makefile.am b/src/plugins/contrib/wxSmith/Makefile.am
index 97fcb68..4cc94c5 100644
--- a/src/plugins/contrib/wxSmith/Makefile.am
+++ b/src/plugins/contrib/wxSmith/Makefile.am
@@ -1,11 +1,10 @@
SUBDIRS = properties wxwidgets . plugin
AM_CPPFLAGS = $(WX_CXXFLAGS) \
+ $(CB_SQUIRREL_CFLAGS) \
-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 \
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 <wx/propgrid/propgrid.h>
#include <wx/propgrid/manager.h>
-#include <tinyxml/tinyxml.h>
+#include <tinyxml.h>
#include <prep.h>
#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 <configurationpanel.h>
-#include <tinyxml/tinyxml.h>
+#include <tinyxml.h>
#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 <cbplugin.h>
#include <settings.h>
#include <sdk_events.h>
-#include <tinyxml/tinyxml.h>
+#include <tinyxml.h>
#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 <cbproject.h>
-#include <tinyxml/tinyxml.h>
+#include <tinyxml.h>
#include "wxsresourcetree.h"
class wxSmith;
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 <globals.h>
#include <wx/string.h>
-#include <tinyxml/tinywxuni.h>
+#include <tinywxuni.h>
// TODO: This is same as in wxsproject.h, make one set instead of two
namespace
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 <tinyxml/tinyxml.h>
+#include <tinyxml.h>
#include <wx/string.h>
class wxsProject;
diff --git a/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am b/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am
index 76d111b..9dea83d 100644
--- a/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am
+++ b/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am
@@ -1,11 +1,10 @@
SUBDIRS = defitems icons properties
AM_CPPFLAGS = $(WX_CXXFLAGS) \
+ $(CB_SQUIRREL_CFLAGS) \
-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
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 <wx/arrstr.h>
-#include <tinyxml/tinyxml.h>
+#include <tinyxml.h>
#include <wx/arrstr.h>
#include "wxscodercontext.h"
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 <globals.h>
#include <logmanager.h>
#include <wx/clipbrd.h>
-#include <tinyxml/tinywxuni.h>
+#include <tinywxuni.h>
#if defined(__WXMSW__) && defined(LoadImage)
// Fix Windows winuser.h Header define of LoadImage.
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 <wx/dataobj.h>
-#include <tinyxml/tinyxml.h>
+#include <tinyxml.h>
#define wxsDF_WIDGET _T("wxSmith XML")
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 <wx/choicdlg.h>
-#include <tinyxml/tinywxuni.h>
+#include <tinywxuni.h>
#include <sqplus.h>
#include <sc_base_types.h>
diff --git a/src/plugins/debuggergdb/Makefile.am b/src/plugins/debuggergdb/Makefile.am
index e17c114..f685d81 100644
--- a/src/plugins/debuggergdb/Makefile.am
+++ b/src/plugins/debuggergdb/Makefile.am
@@ -1,9 +1,9 @@
SUBDIRS = resources
AM_CPPFLAGS = $(WX_CXXFLAGS) \
+ $(CB_SQUIRREL_CFLAGS) \
-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
pluginlibdir = $(pkglibdir)/plugins
diff --git a/src/plugins/occurrenceshighlighting/Makefile.am b/src/plugins/occurrenceshighlighting/Makefile.am
index 56ea714..bff7695 100644
--- a/src/plugins/occurrenceshighlighting/Makefile.am
+++ b/src/plugins/occurrenceshighlighting/Makefile.am
@@ -1,13 +1,12 @@
SUBDIRS = resources
AM_CPPFLAGS = $(WX_CXXFLAGS) \
+ $(CB_SQUIRREL_CFLAGS) \
-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
-
pluginlibdir = $(pkglibdir)/plugins
pluginlib_LTLIBRARIES = liboccurrenceshighlighting.la
diff --git a/src/plugins/projectsimporter/Makefile.am b/src/plugins/projectsimporter/Makefile.am
index d22b42a..fdb8744 100644
--- a/src/plugins/projectsimporter/Makefile.am
+++ b/src/plugins/projectsimporter/Makefile.am
@@ -10,7 +10,6 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \
-I$(top_srcdir)/src/include/mozilla_chardet/xpcom/base \
-I$(top_srcdir)/src/include/mozilla_chardet/xpcom/glue
-
pluginlibdir = $(pkglibdir)/plugins
pluginlib_LTLIBRARIES = libprojectsimporter.la
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 <wx/choicdlg.h>
-#include <tinyxml/tinyxml.h>
+#include <tinyxml.h>
#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 <wx/choicdlg.h>
-#include <tinyxml/tinyxml.h>
+#include <tinyxml.h>
#include "prep.h"
#include "msvc7loader.h"
diff --git a/src/plugins/scriptedwizard/Makefile.am b/src/plugins/scriptedwizard/Makefile.am
index e14945c..50a812d 100644
--- a/src/plugins/scriptedwizard/Makefile.am
+++ b/src/plugins/scriptedwizard/Makefile.am
@@ -1,9 +1,9 @@
SUBDIRS = resources
AM_CPPFLAGS = $(WX_CXXFLAGS) \
+ $(CB_SQUIRREL_CFLAGS) \
-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
pluginlibdir = $(pkglibdir)/plugins
diff --git a/src/sdk/Makefile.am b/src/sdk/Makefile.am
index 94fdc3a..5339df9 100644
--- a/src/sdk/Makefile.am
+++ b/src/sdk/Makefile.am
@@ -3,11 +3,10 @@ DIST_SUBDIRS = scripting wxscintilla wxpropgrid resources
AM_CPPFLAGS = $(WX_CXXFLAGS) \
$(CB_GLIB2_CFLAGS) \
+ $(CB_SQUIRREL_CFLAGS) \
-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 \
-I$(top_srcdir)/src/include/mozilla_chardet \
@@ -23,13 +22,12 @@ 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 \
- ../base/tinyxml/libtinyxml.la \
wxscintilla/libwxscintilla.la \
$(WX_LIBS) \
$(CB_GLIB2_LIBS) \
- $(WXPROPGRID_LIB)
+ $(WXPROPGRID_LIB) \
+ $(CB_TINYXML_LIBS) \
+ $(CB_SQUIRREL_LIBS)
libcodeblocks_la_SOURCES = annoyingdialog.cpp \
autodetectcompilers.cpp \
@@ -113,6 +111,7 @@ libcodeblocks_la_SOURCES = annoyingdialog.cpp \
searchresultslog.cpp \
selecttargetdlg.cpp \
templatemanager.cpp \
+ tinywxuni.cpp \
toolsmanager.cpp \
uservarmanager.cpp \
workspaceloader.cpp \
diff --git a/src/sdk/configmanager.cpp b/src/sdk/configmanager.cpp
index 8041267..8b8927a 100644
--- a/src/sdk/configmanager.cpp
+++ b/src/sdk/configmanager.cpp
@@ -48,7 +48,7 @@
#include <CoreFoundation/CFURL.h>
#endif
-#include "tinyxml/tinywxuni.h"
+#include "tinywxuni.h"
#include <stdlib.h>
#ifdef __linux__
diff --git a/src/sdk/globals.cpp b/src/sdk/globals.cpp
index 8f9fea3..2b881ee 100644
--- a/src/sdk/globals.cpp
+++ b/src/sdk/globals.cpp
@@ -29,7 +29,7 @@
#include "projectmanager.h"
#endif
-#include "tinyxml/tinyxml.h"
+#include <tinyxml.h>
#include <wx/dirdlg.h>
#include <wx/display.h>
@@ -42,7 +42,7 @@
#include <string>
#include "filefilters.h"
-#include "tinyxml/tinywxuni.h"
+#include "tinywxuni.h"
#include "filegroupsandmasks.h"
#ifndef __WXMSW__
diff --git a/src/sdk/pluginmanager.cpp b/src/sdk/pluginmanager.cpp
index cc8a80a..44b0a44 100644
--- a/src/sdk/pluginmanager.cpp
+++ b/src/sdk/pluginmanager.cpp
@@ -42,7 +42,7 @@
#include <wx/txtstrm.h>
#include "filefilters.h"
-#include "tinyxml/tinyxml.h"
+#include <tinyxml.h>
#include "annoyingdialog.h"
#include "pluginsconfigurationdlg.h"
diff --git a/src/sdk/projectlayoutloader.cpp b/src/sdk/projectlayoutloader.cpp
index c380dce..4254eeb 100644
--- a/src/sdk/projectlayoutloader.cpp
+++ b/src/sdk/projectlayoutloader.cpp
@@ -24,8 +24,8 @@
#include "projectlayoutloader.h"
#include "annoyingdialog.h"
-#include "tinyxml/tinyxml.h"
-#include "tinyxml/tinywxuni.h"
+#include <tinyxml.h>
+#include "tinywxuni.h"
ProjectLayoutLoader::ProjectLayoutLoader(cbProject* project)
: m_pProject(project),
diff --git a/src/sdk/projectloader.cpp b/src/sdk/projectloader.cpp
index 69ffaf7..8c14022 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/scripting/Makefile.am b/src/sdk/scripting/Makefile.am
index f2bff06..008a267 100644
--- a/src/sdk/scripting/Makefile.am
+++ b/src/sdk/scripting/Makefile.am
@@ -1 +1,6 @@
-SUBDIRS = squirrel sqstdlib sqplus bindings
+SUBDIRS = sqplus bindings
+DIS_SUBDIRS = squirrel sqstdlib 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..2186fd5 100644
--- a/src/sdk/scripting/bindings/Makefile.am
+++ b/src/sdk/scripting/bindings/Makefile.am
@@ -1,7 +1,7 @@
AM_CPPFLAGS = $(WX_CXXFLAGS) \
+ $(CB_SQUIRREL_CFLAGS) \
-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
diff --git a/src/sdk/tinywxuni.cpp b/src/sdk/tinywxuni.cpp
new file mode 100644
index 0000000..3b159e7
--- /dev/null
+++ b/src/sdk/tinywxuni.cpp
@@ -0,0 +1,56 @@
+#include "sdk_precomp.h"
+
+#ifndef CB_PRECOMP
+ #include <wx/file.h>
+ #include <wx/string.h>
+ #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/scripting/sqplus/Makefile.am b/src/sdk/scripting/sqplus/Makefile.am
index 2cdd579..e35120c 100644
--- a/src/sdk/scripting/sqplus/Makefile.am
+++ b/src/sdk/scripting/sqplus/Makefile.am
@@ -1,5 +1,5 @@
-AM_CPPFLAGS = -I$(top_srcdir)/src/include/scripting/include \
- -I$(top_srcdir)/src/include/scripting/sqplus
+AM_CPPFLAGS = $(CB_SQUIRREL_CFLAGS) \
+ -I$(top_srcdir)/src/include/scripting/sqplus
noinst_LTLIBRARIES = libsqplus.la
diff --git a/src/sdk/workspaceloader.cpp b/src/sdk/workspaceloader.cpp
index b4efcdc..3bf1125 100644
--- a/src/sdk/workspaceloader.cpp
+++ b/src/sdk/workspaceloader.cpp
@@ -31,8 +31,8 @@
#include "annoyingdialog.h"
-#include "tinyxml/tinyxml.h"
-#include "tinyxml/tinywxuni.h"
+#include <tinyxml.h>
+#include "tinywxuni.h"
WorkspaceLoader::WorkspaceLoader()
{
diff --git a/src/src/Makefile.am b/src/src/Makefile.am
index 0998613..acad50a 100644
--- a/src/src/Makefile.am
+++ b/src/src/Makefile.am
@@ -1,10 +1,10 @@
SUBDIRS = resources
AM_CPPFLAGS = $(WX_CXXFLAGS) \
+ $(CB_SQUIRREL_CFLAGS) \
-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 \
diff --git a/src/tools/cb_share_config/Makefile.am b/src/tools/cb_share_config/Makefile.am
index 3adf2e3..6078753 100644
--- a/src/tools/cb_share_config/Makefile.am
+++ b/src/tools/cb_share_config/Makefile.am
@@ -2,14 +2,13 @@ bin_PROGRAMS = cb_share_config
AM_CPPFLAGS = $(WX_CXXFLAGS) \
$(CB_GLIB2_CFLAGS) \
- -I$(top_srcdir)/src/include \
- -I$(top_srcdir)/src/include/tinyxml
+ -I$(top_srcdir)/src/include
cb_share_config_LDFLAGS =
-cb_share_config_LDADD = ../../base/tinyxml/libtinyxml.la \
- $(WX_LIBS) \
- $(CB_GLIB2_LIBS)
+cb_share_config_LDADD = $(WX_LIBS) \
+ $(CB_GLIB2_LIBS) \
+ $(CB_TINYXML_LIBS)
cb_share_config_SOURCES = app.cpp \
mainframe.cpp
diff --git a/src/tools/cb_share_config/mainframe.cpp b/src/tools/cb_share_config/mainframe.cpp
index 468f4d0..83300cb 100644
--- a/src/tools/cb_share_config/mainframe.cpp
+++ b/src/tools/cb_share_config/mainframe.cpp
@@ -30,7 +30,7 @@
#endif // __linux__
-#include "tinyxml/tinywxuni.h"
+#include "tinywxuni.h"
//***********************************************************************
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 <wx/arrstr.h>
#include <vector>
-#include "tinyxml/tinystr.h"
-#include "tinyxml/tinyxml.h"
+#include <tinyxml.h>
class MainFrame: public wxFrame
{