Commit graph

84 commits

Author SHA1 Message Date
86bc30a10a Merge Ubuntu/Lucid adjustments. Drop pre 1.0 compatibility 2010-05-21 03:43:09 +02:00
d10380d124 SCons: dropping pre 1.0 compatibility
note: current SCons development is targetting 2.0,
current stable is 1.3, which is included in Squeeze
even Debian/Lenny includes 1.0.
2010-05-21 01:59:26 +02:00
4e31db5a74 my private convenience wrapper for running an exe with valgrind 2010-02-13 06:01:49 +01:00
Michael Ploujnikov
0caf9f9f5a Merge branch 'master' into second-tp-attempt 2010-01-16 18:43:00 -05:00
Michael Ploujnikov
11f9d62553 partially fix a pkg-config problem with scons on Fedora12
(happens when nobug and other libs are installed in non-standard paths)
2010-01-16 18:42:07 -05:00
Michael Ploujnikov
55859bcb14 match the filename in the header comment 2010-01-15 17:15:58 -05:00
1db2a47339 python-2.6 fix: loading the icon_rener.py script (Ticket #222) 2010-01-15 03:27:57 +01:00
ae67c6db5c merge buildsystem changes (dummy player and GUI/gdl work) 2009-04-24 17:20:39 +02:00
34d0c6905e SCons: now require either a custom 'gdl-lum' or GDL >= 2.27.1 2009-04-20 01:58:34 +02:00
5ee6d375c0 SCons: fix the compatibility switch; the new code path should also be used for scons 0.97 2009-01-20 02:38:13 +01:00
Joel Holdsworth
6d8f598312 Fixed a bug when SCons.__version__ == "0.97.0d20071203" 2009-01-19 19:33:13 +00:00
13ca25569a merge plugin building rule and cleanup done for starting the GUI as module 2009-01-15 14:22:01 +01:00
bdffc18101 move all tools to src/tool and remove admin dir from build 2009-01-13 12:16:48 +01:00
ac156231ac SCons: use new plugin building rule for the test plugins 2009-01-12 12:48:14 +01:00
bd6436e43b SCons: implement logic to find source trees, which than can be built as plugin 2009-01-12 11:42:03 +01:00
a0ff1f611a Try to circumvent problems with creating the Icon directory.
Seems to be either concurrency, or a permission problem.
2008-12-22 05:00:02 +01:00
c8465a1a38 Merge latest GUI model additions 2008-12-21 07:10:46 +01:00
62922d357b (irrelevant) changes to make the dummy code build and load shared module
Explanation: together with the bare SCons build system, on this branch I added
some dummy codefiles, to validate the build system is working as merged in from master
2008-12-20 03:40:28 +01:00
f6209d99d3 Merge: change building to create modules
includes DistCC and CCache support,
LUMIERA_PLUGIN_PATH and LUMIERA_CONFIG_PATH
non-verbose build messages
2008-12-20 02:15:33 +01:00
7a64f37643 SCons: use two existing modules for integrating DistCC and CCache 2008-12-19 20:17:23 +01:00
e32194b810 Autotools fixes (make the tests compile) 2008-12-18 10:48:50 +01:00
598994c0cb further Makefile.am tweaks to make it compile again
explanation: via the unresolved problems with the hig-level model,
probably a dependency to AssetManager and from there to the core systems
"bubbled" into the liblumiera.so, forcing us to link these things for now
2008-12-18 06:47:54 +01:00
Christian Thaeter
052df48f73 WIP: shared liblumiera.la for vgsuppression and luidgen
Doesn't build because of some other issues
2008-12-17 17:56:50 +01:00
Christian Thaeter
ca88570066 removed 'pushing' from the post commit hook
only signing remains
2008-12-16 23:59:00 +01:00
Joel Holdsworth
d9b747a544 Revert "try to make icon-render-script more robust regarding the output destination"
This reverts commit bd538edfe9.

Conflicts:

	admin/render-icon.py
2008-12-16 21:29:35 +00:00
12fc97b8e2 Build most of Lumiera as shared library (SCons build) 2008-12-15 13:36:42 +01:00
Joel Holdsworth
7b52ff247e Merge branch 'master' of git://git.lumiera.org/LUMIERA into gui 2008-11-15 23:37:21 +00:00
Joel Holdsworth
ab8edcdedd Applied upstream patches to rsvg-convert 2008-11-15 16:32:29 +00:00
27052a8f58 bugfix 2008-11-07 21:59:36 +01:00
bd538edfe9 try to make icon-render-script more robust regarding the output destination 2008-11-07 19:13:58 +01:00
a912159d70 re-enabled building of the testpluginc.so 2008-10-28 01:57:28 +01:00
Christian Thaeter
ab3d3823f6 autotools fixes for the plugin system
don't link the tests with -ldl

Renamed GTK_LUMIERA_* to LUMIERA_GUI_* and include all gui relevant config
results here.

Set it explicit, don't add the results to CFLAGS or LIBS, the default
behaviour linked all LIBS in, even in plugins, that was not intended.
2008-10-27 05:10:01 +01:00
Christian Thaeter
691dc8fd4e Does this ever end? found 2 more liblumi.a 2008-10-22 03:42:15 +02:00
bed1dffd69 merge after FrOSCon
(added lib implementations for Doxygen and GCH builder, fix Lenny compatibility)
2008-09-05 07:22:49 +02:00
84052f1fab add placeholder gui main to make the compile work 2008-09-05 07:06:46 +02:00
f2c9e67fbc merge generating icons from SVG source 2008-09-05 05:54:14 +02:00
Michael Ploujnikov
06504c7b04 Merge branch 'master' of git://git.lumiera.org/LUMIERA 2008-09-03 18:55:19 -04:00
Michael Ploujnikov
859437794e put global AM_CPPFLAGS at the front of the per-target variables for consistency 2008-08-30 13:32:24 -04:00
Michael Ploujnikov
387ba8c321 find and configure NoBug by using pkg-config 2008-08-30 13:28:24 -04:00
Michael Ploujnikov
8bdab41ea0 factor out -I$(top_srcdir)/src/ to a top-level AM_CPPFLAGS
also remove a related unnecesary comment in src/gui/Makefile.am
2008-08-30 12:05:21 -04:00
Michael Ploujnikov
8bbcc57f48 set per-target CPPFLAGS for lumigui instead of global AM_CPPFLAGS
this prevents strange (_CPPFLAGS) dependencies such as the one that was identified and fixed in admin/Makefile.am
Also, make sure to include the global $(AM_CPPFLAGS) flags in the per-target ones
2008-08-30 11:49:31 -04:00
6d5cf0e642 scons: use Doxygen builder
(lib implementation from http://www.scons.org/wiki/DoxygenBuilder)
2008-08-28 02:57:12 +02:00
32dd0e661a replace the homebrew GCH-builder by a lib solution 2008-08-21 09:59:24 +02:00
0ece037f91 make build work again with SCons 0.96
Added a conditional switch to use the pre-0.98-fix only for the old SCons versions
2008-08-21 01:24:46 +02:00
944b7c4dd4 preliminary fix for the SCons build for Debian/testing
WARNING: breakes build on Debian/stable
Explanation: I tried to provide a backported implementtation of
features introduced with SCons 1.0 (until we can require SCons 1.0 officially)
Unfortionately, some internal APIs changed quite large in 0.97
Have to build in some conditional code, so it works with SCons 0.96 again)
2008-08-20 15:50:17 +01:00
878ce2319b integrated SVG Icon rendering into the SCons build 2008-08-19 05:03:29 +02:00
Joel Holdsworth
c14ee293fe Converted icon renderer to use RSVG via C rather than pyrsvg 2008-08-12 22:13:26 +01:00
Joel Holdsworth
04320ae794 Added code to render icons as part of the build process 2008-08-04 12:06:24 +01:00
7a6b987a50 merge after integrating the GUI draft; now using multiple build environments and check via pkg-config 2008-07-11 05:35:48 +02:00
50f8be0e16 merge after integrating backend/library work 2008-07-11 05:20:22 +02:00