buildfix
This commit is contained in:
parent
c5778f1540
commit
19156f3a34
4 changed files with 9 additions and 18 deletions
|
|
@ -50,7 +50,8 @@ TimelinePanel::TimelinePanel() :
|
||||||
toolbar.append(zoomIn, mem_fun(this, &TimelinePanel::on_zoom_in));
|
toolbar.append(zoomIn, mem_fun(this, &TimelinePanel::on_zoom_in));
|
||||||
toolbar.append(zoomOut, mem_fun(this, &TimelinePanel::on_zoom_out));
|
toolbar.append(zoomOut, mem_fun(this, &TimelinePanel::on_zoom_out));
|
||||||
|
|
||||||
toolbar.set_icon_size(IconSize(ICON_SIZE_LARGE_TOOLBAR));
|
// doesn't compile on Etch
|
||||||
|
// toolbar.set_icon_size(IconSize(ICON_SIZE_LARGE_TOOLBAR));
|
||||||
toolbar.set_toolbar_style(TOOLBAR_ICONS);
|
toolbar.set_toolbar_style(TOOLBAR_ICONS);
|
||||||
|
|
||||||
// Add the toolbar
|
// Add the toolbar
|
||||||
|
|
|
||||||
|
|
@ -176,15 +176,6 @@ noinst_HEADERS += \
|
||||||
$(liblumiproc_a_srcdir)/asset/track.hpp \
|
$(liblumiproc_a_srcdir)/asset/track.hpp \
|
||||||
$(liblumiproc_a_srcdir)/asset/unknown.hpp \
|
$(liblumiproc_a_srcdir)/asset/unknown.hpp \
|
||||||
$(liblumiproc_a_srcdir)/controllerfacade.hpp \
|
$(liblumiproc_a_srcdir)/controllerfacade.hpp \
|
||||||
$(liblumiproc_a_srcdir)/engine/aframe.hpp \
|
|
||||||
$(liblumiproc_a_srcdir)/engine/arender.hpp \
|
|
||||||
$(liblumiproc_a_srcdir)/engine/codecadapter.hpp \
|
|
||||||
$(liblumiproc_a_srcdir)/engine/exitnode.hpp \
|
|
||||||
$(liblumiproc_a_srcdir)/engine/glbuf.hpp \
|
|
||||||
$(liblumiproc_a_srcdir)/engine/glpipe.hpp \
|
|
||||||
$(liblumiproc_a_srcdir)/engine/glrender.hpp \
|
|
||||||
$(liblumiproc_a_srcdir)/engine/hub.hpp \
|
|
||||||
$(liblumiproc_a_srcdir)/engine/link.hpp \
|
|
||||||
$(liblumiproc_a_srcdir)/engine/mask.hpp \
|
$(liblumiproc_a_srcdir)/engine/mask.hpp \
|
||||||
$(liblumiproc_a_srcdir)/engine/pluginadapter.hpp \
|
$(liblumiproc_a_srcdir)/engine/pluginadapter.hpp \
|
||||||
$(liblumiproc_a_srcdir)/engine/procnode.hpp \
|
$(liblumiproc_a_srcdir)/engine/procnode.hpp \
|
||||||
|
|
@ -192,14 +183,10 @@ noinst_HEADERS += \
|
||||||
$(liblumiproc_a_srcdir)/engine/renderengine.hpp \
|
$(liblumiproc_a_srcdir)/engine/renderengine.hpp \
|
||||||
$(liblumiproc_a_srcdir)/engine/source.hpp \
|
$(liblumiproc_a_srcdir)/engine/source.hpp \
|
||||||
$(liblumiproc_a_srcdir)/engine/trafo.hpp \
|
$(liblumiproc_a_srcdir)/engine/trafo.hpp \
|
||||||
$(liblumiproc_a_srcdir)/engine/vframe.hpp \
|
|
||||||
$(liblumiproc_a_srcdir)/engine/vrender.hpp \
|
|
||||||
$(liblumiproc_a_srcdir)/engine/processor.hpp \
|
$(liblumiproc_a_srcdir)/engine/processor.hpp \
|
||||||
$(liblumiproc_a_srcdir)/frame.hpp \
|
|
||||||
$(liblumiproc_a_srcdir)/mobject/builder/assembler.hpp \
|
$(liblumiproc_a_srcdir)/mobject/builder/assembler.hpp \
|
||||||
$(liblumiproc_a_srcdir)/mobject/builder/buildertool.hpp \
|
$(liblumiproc_a_srcdir)/mobject/builder/buildertool.hpp \
|
||||||
$(liblumiproc_a_srcdir)/mobject/builder/conmanager.hpp \
|
$(liblumiproc_a_srcdir)/mobject/builder/conmanager.hpp \
|
||||||
$(liblumiproc_a_srcdir)/mobject/builder/nodecreatertool.hpp \
|
|
||||||
$(liblumiproc_a_srcdir)/mobject/builder/segmentationtool.hpp \
|
$(liblumiproc_a_srcdir)/mobject/builder/segmentationtool.hpp \
|
||||||
$(liblumiproc_a_srcdir)/mobject/builder/toolfactory.hpp \
|
$(liblumiproc_a_srcdir)/mobject/builder/toolfactory.hpp \
|
||||||
$(liblumiproc_a_srcdir)/mobject/builderfacade.hpp \
|
$(liblumiproc_a_srcdir)/mobject/builderfacade.hpp \
|
||||||
|
|
|
||||||
|
|
@ -747,7 +747,7 @@ config.macros.timeline.handler = function(place,macroName,params,wikifier,paramS
|
||||||
}
|
}
|
||||||
//}}}</pre>
|
//}}}</pre>
|
||||||
</div>
|
</div>
|
||||||
<div title="BuildDependencies" modifier="Ichthyostega" modified="200807110148" created="200803261326" changecount="13">
|
<div title="BuildDependencies" modifier="Ichthyostega" modified="200808180346" created="200803261326" changecount="14">
|
||||||
<pre>! Programming Languages
|
<pre>! Programming Languages
|
||||||
* C
|
* C
|
||||||
** a C99 compatible compiler, some GCC extensions are used, most are optional.
|
** a C99 compatible compiler, some GCC extensions are used, most are optional.
|
||||||
|
|
@ -782,13 +782,15 @@ config.macros.timeline.handler = function(place,macroName,params,wikifier,paramS
|
||||||
* boost (see above, version 1.35 works too)
|
* boost (see above, version 1.35 works too)
|
||||||
* NoBug
|
* NoBug
|
||||||
* [[GAVL|http://gmerlin.sourceforge.net/gavl.html]] (1.0.0)
|
* [[GAVL|http://gmerlin.sourceforge.net/gavl.html]] (1.0.0)
|
||||||
* for the GUI: gtkmm-2.4 gdl-1.0 cairomm-1.0 xv
|
* for the GUI: gtkmm-2.4 gdl-1.0 libglibmm-2.4 cairomm-1.0 xv
|
||||||
** libgtkmm-2.4-dev (>=2.8)
|
** libgtkmm-2.4-dev (>=2.8)
|
||||||
** libcairomm-1.0-dev (>=0.6.0)
|
** libcairomm-1.0-dev (>=0.6.0)
|
||||||
** libgdl-1-dev (>=0.6.1)
|
** libgdl-1-dev (>=0.6.1)
|
||||||
*** libbonoboui2-dev (>=2.14.0)
|
*** libbonoboui2-dev (>=2.14.0)
|
||||||
|
** libgtkmm-2.4-dev (>=2.16), requiring glib2.0 (>=2.16)
|
||||||
** libxv-dev ~~(1.0.2 is known to work)~~
|
** libxv-dev ~~(1.0.2 is known to work)~~
|
||||||
|
|
||||||
|
|
||||||
//usually, newer versions are OK//
|
//usually, newer versions are OK//
|
||||||
|
|
||||||
</pre>
|
</pre>
|
||||||
|
|
|
||||||
|
|
@ -759,7 +759,7 @@ config.macros.timeline.handler = function(place,macroName,params,wikifier,paramS
|
||||||
}
|
}
|
||||||
//}}}</pre>
|
//}}}</pre>
|
||||||
</div>
|
</div>
|
||||||
<div title="BuildDependenceis" modifier="Ichthyostega" modified="200807110146" created="200708120103" tags="organization buildsys" changecount="15">
|
<div title="BuildDependenceis" modifier="Ichthyostega" modified="200808180346" created="200708120103" tags="organization buildsys" changecount="17">
|
||||||
<pre>for __Building__
|
<pre>for __Building__
|
||||||
* gcc (4.1), glibc6 (2.3), libstdc++6 (4.1)
|
* gcc (4.1), glibc6 (2.3), libstdc++6 (4.1)
|
||||||
* [[build system|BuildSystem]] dependencies: SCons (0.96.90), Python (2.4), pkg-config
|
* [[build system|BuildSystem]] dependencies: SCons (0.96.90), Python (2.4), pkg-config
|
||||||
|
|
@ -773,11 +773,12 @@ config.macros.timeline.handler = function(place,macroName,params,wikifier,paramS
|
||||||
** libboost-program-options1.34.1 (>=1.34.1-2) ''NOTE: binary dependency''
|
** libboost-program-options1.34.1 (>=1.34.1-2) ''NOTE: binary dependency''
|
||||||
** libboost-regex-dev (>=1.34.1-2)
|
** libboost-regex-dev (>=1.34.1-2)
|
||||||
** libboost-regex1.34.1 (>=1.34.1-2) ''binary..''
|
** libboost-regex1.34.1 (>=1.34.1-2) ''binary..''
|
||||||
* for the GUI: gtkmm-2.4 gdl-1.0 cairomm-1.0 xv
|
* for the GUI: gtkmm-2.4 gdl-1.0 libglibmm-2.4 cairomm-1.0 xv
|
||||||
** libgtkmm-2.4-dev (>=2.8)
|
** libgtkmm-2.4-dev (>=2.8)
|
||||||
** libcairomm-1.0-dev (>=0.6.0)
|
** libcairomm-1.0-dev (>=0.6.0)
|
||||||
** libgdl-1-dev (>=0.6.1)
|
** libgdl-1-dev (>=0.6.1)
|
||||||
*** libbonoboui2-dev (>=2.14.0)
|
*** libbonoboui2-dev (>=2.14.0)
|
||||||
|
** libgtkmm-2.4-dev (>=2.16), requiring glib2.0 (>=2.16)
|
||||||
** libxv-dev (>=1.0.2)
|
** libxv-dev (>=1.0.2)
|
||||||
//usually, newer versions are OK//
|
//usually, newer versions are OK//
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue