mac compile pass

This commit is contained in:
王劲鹏 2021-04-07 09:43:35 +08:00 committed by osborn
parent 0b5d9d69c7
commit 42b7d0723d
4 changed files with 32 additions and 12 deletions

4
doric-Qt/.gitignore vendored
View File

@ -1,2 +1,4 @@
/build-doric-*/ /build-doric-*/
.DS_Store .DS_Store
/doric/library/v8/darwin/release/libv8_monolith.a
/doric/library/v8/win32/release/v8_monolith.lib

View File

@ -138,20 +138,38 @@ HEADERS += \
yoga/internal/experiments.h \ yoga/internal/experiments.h \
yoga/log.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): { win32:CONFIG(debug, debug|release): {
QMAKE_CFLAGS_DEBUG += -MT QMAKE_CFLAGS_DEBUG += -MT
QMAKE_CXXFLAGS_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): { else:win32:CONFIG(release, debug|release): {
QMAKE_CFLAGS_RELEASE += -MT QMAKE_CFLAGS_RELEASE += -MT
QMAKE_CXXFLAGS_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
} }

View File

@ -4,7 +4,7 @@
#include <QVariant> #include <QVariant>
#include <string> #include <string>
#include "v8/v8.h" #include "v8.h"
#define NewV8String(name) \ #define NewV8String(name) \
v8::String::NewFromUtf8(v8::Isolate::GetCurrent(), name, \ v8::String::NewFromUtf8(v8::Isolate::GetCurrent(), name, \

View File

@ -2,7 +2,7 @@
#define V8EXECUTOR_H #define V8EXECUTOR_H
#include "libplatform/libplatform.h" #include "libplatform/libplatform.h"
#include "v8/v8.h" #include "v8.h"
#include <QMap> #include <QMap>
#include <QObject> #include <QObject>