libretro/minibrowser
1
0
Fork 0
mirror of https://github.com/libretro/minibrowser.git synced 2024-11-23 07:29:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add more missing libraries, we can compile with --no-undefined now

Browse Source
This commit is contained in:
Brad Parker 2016-10-10 03:46:10 +00:00
parent a60f4a8fdd
commit a8f5e6d274
3 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.libretro
View File

@ -54,7 +54,7 @@ ifeq ($(platform), unix)
EXT ?= so
TARGET := $(TARGET_NAME)_libretro.$(EXT)
fpic := -fPIC
SHARED := -shared -Wl,--version-script=link.T# -Wl,--no-undefined
SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined
else ifeq ($(platform), linux-portable)
TARGET := $(TARGET_NAME)_libretro.$(EXT)
fpic := -fPIC -nostdlib
@ -119,8 +119,7 @@ CXXFLAGS += -pipe -Wall -W -D_REENTRANT
#-I. -I/usr/local/Qt-static-nongl-5.5.1/include -I/usr/local/Qt-static-nongl-5.5.1/include/QtWebKitWidgets -I/usr/local/Qt-static-nongl-5.5.1/include/QtWebKit -I/usr/local/Qt-static-nongl-5.5.1/include/QtWidgets -I/usr/local/Qt-static-nongl-5.5.1/include/ QtGui -I/usr/local/Qt-static-nongl-5.5.1/include/QtNetwork -I/usr/local/Qt-static-nongl-5.5.1/include/QtCore -I. -I/usr/local/Qt-static-nongl-5.5.1/mkspecs/linux-g++
LDFLAGS += libminibrowser.a $(QTPLAT)/libqoffscreen.a $(QTLIBDIR)/libQt5PlatformSupport.a $(XLIB)/libfontconfig.a libs/libfreetype.a -ludev libs/libz.a $(QTLIBDIR)/libQt5PrintSupport.a $(QTLIBDIR)/libQt5WebKitWidgets.a -Wl,--whole-archive $(QTLIBDIR)/libQt5WebKit.a $(WKITLIB)/libWebKit1.a $(WCORELIB)/libWebCore.a $(LEVELDBLIB)/libleveldb.a $(JSCORELIB)/libJavaScriptCore.a $(WTFLIB)/libWTF.a -Wl,--no-whole-archive libs/libxml2.a libs/libgio-2.0.a -Wl,--whole-archive libs/libgstapp-1.0.a libs/libgsttag-1.0.a libs/libgstplayback.a libs/libgstpbutils-1.0.a libs/libgstvideo-1.0.a libs/libgstaudio-1.0.a libs/libgstbase-1.0.a libs/libgstreamer-1.0.a libs/libgstlibav.a libs/libgsttypefindfunctions.a libs/libgstisomp4.a libs/libgstvideoparsersbad.a libs/libgstaudioparsers.a libs/libgstpulse.a libs/libgstvideofilter.a libs/libgstvideoconvert.a libs/libgstvideoscale.a libs/libgstdeinterlace.a libs/libgstvolume.a libs/libgstaudioconvert.a libs/libgstaudioresample.a libs/libgstcoreelements.a libs/libgstdebugutilsbad.a libs/libgstaudiofx.a libs/libgstfft-1.0.a libs/libgstautodetect.a libs/libgstriff-1.0.a libs/libgstrtp-1.0.a libs/libgstcodecparsers-1.0.a libs/libavcodec.a libs/libavdevice.a libs/libavfilter.a libs/libavformat.a libs/libavutil.a libs/libswresample.a $(XLIB)/libvpx.a -Wl,--no-whole-archive libs/libgobject-2.0.a libs/libgmodule-2.0.a libs/libgthread-2.0.a libs/libglib-2.0.a libs/libsqlite3.a $(QTLIBDIR)/libQt5Sensors.a $(QTLIBDIR)/libQt5Positioning.a $(QTLIBDIR)/libQt5Sql.a $(QTLIBDIR)/libQt5Widgets.a $(QTLIBDIR)/libQt5Gui.a $(QTLIBDIR)/libqtharfbuzzng.a $(QTLIBDIR)/libQt5Network.a libs/libssl.a libs/libcrypto.a $(QTLIBDIR)/libQt5Core.a libs/libicui18n.a libs/libicuuc.a libs/libicudata.a $(QTLIBDIR)/libqtpcre.a libs/libpcre.a -lm -ldl -lrt -lpthread
LDFLAGS += libminibrowser.a $(QTPLAT)/libqoffscreen.a $(QTLIBDIR)/libQt5PlatformSupport.a $(XLIB)/libfontconfig.a libs/libfreetype.a -ludev libs/libz.a -Wl,--whole-archive $(QTLIBDIR)/libQt5PrintSupport.a $(QTLIBDIR)/libQt5WebKitWidgets.a $(QTLIBDIR)/libQt5WebKit.a $(WKITLIB)/libWebKit1.a $(WCORELIB)/libWebCore.a $(LEVELDBLIB)/libleveldb.a $(JSCORELIB)/libJavaScriptCore.a $(WTFLIB)/libWTF.a -Wl,--no-whole-archive libs/libxml2.a libs/libgio-2.0.a -Wl,--whole-archive libs/libgstapp-1.0.a libs/libgsttag-1.0.a libs/libgstplayback.a libs/libgstpbutils-1.0.a libs/libgstvideo-1.0.a libs/libgstaudio-1.0.a libs/libgstbase-1.0.a libs/libgstreamer-1.0.a libs/libgstlibav.a libs/libgsttypefindfunctions.a libs/libgstisomp4.a libs/libgstvideoparsersbad.a libs/libgstaudioparsers.a libs/libgstpulse.a libs/libgstvideofilter.a libs/libgstvideoconvert.a libs/libgstvideoscale.a libs/libgstdeinterlace.a libs/libgstvolume.a libs/libgstaudioconvert.a libs/libgstaudioresample.a libs/libgstcoreelements.a libs/libgstdebugutilsbad.a libs/libgstaudiofx.a libs/libgstfft-1.0.a libs/libgstautodetect.a libs/libgstriff-1.0.a libs/libgstrtp-1.0.a libs/libgstcodecparsers-1.0.a libs/libavcodec.a libs/libavdevice.a libs/libavfilter.a libs/libavformat.a libs/libavutil.a libs/libswresample.a $(XLIB)/libvpx.a -Wl,--no-whole-archive libs/libgobject-2.0.a libs/libgmodule-2.0.a libs/libgthread-2.0.a libs/libglib-2.0.a libs/libsqlite3.a $(QTLIBDIR)/libQt5Sensors.a $(QTLIBDIR)/libQt5Positioning.a $(QTLIBDIR)/libQt5Sql.a $(QTLIBDIR)/libQt5Widgets.a $(QTLIBDIR)/libQt5Gui.a $(QTLIBDIR)/libqtharfbuzzng.a $(QTLIBDIR)/libQt5Network.a libs/libssl.a libs/libcrypto.a $(QTLIBDIR)/libQt5Core.a libs/libicui18n.a libs/libicuuc.a libs/libicudata.a $(QTLIBDIR)/libqtpcre.a libs/libpcre.a libs/liborc-0.4.a libs/liborc-test-0.4.a libs/libva.a -lm -ldl -lrt -lpthread -lpulse -lz -lffi -llzma -lbz2
ifeq ($(platform), win)
LDFLAGS += -lws2_32
endif

