Merge pull request #29 from knocknote/feature/remove-undefined-symbol…

…-warning More easily to use libhtml5 library
blastrain · Jul 12, 2019 · 75f2c83 · 75f2c83
2 parents e4cf556 + b973695
commit 75f2c83
Show file tree

Hide file tree

Showing 89 changed files with 582 additions and 601 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -132,7 +132,7 @@ set(SOURCES src/application_cache.cc
 
 if ($ENV{ENABLE_EMSCRIPTEN})
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Oz -g -std=c++11 --memory-init-file 0 --llvm-lto 1 --bind -s DEMANGLE_SUPPORT=1 -s WASM=0 -s NO_FILESYSTEM=1 -DENABLE_EMSCRIPTEN=1 -DPROPERTY_TRACE=1")
-   add_library(html5 STATIC bind.cc ${SOURCES})
+   add_library(html5 STATIC ${SOURCES})
 else()
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -g -std=c++11")
    add_library(html5 STATIC ${SOURCES})

diff --git a/bind.cc b/bind.cc
diff --git a/examples/array.cc b/examples/array.cc
@@ -1,11 +1,8 @@
 #include "libhtml5.h"
-#include "class.h"
 #include <math.h>
 
 static void arrayTest()
 {
-    HTML5_INIT();
-
     html5::array subarray;
     html5::array array = {
         1, M_PI, "hello", subarray, html5::Object::create(),

diff --git a/examples/image.cc b/examples/image.cc
@@ -1,17 +1,15 @@
 #include "libhtml5.h"
-#include "class.h"
 #include <iostream>
 
 static void createImage(std::string url)
 {
-    HTML5_INIT();
     for (html5::StyleSheet *sheet : *html5::window->document->styleSheets) {
         html5::window->console->log(sheet);
     }
     html5::HTMLImageElement *image = html5::HTMLImageElement::create();
     static html5::EventHandler onload = [image](html5::Event *e){
-        html5::window->console->trace();
         std::cout << "callback. onload" << std::endl;
+        html5::window->console->trace();
         std::cout << "width = " << image->width << std::endl;
         std::cout << "height = " << image->height << std::endl;
         std::cout << "naturalWidth = " << image->naturalWidth << std::endl;

diff --git a/examples/promise.cc b/examples/promise.cc
@@ -1,10 +1,7 @@
 #include "libhtml5.h"
-#include "class.h"
 
 static void promiseTest()
 {
-    HTML5_INIT();
-
     auto promise = html5::Promise::create([](std::function<void(const std::string &)> resolve, std::function<void()> reject) {
         html5::window->setTimeout([resolve](){ resolve("foo"); }, 300);
     });
@@ -20,7 +17,6 @@ static void promiseTest()
 
 static void fetchImageTest(const std::string &imageURL)
 {
-    HTML5_INIT();
     html5::fetch(imageURL)->then<html5::Response *>([](html5::Response *response) {
         return response->blob();
     })->then<html5::Blob *>([](html5::Blob *blob) {

diff --git a/examples/string.cc b/examples/string.cc
@@ -1,10 +1,7 @@
 #include "libhtml5.h"
-#include "class.h"
 
 static void stringTest()
 {
-    HTML5_INIT();
-
     {
         html5::string s = "hello world";
         std::cout << s << std::endl;

diff --git a/examples/style_sheet.cc b/examples/style_sheet.cc
@@ -1,12 +1,9 @@
 #include "libhtml5.h"
-#include "class.h"
 #include <iostream>
 
 using namespace html5;
 
 static void addStyleSheet() {
-    HTML5_INIT();
-
     auto document = window->document;
     auto sheets = window->document->styleSheets;
     if (sheets->length == 0) {

diff --git a/examples/test_exec.cc b/examples/test_exec.cc
@@ -1,5 +1,4 @@
 #include "libhtml5.h"
-#include "class.h"
 
 #include "image.cc"
 #include "style_sheet.cc"

diff --git a/examples/video.cc b/examples/video.cc
@@ -1,10 +1,8 @@
 #include "libhtml5.h"
-#include "class.h"
 #include <iostream>
 
 static void createVideo(std::string url)
 {
-    HTML5_INIT();
     html5::HTMLVideoElement *video   = html5::HTMLVideoElement::create();
     html5::HTMLSourceElement *source = html5::HTMLSourceElement::create();
     source->src = url;

diff --git a/include/array_buffer.h b/include/array_buffer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "libhtml5.h"
+#include "html5.h"
 
 NAMESPACE_HTML5_BEGIN;
 

diff --git a/include/array_buffer_view.h b/include/array_buffer_view.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "libhtml5.h"
+#include "html5.h"
 
 NAMESPACE_HTML5_BEGIN;
 

diff --git a/include/attr.h b/include/attr.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "libhtml5.h"
+#include "html5.h"
 
 NAMESPACE_HTML5_BEGIN;
 

diff --git a/include/audio_track.h b/include/audio_track.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "libhtml5.h"
+#include "html5.h"
 
 NAMESPACE_HTML5_BEGIN;
 

diff --git a/include/auto_release_pool.h b/include/auto_release_pool.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "libhtml5.h"
+#include "html5.h"
 #include <vector>
 
 NAMESPACE_HTML5_BEGIN;

diff --git a/include/bar_prop.h b/include/bar_prop.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "libhtml5.h"
+#include "html5.h"
 
 NAMESPACE_HTML5_BEGIN;
 

diff --git a/include/blob.h b/include/blob.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "libhtml5.h"
+#include "html5.h"
 
 NAMESPACE_HTML5_BEGIN;
 

diff --git a/include/canvas_gradient.h b/include/canvas_gradient.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "libhtml5.h"
+#include "html5.h"
 
 NAMESPACE_HTML5_BEGIN;
 

diff --git a/include/canvas_pattern.h b/include/canvas_pattern.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "libhtml5.h"
+#include "html5.h"
 
 NAMESPACE_HTML5_BEGIN;
 

diff --git a/include/console.h b/include/console.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "libhtml5.h"
+#include "html5.h"
 #include "html5_string.h"
 #include "array.h"
 

diff --git a/include/css_rule.h b/include/css_rule.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "libhtml5.h"
+#include "html5.h"
 
 NAMESPACE_HTML5_BEGIN;
 

diff --git a/include/css_rule_list.h b/include/css_rule_list.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "libhtml5.h"
+#include "html5.h"
 
 NAMESPACE_HTML5_BEGIN;
 

diff --git a/include/css_style_declaration.h b/include/css_style_declaration.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "libhtml5.h"
+#include "html5.h"
 
 NAMESPACE_HTML5_BEGIN;
 

diff --git a/include/date.h b/include/date.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "libhtml5.h"
+#include "html5.h"
 
 NAMESPACE_HTML5_BEGIN;
 

diff --git a/include/document.h b/include/document.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "libhtml5.h"
+#include "html5.h"
 #include "node.h"
 
 NAMESPACE_HTML5_BEGIN;

diff --git a/include/document_type.h b/include/document_type.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "libhtml5.h"
+#include "html5.h"
 
 NAMESPACE_HTML5_BEGIN;
 

diff --git a/include/dom_error.h b/include/dom_error.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "libhtml5.h"
+#include "html5.h"
 
 NAMESPACE_HTML5_BEGIN;
 

diff --git a/include/dom_implementation.h b/include/dom_implementation.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "libhtml5.h"
+#include "html5.h"
 
 NAMESPACE_HTML5_BEGIN;
 

diff --git a/include/dom_token_list.h b/include/dom_token_list.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "libhtml5.h"
+#include "html5.h"
 #include <vector>
 
 NAMESPACE_HTML5_BEGIN;

diff --git a/include/event.h b/include/event.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "libhtml5.h"
+#include "html5.h"
 #include <time.h>
 
 NAMESPACE_HTML5_BEGIN;

diff --git a/include/event_target.h b/include/event_target.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "libhtml5.h"
+#include "html5.h"
 
 #include <functional>
 #include <map>

diff --git a/include/export.h b/include/export.h
@@ -33,8 +33,6 @@ class Performance;
 class WindowProxy;
 class Console;
 
-extern Window *window;
-
 extern void alert(std::string message);
 extern std::string atob(std::string atob);
 extern void blur();
@@ -65,5 +63,3 @@ extern long setTimeout(std::function<void(void)> *handler, long timeout);
 extern void stop();
 
 NAMESPACE_HTML5_END;
-
-extern void HTML5_INIT();
diff --git a/include/external.h b/include/external.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "libhtml5.h"
+#include "html5.h"
 
 NAMESPACE_HTML5_BEGIN;
 

diff --git a/include/history.h b/include/history.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "libhtml5.h"
+#include "html5.h"
 
 NAMESPACE_HTML5_BEGIN;
 

diff --git a/include/hit_region_options.h b/include/hit_region_options.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "libhtml5.h"
+#include "html5.h"
 #include "canvas_fill_rule.h"
 
 NAMESPACE_HTML5_BEGIN;