From e9447ecc19114cee9550c7aaea89a4d3de3cfa3f Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Mon, 21 Apr 2014 17:53:25 +1000 Subject: Move LumbrJack and Runnr to the libraries directory, and use them from GuiLua. --- ClientHamr/GuiLua/GuiLua.h | 39 +++------------------------------------ 1 file changed, 3 insertions(+), 36 deletions(-) (limited to 'ClientHamr/GuiLua/GuiLua.h') diff --git a/ClientHamr/GuiLua/GuiLua.h b/ClientHamr/GuiLua/GuiLua.h index 50aa3da..156fa1a 100644 --- a/ClientHamr/GuiLua/GuiLua.h +++ b/ClientHamr/GuiLua/GuiLua.h @@ -9,46 +9,21 @@ #include #include +#include "LumbrJack.h" +#include "Runnr.h" + typedef struct _globals globals; #define WIDTH (300) #define HEIGHT (300) -#define PC(...) EINA_LOG_DOM_CRIT(ourGlobals->logDom, __VA_ARGS__) -#define PE(...) EINA_LOG_DOM_ERR(ourGlobals->logDom, __VA_ARGS__) -#define PW(...) EINA_LOG_DOM_WARN(ourGlobals->logDom, __VA_ARGS__) -#define PD(...) EINA_LOG_DOM_DBG(ourGlobals->logDom, __VA_ARGS__) -#define PI(...) EINA_LOG_DOM_INFO(ourGlobals->logDom, __VA_ARGS__) - -#define PCm(...) EINA_LOG_DOM_CRIT(ourGlobals.logDom, __VA_ARGS__) -#define PEm(...) EINA_LOG_DOM_ERR(ourGlobals.logDom, __VA_ARGS__) -#define PWm(...) EINA_LOG_DOM_WARN(ourGlobals.logDom, __VA_ARGS__) -#define PDm(...) EINA_LOG_DOM_DBG(ourGlobals.logDom, __VA_ARGS__) -#define PIm(...) EINA_LOG_DOM_INFO(ourGlobals.logDom, __VA_ARGS__) - -#define D() PD("DEBUG") - #define SKANG "skang" #define MODULEBEGIN "moduleBegin" #define MODULEEND "moduleEnd" #define THINGASM "thingasm" -// "01:03:52 01-01-1973\n\0" -#define DATE_TIME_LEN 21 -# define DATE_TIME_LEN 21 - - -#ifndef FALSE -// NEVER change this -typedef enum -{ - FALSE = 0, - TRUE = 1 -} boolean; -#endif - struct _globals { Evas_Object *win; // Our Elm window. @@ -56,13 +31,5 @@ struct _globals }; -void dumpStack(lua_State *L, int i); - -void loggingStartup(globals *ourGlobals); -char *getDateTime(struct tm **nowOut, char *dateOut, time_t *tiemOut); - -int pull_lua(lua_State *L, int i, char *params, ...); -int push_lua(lua_State *L, char *params, ...); - int luaopen_widget(lua_State *L); void GuiLuaDo(int argc, char **argv); -- cgit v1.1