From 42b7d0723d49dd1f5470b8342e43f3bb6b2da39a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8A=B2=E9=B9=8F?= <jingpeng.wang@outlook.com>
Date: Wed, 7 Apr 2021 09:43:35 +0800
Subject: [PATCH] mac compile pass

---
 doric-Qt/.gitignore                      |  4 ++-
 doric-Qt/doric/doric.pro                 | 36 ++++++++++++++++++------
 doric-Qt/doric/engine/v8/JSValueHelper.h |  2 +-
 doric-Qt/doric/engine/v8/V8Executor.h    |  2 +-
 4 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/doric-Qt/.gitignore b/doric-Qt/.gitignore
index 9a73525d..57541322 100644
--- a/doric-Qt/.gitignore
+++ b/doric-Qt/.gitignore
@@ -1,2 +1,4 @@
 /build-doric-*/
-.DS_Store
\ No newline at end of file
+.DS_Store
+/doric/library/v8/darwin/release/libv8_monolith.a
+/doric/library/v8/win32/release/v8_monolith.lib
\ No newline at end of file
diff --git a/doric-Qt/doric/doric.pro b/doric-Qt/doric/doric.pro
index abb41e6d..63799b88 100644
--- a/doric-Qt/doric/doric.pro
+++ b/doric-Qt/doric/doric.pro
@@ -138,20 +138,38 @@ HEADERS += \
     yoga/internal/experiments.h \
     yoga/log.h
 
-LIBS += -lwinmm
-LIBS += -lAdvapi32
-LIBS += -lDbghelp
-
-INCLUDEPATH += $$PWD/v8
-
-LIBS += -L$$PWD/library/v8/release/
-LIBS += -lv8_monolith
-
 win32:CONFIG(debug, debug|release): {
     QMAKE_CFLAGS_DEBUG += -MT
     QMAKE_CXXFLAGS_DEBUG += -MT
+
+    LIBS += -lwinmm
+    LIBS += -lAdvapi32
+    LIBS += -lDbghelp
+
+    INCLUDEPATH += $$PWD/library/v8/win32/include
+
+    LIBS += -L$$PWD/library/v8/win32/release/
+    LIBS += -lv8_monolith
 }
 else:win32:CONFIG(release, debug|release): {
     QMAKE_CFLAGS_RELEASE += -MT
     QMAKE_CXXFLAGS_RELEASE += -MT
+
+    LIBS += -lwinmm
+    LIBS += -lAdvapi32
+    LIBS += -lDbghelp
+
+    INCLUDEPATH += $$PWD/library/v8/win32/include
+
+    LIBS += -L$$PWD/library/v8/win32/release/
+    LIBS += -lv8_monolith
+}
+else:unix: {
+    QMAKE_CFLAGS_RELEASE += -MT
+    QMAKE_CXXFLAGS_RELEASE += -MT
+
+    INCLUDEPATH += $$PWD/library/v8/darwin/include
+
+    LIBS += -L$$PWD/library/v8/darwin/release/
+    LIBS += -lv8_monolith
 }
diff --git a/doric-Qt/doric/engine/v8/JSValueHelper.h b/doric-Qt/doric/engine/v8/JSValueHelper.h
index 8a4acfe6..6bae3df4 100644
--- a/doric-Qt/doric/engine/v8/JSValueHelper.h
+++ b/doric-Qt/doric/engine/v8/JSValueHelper.h
@@ -4,7 +4,7 @@
 #include <QVariant>
 #include <string>
 
-#include "v8/v8.h"
+#include "v8.h"
 
 #define NewV8String(name)                                                      \
   v8::String::NewFromUtf8(v8::Isolate::GetCurrent(), name,                     \
diff --git a/doric-Qt/doric/engine/v8/V8Executor.h b/doric-Qt/doric/engine/v8/V8Executor.h
index af360fc2..0037bab0 100644
--- a/doric-Qt/doric/engine/v8/V8Executor.h
+++ b/doric-Qt/doric/engine/v8/V8Executor.h
@@ -2,7 +2,7 @@
 #define V8EXECUTOR_H
 
 #include "libplatform/libplatform.h"
-#include "v8/v8.h"
+#include "v8.h"
 
 #include <QMap>
 #include <QObject>