aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile1
-rwxr-xr-xconfigure5
-rw-r--r--plugins/dfxvideo/Makefile2
-rw-r--r--plugins/gpulib/gpulib.mak2
4 files changed, 6 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 833dddc..e904128 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,7 @@ endif
-include Makefile.local
CC_LINK = $(CC)
+LDFLAGS += $(MAIN_LDFLAGS)
LDLIBS += $(MAIN_LDLIBS)
# core
diff --git a/configure b/configure
index c7e7caf..0f0308b 100755
--- a/configure
+++ b/configure
@@ -274,7 +274,7 @@ maemo)
;;
libretro)
CFLAGS="$CFLAGS -fPIC"
- LDFLAGS="$LDFLAGS -shared"
+ MAIN_LDFLAGS="$MAIN_LDFLAGS -shared -Wl,--no-undefined"
;;
esac
@@ -427,7 +427,7 @@ echo "plugins $plugins_short"
echo "C compiler $CC"
echo "C compiler flags $CFLAGS"
echo "libraries $MAIN_LDLIBS"
-echo "linker flags $LDFLAGS"
+echo "linker flags $LDFLAGS$MAIN_LDFLAGS"
echo "enable dynarec $enable_dynarec"
echo "ARMv7 optimizations $have_armv7"
echo "enable ARM NEON $have_arm_neon"
@@ -444,6 +444,7 @@ echo "AS = $AS" >> $config_mak
echo "CFLAGS += $CFLAGS" >> $config_mak
echo "ASFLAGS += $ASFLAGS" >> $config_mak
echo "LDFLAGS += $LDFLAGS" >> $config_mak
+echo "MAIN_LDFLAGS += $MAIN_LDFLAGS" >> $config_mak
echo "MAIN_LDLIBS += $MAIN_LDLIBS" >> $config_mak
echo "PLUGIN_CFLAGS += $PLUGIN_CFLAGS" >> $config_mak
echo >> $config_mak
diff --git a/plugins/dfxvideo/Makefile b/plugins/dfxvideo/Makefile
index a5ca5f3..250cc49 100644
--- a/plugins/dfxvideo/Makefile
+++ b/plugins/dfxvideo/Makefile
@@ -12,7 +12,7 @@ ifeq "$(ARCH)" "arm"
SRC_STANDALONE += draw_pl.c
else
SRC_STANDALONE += draw.c
-LDLIBS_STANDALONE += -lX11 -lXv
+LDLIBS_STANDALONE += -lX11 -lXv -lXext
endif
BIN_STANDLALONE = gpuPEOPS.so
diff --git a/plugins/gpulib/gpulib.mak b/plugins/gpulib/gpulib.mak
index 349a0c8..22da6f5 100644
--- a/plugins/gpulib/gpulib.mak
+++ b/plugins/gpulib/gpulib.mak
@@ -2,7 +2,7 @@
# always adding gpulib to deps in case cspace is needed
# users must include ../../config.mak
-LDFLAGS += -shared
+LDFLAGS += -shared -Wl,--no-undefined
CFLAGS += $(PLUGIN_CFLAGS)
ifeq "$(ARCH)" "arm"
EXT =