Lines 1-129
Link Here
|
1 |
--- make_freebsd.mak.orig 2018-03-01 07:35:22.000000000 +0100 |
|
|
2 |
+++ make_freebsd.mak 2018-06-27 11:33:21.105457000 +0200 |
3 |
@@ -9,7 +9,7 @@ |
4 |
# IBM Corporation - initial API and implementation |
5 |
#******************************************************************************* |
6 |
|
7 |
-# Makefile for creating SWT libraries for Linux GTK |
8 |
+# Makefile for creating SWT libraries for FreeBSD GTK |
9 |
|
10 |
include make_common.mak |
11 |
|
12 |
@@ -43,7 +43,7 @@ |
13 |
|
14 |
# Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) |
15 |
GTKCFLAGS = `pkg-config --cflags gtk+-2.0 gtk+-unix-print-$(GTK_VERSION)` |
16 |
-GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L/usr/X11R6/lib $(XLIB64) -lXtst |
17 |
+GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(LOCALBASE)/lib $(XLIB64) -lXtst |
18 |
|
19 |
AWT_LFLAGS = -shared |
20 |
AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt |
21 |
@@ -51,7 +51,8 @@ |
22 |
ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0 gtk+-unix-print-$(GTK_VERSION)` |
23 |
ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0 |
24 |
|
25 |
-GLXLIBS = -L/usr/X11R6/lib -lGL -lGLU -lm |
26 |
+GLXCFLAGS = -I$(LOCALBASE)/include |
27 |
+GLXLIBS = -L$(LOCALBASE)/lib -lGL -lGLU -lm |
28 |
|
29 |
# Uncomment for Native Stats tool |
30 |
#NATIVE_STATS = -DNATIVE_STATS |
31 |
@@ -70,14 +71,24 @@ |
32 |
-I$(JAVA_HOME)/include/freebsd \ |
33 |
${SWT_PTR_CFLAGS} |
34 |
MOZILLALFLAGS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic |
35 |
- |
36 |
+MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \ |
37 |
+ -DNO__1XPCOMGlueStartup \ |
38 |
+ -DNO__1XPCOMGlueLoadXULFunctions \ |
39 |
+ -DNO_memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I \ |
40 |
+ -DNO_memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J \ |
41 |
+ -DNO_nsDynamicFunctionLoad_1sizeof \ |
42 |
+ -DNO__1Call__IIIIII \ |
43 |
+ -DNO__1Call__JJJJJI \ |
44 |
+ -DNO_nsDynamicFunctionLoad |
45 |
+XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2 |
46 |
+ |
47 |
SWT_OBJECTS = swt.o c.o c_stats.o callback.o |
48 |
AWT_OBJECTS = swt_awt.o |
49 |
SWTPI_OBJECTS = swt.o os.o os_structs.o os_custom.o os_stats.o |
50 |
CAIRO_OBJECTS = swt.o cairo.o cairo_structs.o cairo_stats.o |
51 |
ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o |
52 |
MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o |
53 |
-XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o xpcomxulglue.o xpcomxulglue_stats.o |
54 |
+XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o |
55 |
XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o |
56 |
GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o |
57 |
|
58 |
@@ -85,17 +96,18 @@ |
59 |
-DSWT_VERSION=$(SWT_VERSION) \ |
60 |
$(NATIVE_STATS) \ |
61 |
-DFREEBSD -DGTK \ |
62 |
+ -I$(LOCALBASE)/include \ |
63 |
-I$(JAVA_HOME)/include \ |
64 |
-I$(JAVA_HOME)/include/freebsd \ |
65 |
-fPIC \ |
66 |
${SWT_PTR_CFLAGS} |
67 |
LFLAGS = -shared -fPIC |
68 |
|
69 |
-ifndef NO_STRIP |
70 |
- AWT_LFLAGS := $(AWT_LFLAGS) -s |
71 |
- MOZILLALFLAGS := $(MOZILLALFLAGS) -s |
72 |
- LFLAGS := $(LFLAGS) -s |
73 |
-endif |
74 |
+.ifndef NO_STRIP |
75 |
+AWT_LFLAGS := $(AWT_LFLAGS) -s |
76 |
+MOZILLALFLAGS := $(MOZILLALFLAGS) -s |
77 |
+LFLAGS := $(LFLAGS) -s |
78 |
+.endif |
79 |
|
80 |
all: make_swt make_atk make_glx |
81 |
|
82 |
@@ -173,16 +185,16 @@ |
83 |
$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS} |
84 |
|
85 |
xpcom.o: xpcom.cpp |
86 |
- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp |
87 |
+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp |
88 |
|
89 |
xpcom_structs.o: xpcom_structs.cpp |
90 |
- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp |
91 |
+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp |
92 |
|
93 |
xpcom_custom.o: xpcom_custom.cpp |
94 |
- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp |
95 |
+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp |
96 |
|
97 |
xpcom_stats.o: xpcom_stats.cpp |
98 |
- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp |
99 |
+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp |
100 |
|
101 |
# |
102 |
# XULRunner lib |
103 |
@@ -193,22 +205,16 @@ |
104 |
$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} |
105 |
|
106 |
xpcomxul.o: xpcom.cpp |
107 |
- $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp |
108 |
+ $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp |
109 |
|
110 |
xpcomxul_structs.o: xpcom_structs.cpp |
111 |
- $(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp |
112 |
+ $(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp |
113 |
|
114 |
xpcomxul_custom.o: xpcom_custom.cpp |
115 |
- $(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp |
116 |
+ $(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp |
117 |
|
118 |
xpcomxul_stats.o: xpcom_stats.cpp |
119 |
- $(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp |
120 |
- |
121 |
-xpcomxulglue.o: xpcomglue.cpp |
122 |
- $(CXX) -o xpcomxulglue.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcomglue.cpp |
123 |
- |
124 |
-xpcomxulglue_stats.o: xpcomglue_stats.cpp |
125 |
- $(CXX) -o xpcomxulglue_stats.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcomglue_stats.cpp |
126 |
+ $(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp |
127 |
|
128 |
# |
129 |
# XPCOMInit lib |