| 1 |
--- java-1.8.0-openjfx-1.8.0.102/modules/web/src/main/native/Source/WebCore/TargetJava.pri~ 2016-09-11 22:26:17.000000000 +0200 |
| 2 |
+++ java-1.8.0-openjfx-1.8.0.102/modules/web/src/main/native/Source/WebCore/TargetJava.pri 2016-09-14 11:54:23.958821974 +0200 |
| 3 |
@@ -171,7 +171,7 @@ |
| 4 |
} |
| 5 |
|
| 6 |
# INCLUDEPATH += $(WEBKIT_OUTPUTDIR)/import/include # defined in WebKitJava.pri |
| 7 |
-LIBS += -L$(WEBKIT_OUTPUTDIR)/import/lib -lsqlite3 |
| 8 |
+LIBS += -lsqlite3 |
| 9 |
|
| 10 |
# The following line ensures that __STDC_FORMAT_MACROS is defined when |
| 11 |
# <inttypes.h> is included in the precompiled header. Note that the file |
| 12 |
@@ -229,9 +229,9 @@ |
| 13 |
# just for build debug: force verboce output from linker |
| 14 |
QMAKE_LFLAGS += -Wl,--verbose |
| 15 |
|
| 16 |
- # statically link with icu libraries in order to avoid version conflict |
| 17 |
+ # link with icu libraries |
| 18 |
QMAKE_LFLAGS += `pkg-config --libs-only-L icu-uc` |
| 19 |
- LIBS += -Wl,-Bstatic -licui18n -licuuc -licudata -Wl,-Bdynamic |
| 20 |
+ LIBS += -licui18n -licuuc -licudata -ldl |
| 21 |
} |
| 22 |
solaris-cc { |
| 23 |
QMAKE_LFLAGS += -M$$PWD/mapfile-vers |
| 24 |
--- java-1.8.0-openjfx-1.8.0.102/modules/web/src/main/native/Source/JavaScriptCore/LLIntOffsetsExtractor.pro~ 2016-09-11 22:26:21.000000000 +0200 |
| 25 |
+++ java-1.8.0-openjfx-1.8.0.102/modules/web/src/main/native/Source/JavaScriptCore/LLIntOffsetsExtractor.pro 2016-09-14 13:26:30.612313707 +0200 |
| 26 |
@@ -29,8 +29,7 @@ |
| 27 |
|
| 28 |
linux* { |
| 29 |
INCLUDEPATH += \ |
| 30 |
- $(JAVA_HOME)/include/linux \ |
| 31 |
- $(WEBKIT_OUTPUTDIR)/import/include |
| 32 |
+ $(JAVA_HOME)/include/linux |
| 33 |
} |
| 34 |
|
| 35 |
win* { |
| 36 |
@@ -92,7 +91,6 @@ |
| 37 |
$$PWD/dfg \ |
| 38 |
$$PWD/debugger \ |
| 39 |
$$PWD/ForwardingHeaders \ |
| 40 |
- $(WEBKIT_OUTPUTDIR)/import/include/icu \ |
| 41 |
$(JAVA_HOME)/include |
| 42 |
|
| 43 |
LLINT_DEPENDENCY = $$PWD/offlineasm/generate_offset_extractor.rb |
| 44 |
--- java-1.8.0-openjfx-1.8.0.102/modules/web/src/main/native/Source/WebKitJava.pri~ 2016-09-11 22:26:18.000000000 +0200 |
| 45 |
+++ java-1.8.0-openjfx-1.8.0.102/modules/web/src/main/native/Source/WebKitJava.pri 2016-09-14 13:27:10.077159836 +0200 |
| 46 |
@@ -49,8 +49,7 @@ |
| 47 |
|
| 48 |
linux-* { |
| 49 |
INCLUDEPATH += \ |
| 50 |
- $(JAVA_HOME)/include/linux \ |
| 51 |
- $(WEBKIT_OUTPUTDIR)/import/include |
| 52 |
+ $(JAVA_HOME)/include/linux |
| 53 |
} |
| 54 |
|
| 55 |
solaris-* { |
| 56 |
--- java-1.8.0-openjfx-1.8.0.102/modules/web/src/main/native/Tools/DumpRenderTree/DumpRenderTreeJava.pro~ 2016-09-11 22:26:18.000000000 +0200 |
| 57 |
+++ java-1.8.0-openjfx-1.8.0.102/modules/web/src/main/native/Tools/DumpRenderTree/DumpRenderTreeJava.pro 2016-09-14 13:27:20.982393644 +0200 |
| 58 |
@@ -73,11 +73,6 @@ |
| 59 |
$(WEBKIT_OUTPUTDIR)/import/include/icu |
| 60 |
} |
| 61 |
|
| 62 |
-linux-* { |
| 63 |
- INCLUDEPATH += \ |
| 64 |
- $(WEBKIT_OUTPUTDIR)/import/include |
| 65 |
-} |
| 66 |
- |
| 67 |
mac* { |
| 68 |
LIBS += -lc++ -lobjc -framework AppKit |
| 69 |
} |
Parent Directory
| 
Revision Log