20
patches/liborc-rules Normal file
View File

@ -0,0 +1,20 @@
--- rules.orig 2016-10-10 03:26:04.382075529 +0000
+++ rules 2016-10-10 03:27:42.824314270 +0000
@@ -8,14 +8,15 @@
DEB_DH_AUTORECONF_ARGS += --as-needed
DEB_DH_STRIP_ARGS := --dbg-package=liborc-0.4-0-dbg
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-static --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+DEB_CONFIGURE_EXTRA_FLAGS := --with-pic=yes --enable-static --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
APIVER := 0.4
SHLIBVER := 1:0.4.25
liborc := $(shell sed -nr 's/^Package:[[:space:]]*(liborc-$(APIVER)-[0-9]+)[[:space:]]*$$/\1/p' debian/control)
DEB_DH_MAKESHLIBS_ARGS_$(liborc) = -V '$(liborc) (>= $(SHLIBVER))'
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+CFLAGS += -fPIC
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed -fPIC
DEB_MAKE_CHECK_TARGET := check || true
makebuilddir::

11
patches/libva-rules Normal file
View File

@ -0,0 +1,11 @@
--- rules.orig 2016-10-10 03:40:00.112902068 +0000
+++ rules 2016-10-10 03:41:21.782670941 +0000
@@ -2,7 +2,7 @@
DEB_HOST_ARCH_OS = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-confflags = --disable-silent-rules --enable-static
+confflags = --disable-silent-rules --enable-static --with-pic=yes
ifeq (,$(findstring linux,$(DEB_HOST_ARCH_OS)))
# wayland is only available on linux-any
confflags += --disable-wayland