embed separately from js_internal

DesktopEditor/doctrenderer/docbuilder_p.h

@@ -46,9 +46,9 @@
 #include "../../Common/OfficeFileFormatChecker.h"
 
 #include "js_internal/js_base.h"
-#include "js_internal/embed/NativeBuilderEmbed.h"
-#include "js_internal/embed/NativeControlEmbed.h"
-#include "js_internal/embed/MemoryStreamEmbed.h"
+#include "embed/NativeBuilderEmbed.h"
+#include "embed/NativeControlEmbed.h"
+#include "embed/MemoryStreamEmbed.h"
 
 #ifdef LINUX
 #include <unistd.h>

DesktopEditor/doctrenderer/doctrenderer.cpp

@@ -36,8 +36,8 @@
 #undef BOOL
 #endif
 
-#include "js_internal/embed/NativeControlEmbed.h"
-#include "js_internal/embed/MemoryStreamEmbed.h"
+#include "embed/NativeControlEmbed.h"
+#include "embed/MemoryStreamEmbed.h"
 
 #include "../xml/include/xmlutils.h"
 

DesktopEditor/doctrenderer/doctrenderer.pro

@@ -62,22 +62,22 @@ HEADERS += \
     graphics.h
 
 HEADERS += \
-    js_internal/embed/GraphicsEmbed.h \
-    js_internal/embed/MemoryStreamEmbed.h \
-    js_internal/embed/NativeControlEmbed.h \
-    js_internal/embed/NativeBuilderEmbed.h \
+    embed/GraphicsEmbed.h \
+    embed/MemoryStreamEmbed.h \
+    embed/NativeControlEmbed.h \
+    embed/NativeBuilderEmbed.h \
     js_internal/js_base.h \
     js_internal/v8/v8_base.h
 
 SOURCES += \
-    js_internal/embed/GraphicsEmbed.cpp \
-    js_internal/embed/MemoryStreamEmbed.cpp \
-    js_internal/embed/NativeControlEmbed.cpp \
-    js_internal/embed/NativeBuilderEmbed.cpp \
-    js_internal/embed/v8/v8_Graphics.cpp \
-    js_internal/embed/v8/v8_MemoryStream.cpp \
-    js_internal/embed/v8/v8_NativeControl.cpp \
-    js_internal/embed/v8/v8_NativeBuilder.cpp \
+    embed/GraphicsEmbed.cpp \
+    embed/MemoryStreamEmbed.cpp \
+    embed/NativeControlEmbed.cpp \
+    embed/NativeBuilderEmbed.cpp \
+    embed/v8/v8_Graphics.cpp \
+    embed/v8/v8_MemoryStream.cpp \
+    embed/v8/v8_NativeControl.cpp \
+    embed/v8/v8_NativeBuilder.cpp \
     js_internal/v8/v8_base.cpp
 }
 

DesktopEditor/doctrenderer/embed/GraphicsEmbed.h

@@ -1,8 +1,8 @@
 #ifndef _BUILD_NATIVE_GRAPHICS_EMBED_H_
 #define _BUILD_NATIVE_GRAPHICS_EMBED_H_
 
-#include "../../graphics.h"
-#include "../js_base.h"
+#include "../graphics.h"
+#include "../js_internal/js_base.h"
 
 using namespace NSJSBase;
 class CGraphicsEmbed : public CJSEmbedObject

DesktopEditor/doctrenderer/embed/MemoryStreamEmbed.h

@@ -1,8 +1,8 @@
 #ifndef _BUILD_NATIVE_MEMORYSTREAM_EMBED_H_
 #define _BUILD_NATIVE_MEMORYSTREAM_EMBED_H_
 
-#include "../../memorystream.h"
-#include "../js_base.h"
+#include "../memorystream.h"
+#include "../js_internal/js_base.h"
 
 using namespace NSJSBase;
 class CMemoryStreamEmbed : public CJSEmbedObject

DesktopEditor/doctrenderer/embed/NativeBuilderEmbed.cpp

@@ -1,7 +1,7 @@
 #include "NativeBuilderEmbed.h"
 
-#include "../../../common/Directory.h"
-#include "../../../fontengine/application_generate_fonts_common.h"
+#include "../../common/Directory.h"
+#include "../../fontengine/application_generate_fonts_common.h"
 
 JSSmart<CJSValue> CBuilderEmbed::builder_OpenFile(JSSmart<CJSValue> sPath, JSSmart<CJSValue> sParams)
 {

DesktopEditor/doctrenderer/embed/NativeBuilderEmbed.h

@@ -32,8 +32,8 @@
 #ifndef NATIVECONTROLBUILDER
 #define NATIVECONTROLBUILDER
 
-#include "../../docbuilder.h"
-#include "../js_base.h"
+#include "../docbuilder.h"
+#include "../js_internal/js_base.h"
 
 using namespace NSJSBase;
 class CBuilderEmbed : public CJSEmbedObject

DesktopEditor/doctrenderer/embed/NativeControlEmbed.h

@@ -1,8 +1,8 @@
 #ifndef _BUILD_NATIVE_NATIVECONTROL_EMBED_H_
 #define _BUILD_NATIVE_NATIVECONTROL_EMBED_H_
 
-#include "../../nativecontrol.h"
-#include "../js_base.h"
+#include "../nativecontrol.h"
+#include "../js_internal/js_base.h"
 
 using namespace NSJSBase;
 class CNativeControlEmbed : public CJSEmbedObject

DesktopEditor/doctrenderer/embed/v8/v8_Graphics.cpp

@@ -1,5 +1,5 @@
 #include "../GraphicsEmbed.h"
-#include "../../v8/v8_base.h"
+#include "../../js_internal/v8/v8_base.h"
 
 #define PROPERTY_GET(NAME, NAME_EMBED, TYPE)                                                               \
     void NAME(v8::Local<v8::String> _name, const v8::PropertyCallbackInfo<v8::Value>& info)                \

DesktopEditor/doctrenderer/embed/v8/v8_MemoryStream.cpp

@@ -1,5 +1,5 @@
 #include "../MemoryStreamEmbed.h"
-#include "../../v8/v8_base.h"
+#include "../../js_internal/v8/v8_base.h"
 
 namespace NSMemoryStream
 {

DesktopEditor/doctrenderer/embed/v8/v8_NativeBuilder.cpp

@@ -30,8 +30,8 @@
  *
  */
 #include "../NativeBuilderEmbed.h"
-#include "../../../docbuilder_p.h"
-#include "../../v8/v8_base.h"
+#include "../../docbuilder_p.h"
+#include "../../js_internal/v8/v8_base.h"
 
 void CBuilderDocumentEmbed::OpenFile(const std::wstring& sFile, const std::wstring& sParams)
 {

DesktopEditor/doctrenderer/embed/v8/v8_NativeControl.cpp

@@ -1,5 +1,5 @@
 #include "../NativeControlEmbed.h"
-#include "../../v8/v8_base.h"
+#include "../../js_internal/v8/v8_base.h"
 
 namespace NSNativeControl
 {