1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-09-30 05:59:07 +00:00
Commit Graph

35 Commits

Author SHA1 Message Date
Nikolas Garofil
0d98fe8478 Merge branch 'master' into lua-config 2010-11-14 14:19:42 +01:00
Nikolas Garofil
a18f5e2808 Make sure MAINTAINER_MODE sets DEBUG 2010-11-14 02:27:01 +01:00
Nikolas Garofil
b5ff3eb411 Make lua required by cmake 2010-11-14 01:41:07 +01:00
Pavel Labath
0852aa4fcd Merge remote branch 'origin/master' into lua-config
Conflicts:
	src/ccurl_thread.cc
	src/conky.cc
	src/llua.cc
	src/logging.h
	src/nvidia.cc
2010-11-13 20:05:59 +01:00
Nikolas Garofil
e918ea4655 Let cmake check whether to build for old or new audacious 2010-11-12 16:49:34 +01:00
Nikolas Garofil
4d157a298b Fix compiling with audacious support (Patch from billie, thanks !) 2010-11-12 12:32:49 +01:00
Nikolas Garofil
89a8456495 Fix x11 check in cmake 2010-10-27 07:37:11 +02:00
Pavel Labath
eeb1a6a0d7 Properly load config file and print the default one
ps: the new implementation no longer requires fopencookie() and co.
2010-09-12 16:23:06 +02:00
Pavel Labath
cccbf3b4c0 Add a CMAKE variable for the patch program 2010-06-13 19:09:07 +02:00
Nikolas Garofil
54d4e6518d Add support for out_to_http 2010-06-04 14:41:12 +02:00
Nikolas Garofil
3f7ecb3a26 Add support for $irc 2010-04-30 19:32:42 +02:00
Nikolas Garofil
aada8c4d26 ical support default off and block compiling if it's requested but not available 2010-04-27 21:14:32 +02:00
Nikolas Garofil
a13c56a7a5 Add support for $ical 2010-04-27 16:42:21 +02:00
Nikolas Garofil
7065ba251e Make it possible for cmake to find mysql.h 2010-04-18 20:30:10 +02:00
Nikolas Garofil
a6e63bcaa0 Add support for MySQL
Warning: Altough the current version works (for me),
the syntax of the configoptions and vars will probably change
over time. Contact me if you have ideas.

The following is a example of how you can use it now:

mysql_host someserver.com
mysql_db my_database
mysql_user loginname
mysql_password "s3cr3t"
TEXT
${mysql select var1 from some_table}${mysql select var2 from some_table}
2010-04-18 17:52:41 +02:00
Nikolas Garofil
d91214e290 Fix using the wireless-vars 2010-02-20 17:59:51 +01:00
Nikolas Garofil
4793655974 Link with devstat when building in FreeBSD 2010-02-14 21:35:13 +01:00
Nikolas Garofil
da4e9349f8 Link with kvm when building in FreeBSD 2010-02-14 20:20:45 +01:00
Nikolas Garofil
0c19282eee Let cmake check for and include xext when building with xdbe 2010-01-25 00:08:06 +01:00
Pavel Labath
6e89ed7e2d Get $iconv vars working again 2010-01-20 18:17:30 +01:00
Nikolas Garofil
287c38a0b9 Added support for builtin config in cmake 2010-01-17 03:00:51 +01:00
Brenden Matthews
620e9876a4 C++ conversions WIP.
Currently stuck on an issue with g++ and using '%lli' with printf/scanf.
2010-01-04 19:21:12 -08:00
Brenden Matthews
58cbbf57a3 Coulpe minor build fixes. 2010-01-04 18:43:40 -08:00
Cesare Tirabassi
c73f320798 There is no need to have glib for rss 2010-01-03 18:46:09 +01:00
Brenden Matthews
2951f5571c Add missing copyright notices. 2010-01-01 15:49:41 -08:00
Brenden Matthews
b3270cd8ba Apply 42d2e90ba1 to cmake. 2010-01-01 14:54:56 -08:00
Brenden Matthews
d7f008e868 tolua++ has different naming convention on FreeBSD 2010-01-01 14:33:42 -08:00
Brenden Matthews
d92c2e6dab Minor CMake fixes.
- Only enable pedantic flags with MAINTAINER_MODE enabled
 - Hide APP_* vars.
2010-01-01 13:50:12 -08:00
Phil Sutter
0d2770ab33 fix check for iwlib and output some more detailed errors 2009-12-28 03:02:06 +01:00
Phil Sutter
243a234352 cmake: fix for imlib2
- on my system, libImlib2.so is written with a capitalised I
- IMLIB2_LIB is empty, but IMLIB2_LDFLAGS contains what we need
2009-12-20 02:23:25 +01:00
Cesare Tirabassi
52e3cd36c4 The tolua++ helper is called tolua++5.1 on some distro 2009-12-20 00:58:40 +01:00
Brenden Matthews
4d0924f6b0 More work on CMake build system (possibly finished?). 2009-12-19 11:39:16 -08:00
Brenden Matthews
fb33419cd4 Add CMake build support for Lua bindings. 2009-12-17 19:46:26 -08:00
Brenden Matthews
48e834d1eb More work on CMake build system. 2009-12-10 20:37:56 -08:00
Brenden Matthews
6944cba54e Move cmake files around, add -D_GNU_SOURCE. 2009-12-09 15:56:07 -08:00