|
Lines 70-85
wince* {
a/Source/JavaScriptCore/JavaScriptCore.pri_sec1
|
| 70 |
} |
70 |
} |
| 71 |
|
71 |
|
| 72 |
|
72 |
|
| 73 |
defineTest(addJavaScriptCoreLib) { |
73 |
defineTest(prependJavaScriptCoreLib) { |
| 74 |
# Argument is the relative path to JavaScriptCore.pro's qmake output |
74 |
# Argument is the relative path to JavaScriptCore.pro's qmake output |
| 75 |
pathToJavaScriptCoreOutput = $$ARGS/$$JAVASCRIPTCORE_DESTDIR |
75 |
pathToJavaScriptCoreOutput = $$ARGS/$$JAVASCRIPTCORE_DESTDIR |
| 76 |
|
76 |
|
| 77 |
win32-msvc*|wince* { |
77 |
win32-msvc*|wince* { |
| 78 |
LIBS += -L$$pathToJavaScriptCoreOutput |
78 |
LIBS = -l$$JAVASCRIPTCORE_TARGET $$LIBS |
| 79 |
LIBS += -l$$JAVASCRIPTCORE_TARGET |
79 |
LIBS = -L$$pathToJavaScriptCoreOutput $$LIBS |
| 80 |
POST_TARGETDEPS += $${pathToJavaScriptCoreOutput}$${QMAKE_DIR_SEP}$${JAVASCRIPTCORE_TARGET}.lib |
80 |
POST_TARGETDEPS += $${pathToJavaScriptCoreOutput}$${QMAKE_DIR_SEP}$${JAVASCRIPTCORE_TARGET}.lib |
| 81 |
} else:symbian { |
81 |
} else:symbian { |
| 82 |
LIBS += -l$${JAVASCRIPTCORE_TARGET}.lib |
82 |
LIBS = -l$${JAVASCRIPTCORE_TARGET}.lib $$LIBS |
| 83 |
# The default symbian build system does not use library paths at all. However when building with |
83 |
# The default symbian build system does not use library paths at all. However when building with |
| 84 |
# qmake's symbian makespec that uses Makefiles |
84 |
# qmake's symbian makespec that uses Makefiles |
| 85 |
QMAKE_LIBDIR += $$pathToJavaScriptCoreOutput |
85 |
QMAKE_LIBDIR += $$pathToJavaScriptCoreOutput |
|
Lines 88-94
defineTest(addJavaScriptCoreLib) {
a/Source/JavaScriptCore/JavaScriptCore.pri_sec2
|
| 88 |
# Make sure jscore will be early in the list of libraries to workaround a bug in MinGW |
88 |
# Make sure jscore will be early in the list of libraries to workaround a bug in MinGW |
| 89 |
# that can't resolve symbols from QtCore if libjscore comes after. |
89 |
# that can't resolve symbols from QtCore if libjscore comes after. |
| 90 |
QMAKE_LIBDIR = $$pathToJavaScriptCoreOutput $$QMAKE_LIBDIR |
90 |
QMAKE_LIBDIR = $$pathToJavaScriptCoreOutput $$QMAKE_LIBDIR |
| 91 |
LIBS += -l$$JAVASCRIPTCORE_TARGET |
91 |
LIBS = -l$$JAVASCRIPTCORE_TARGET $$LIBS |
| 92 |
POST_TARGETDEPS += $${pathToJavaScriptCoreOutput}$${QMAKE_DIR_SEP}lib$${JAVASCRIPTCORE_TARGET}.a |
92 |
POST_TARGETDEPS += $${pathToJavaScriptCoreOutput}$${QMAKE_DIR_SEP}lib$${JAVASCRIPTCORE_TARGET}.a |
| 93 |
} |
93 |
} |
| 94 |
|
94 |
|