Changeset 4861 for gayckoTweet

Timestamp:

Jan 24, 2013, 8:45:33 PM (7 years ago)

Author:

Jean-Yves Lamoureux

Message:

• reordered

Location:

gaycko/trunk

Files:

• configure.ac (modified) (2 diffs)
• src/Makefile.am (modified) (1 diff)
• src/gaycko.cpp (modified) (1 diff)
• src/position.c (copied) (copied from gaycko/trunk/src/render/position.c)
• src/render (deleted)
• src/renderer.c (copied) (copied from gaycko/trunk/src/render/renderer.c)
• src/renderer.h (copied) (copied from gaycko/trunk/src/render/renderer.h) (1 diff)
• src/table.c (copied) (copied from gaycko/trunk/src/render/table.c)
• src/window.c (modified) (2 diffs)

gaycko/trunk/configure.ac

@@ -77 +77 @@
          [AC_MSG_RESULT(no)
           AC_MSG_ERROR([you need libcaca version 0.99.beta18 or later])])
-        
+
 
 XML2_INCLUDES="`xml2-config  --cflags`"
@@ -86 +86 @@
 TIDY_LIBS="-ltidy"
 V8_INCLUDES="-I${V8}/include"
-V8_LIBS="-L${V8}/ -lv8_g"
+V8_LIBS="-L${V8}/out/x64.debug/lib.target/ -lv8"
 CFLAGS="${CFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-compare -std=c99 -D_GNU_SOURCE -O0 -g -ggdb"
 

gaycko/trunk/src/Makefile.am

@@ -3 +3 @@
 bin_PROGRAMS = Gaycko
 
-Gaycko_SOURCES = gaycko.cpp        gaycko.h          \
-                 io/file.c         io/file.h         \
-                 io/http.c         io/http.h         \
-                 io/io.c           io/io.h           \
-         parsing/parse.c   parsing/parse.h   \
-         dom/dom.c         dom/dom.h         \
-         helpers/str.c     helpers/str.h     \
-         js/glue.cpp       js/glue.h         \
-         window/window.c   window/window.h   \
-                 render/renderer.c render/renderer.h \
-         render/position.c render/table.c   
-         
-Gaycko_CFLAGS  = @CACA_INCLUDES@ @XML2_INCLUDES@ @CURL_INCLUDES@ @TIDY_INCLUDES@ 
+Gaycko_SOURCES =gaycko.cpp        gaycko.h          \
+                io/file.c         io/file.h         \
+                io/http.c         io/http.h         \
+                io/io.c           io/io.h           \
+                parse.c           parse.h   \
+                dom/dom.c         dom/dom.h         \
+                helpers/str.c     helpers/str.h     \
+                js/glue.cpp       js/glue.h         \
+                window.c          window.h   \
+                renderer.c        renderer.h \
+                position.c  \
+                table.c
+
+Gaycko_CFLAGS  = @CACA_INCLUDES@ @XML2_INCLUDES@ @CURL_INCLUDES@ @TIDY_INCLUDES@
 Gaycko_CPPFLAGS=@CACA_INCLUDES@ @XML2_INCLUDES@ @CURL_INCLUDES@ @TIDY_INCLUDES@ @V8_INCLUDES@
 Gaycko_LDADD = @CACA_LIBS@ @XML2_LIBS@ @CURL_LIBS@ @TIDY_LIBS@ @V8_LIBS@

gaycko/trunk/src/gaycko.cpp

@@ -13 +13 @@
 #include "gaycko.h"
 #include "io/io.h"
-#include "parsing/parse.h"
+#include "parse.h"
 #include "js/glue.h"
-#include "render/renderer.h"
-#include "window/window.h"
+#include "renderer.h"
+#include "window.h"
 #include <caca.h>
 }

gaycko/trunk/src/renderer.h

@@ -20 +20 @@
 #include "gaycko.h"
 #include "dom/dom.h"
-#include "window/window.h"
+#include "window.h"
 
 

gaycko/trunk/src/window.c

@@ -13 +13 @@
 #include <stdlib.h>
 
-#include "window/window.h"
+#include "window.h"
 
 gWindow *gaycko_create_window(int width, int height) {
-        gWindow *window = NULL;    
+        gWindow *window = NULL;
     window = (gWindow*) malloc(sizeof(window));
-    
+
     window->dom = NULL;
     window->cv = caca_create_canvas(width, height);
@@ -27 +27 @@
 
 void gaycko_window_set_dom(gWindow *window, gDOM *dom) {
-        window->dom = dom;   
+        window->dom = dom;
 }
 
 void gaycko_destroy_window(gWindow *window) {
-        caca_free_canvas(window->cv);   
+        caca_free_canvas(window->cv);
 }