Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-20 03:51:18 +00:00
Code Issues Releases Activity

Coulpe minor build fixes.

Browse Source
This commit is contained in:
Brenden Matthews 2010-01-04 18:38:29 -08:00
parent b8a678728c
commit 58cbbf57a3
5 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/ConkyPlatformChecks.cmake
View File

@ -291,6 +291,9 @@ if(WANT_TOLUA)
message(FATAL_ERROR "Unable to find tolua++ library") message(FATAL_ERROR "Unable to find tolua++ library")
endif(TOLUA_INCLUDE_PATH AND TOLUA_LIBS) endif(TOLUA_INCLUDE_PATH AND TOLUA_LIBS)
mark_as_advanced(APP_TOLUA TOLUA_INCLUDE_PATH TOLUA_LIBS) mark_as_advanced(APP_TOLUA TOLUA_INCLUDE_PATH TOLUA_LIBS)
set(conky_includes ${conky_includes} ${TOLUA_INCLUDE_PATH})
set(conky_libs ${conky_libs} ${TOLUA_LIBS})
set(LUA_EXTRAS true)
endif(WANT_TOLUA) endif(WANT_TOLUA)
# Look for doc generation programs # Look for doc generation programs

2
cmake/config.h.in
View File

@ -157,4 +157,6 @@
#cmakedefine HAVE_ICONV 1 #cmakedefine HAVE_ICONV 1
#cmakedefine LUA_EXTRAS 1
#endif /* _conky_config_h_ */ #endif /* _conky_config_h_ */

6
lua/CMakeLists.txt
View File

@ -22,6 +22,12 @@
include(ToLua) include(ToLua)
add_definitions(-DTOLUA_RELEASE)
set(CMAKE_C_FLAGS "-O3")
set(CMAKE_C_FLAGS_DEBUG "-ggdb")
set(CMAKE_CXX_FLAGS "-O3")
set(CMAKE_CXX_FLAGS_DEBUG "-ggdb")
if(BUILD_LUA_CAIRO) if(BUILD_LUA_CAIRO)
include_directories(${luacairo_includes} ${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${luacairo_includes} ${CMAKE_CURRENT_SOURCE_DIR})
wrap_tolua(luacairo_src cairo.pkg) wrap_tolua(luacairo_src cairo.pkg)

2
src/audacious.h
View File

@ -44,7 +44,7 @@ enum _audacious_items {
AUDACIOUS_FILENAME, AUDACIOUS_FILENAME,
AUDACIOUS_PLAYLIST_LENGTH, AUDACIOUS_PLAYLIST_LENGTH,
AUDACIOUS_PLAYLIST_POSITION, AUDACIOUS_PLAYLIST_POSITION,
AUDACIOUS_MAIN_VOLUME, AUDACIOUS_MAIN_VOLUME
}; };
/* 12 slots for the audacious values */ /* 12 slots for the audacious values */

1
src/llua.c
View File

@ -22,6 +22,7 @@
* *
*/ */
#include <config.h>
#include "conky.h" #include "conky.h"
#include "llua.h" #include "llua.h"
#include "logging.h" #include "logging.h"