1 |
Index: b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile |
2 |
=================================================================== |
3 |
--- a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile |
4 |
+++ b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile |
5 |
@@ -55,11 +55,6 @@ INCLUDES += $(shell pkg-config --cflags |
6 |
LDFLAGS += $(shell pkg-config --libs libavcodec libavformat) |
7 |
endif |
8 |
|
9 |
-ifeq ($(ARCH), x32) |
10 |
- CFLAGS += -m32 |
11 |
- LDFLAGS += -m32 |
12 |
-endif |
13 |
- |
14 |
SOURCES = av/fxavcodecplugin.c \ |
15 |
av/avelement.c \ |
16 |
av/decoder.c \ |
17 |
Index: b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile |
18 |
=================================================================== |
19 |
--- a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile |
20 |
+++ b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile |
21 |
@@ -45,11 +45,6 @@ PACKAGES_LIBS := $(shell pkg-config --li |
22 |
|
23 |
LDFLAGS = -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) |
24 |
|
25 |
-ifeq ($(ARCH), x32) |
26 |
- CFLAGS += -m32 |
27 |
- LDFLAGS += -m32 |
28 |
-endif |
29 |
- |
30 |
SOURCES = fxplugins.c \ |
31 |
progressbuffer/progressbuffer.c \ |
32 |
progressbuffer/hlsprogressbuffer.c \ |
33 |
Index: b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile |
34 |
=================================================================== |
35 |
--- a/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile |
36 |
+++ b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile |
37 |
@@ -70,11 +70,6 @@ PACKAGES_LIBS := $(shell pkg-config --li |
38 |
|
39 |
LDFLAGS = -L$(BUILD_DIR) -lm $(PACKAGES_LIBS) |
40 |
|
41 |
-ifeq ($(ARCH), x32) |
42 |
- CFLAGS += -m32 |
43 |
- LDFLAGS += -m32 |
44 |
-endif |
45 |
- |
46 |
SOURCES = \ |
47 |
gstreamer/gst/gst.c \ |
48 |
gstreamer/gst/gstbin.c \ |
49 |
Index: b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile |
50 |
=================================================================== |
51 |
--- a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile |
52 |
+++ b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile |
53 |
@@ -67,11 +67,6 @@ CFLAGS += -g -Wall -D_DEBUG |
54 |
CFLAGS += -g -Wall -D_DEBUG |
55 |
endif |
56 |
|
57 |
-ifeq ($(ARCH), x32) |
58 |
- CFLAGS += -m32 |
59 |
- LDFLAGS += -m32 |
60 |
-endif |
61 |
- |
62 |
CPP_SOURCES = \ |
63 |
jni/com_sun_media_jfxmedia_logging_Logger.cpp \ |
64 |
jni/JavaBandsHolder.cpp \ |
65 |
Index: b/buildSrc/linux.gradle |
66 |
=================================================================== |
67 |
--- a/buildSrc/linux.gradle |
68 |
+++ b/buildSrc/linux.gradle |
69 |
@@ -48,10 +48,6 @@ def commonFlags = [ |
70 |
"-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags |
71 |
"-W", "-Wall", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration"] // warning flags |
72 |
|
73 |
-if (!IS_64) { |
74 |
- commonFlags += "-m32" |
75 |
-} |
76 |
- |
77 |
// Specify the compilation parameters and link parameters |
78 |
def ccFlags = [ |
79 |
commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c", |
80 |
@@ -179,20 +175,12 @@ LINUX.launcher.compiler = compiler |
81 |
LINUX.launcher.ccFlags = ["-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c"] |
82 |
LINUX.launcher.linker = linker |
83 |
LINUX.launcher.linkFlags = ["-ldl"] |
84 |
-if (!IS_64) { |
85 |
- LINUX.launcher.ccFlags += "-m32" |
86 |
- LINUX.launcher.linkFlags += "-m32" |
87 |
-} |
88 |
|
89 |
LINUX.launcherlibrary = [:] |
90 |
LINUX.launcherlibrary.compiler = compiler |
91 |
LINUX.launcherlibrary.ccFlags = ["-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c", "-fPIC"] |
92 |
LINUX.launcherlibrary.linker = linker |
93 |
LINUX.launcherlibrary.linkFlags = ["-ldl", "-lpthread", "-shared"] |
94 |
-if (!IS_64) { |
95 |
- LINUX.launcherlibrary.ccFlags += "-m32" |
96 |
- LINUX.launcherlibrary.linkFlags += "-m32" |
97 |
-} |
98 |
|
99 |
LINUX.iio = [:] |
100 |
LINUX.iio.javahInclude = ["com/sun/javafx/iio/**/*"] |