diff options
| author | Josh Andler <scislac@gmail.com> | 2014-05-05 08:40:12 +0000 |
|---|---|---|
| committer | Josh Andler <scislac@gmail.com> | 2014-05-05 08:40:12 +0000 |
| commit | e2f2dfac4f2c54eef41c4b7429fe5fb6bc5eb1d2 (patch) | |
| tree | 8a270f558f3de4b1f9a2ebbf044a964d006037b6 | |
| parent | Documentation. Elements of design tutorial update ((not fully translated); Up... (diff) | |
| download | inkscape-e2f2dfac4f2c54eef41c4b7429fe5fb6bc5eb1d2.tar.gz inkscape-e2f2dfac4f2c54eef41c4b7429fe5fb6bc5eb1d2.zip | |
Make experimental feature enabling more unified/easy.
(bzr r13336)
| -rw-r--r-- | build.xml | 6 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/live_effects/effect.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/toolbox.cpp | 5 |
4 files changed, 12 insertions, 4 deletions
@@ -211,6 +211,12 @@ /* Do we want experimental, unsupported, unguaranteed, etc., LivePathEffects enabled? */ //#define LPE_ENABLE_TEST_EFFECTS 1 + /* Do we want experimental, unsupported, unguaranteed, etc., SVG2 features enabled? */ + //#define WITH_SVG2 1 + //#define WITH_CSSCOMPOSITE 1 + //#define WITH_CSSBLEND 1 + //#define WITH_MESH 1 + #define HAVE_ASPELL 1 #endif /* _CONFIG_H_ */ diff --git a/configure.ac b/configure.ac index adb72aac0..bc2633253 100644 --- a/configure.ac +++ b/configure.ac @@ -106,6 +106,9 @@ if test "$GCC" = "yes"; then # Uncomment for SVG2 stuff # CPPFLAGS="-DWITH_MESH -DWITH_CSSBLEND -DWITH_CSSCOMPOSITE -DWITH_SVG2 $CPPFLAGS" + # Uncomment for LPE Tool and All LPEs + # CPPFLAGS="-DWITH_LPETOOL -DLPE_ENABLE_TEST_EFFECTS $CPPFLAGS" + #### # C-specific flags... diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 12990ee24..4c5e21194 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -5,8 +5,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -//#define LPE_ENABLE_TEST_EFFECTS - #ifdef HAVE_CONFIG_H # include "config.h" #endif diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 02da805bf..3d6f73ef1 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -1301,8 +1301,9 @@ void setup_tool_toolbox(GtkWidget *toolbox, SPDesktop *desktop) " <toolitem action='ToolDropper' />" " <toolitem action='ToolConnector' />" - -// " <toolitem action='ToolLPETool' />" +#ifdef WITH_LPETOOL + " <toolitem action='ToolLPETool' />" +#endif " </toolbar>" "</ui>"; |