Mirrored_Repos/obs-websocket
1
0
Fork 0
mirror of https://github.com/Palakis/obs-websocket.git synced 2024-08-30 18:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

OS X: Fix linker issue

Browse Source
This commit is contained in:
Stéphane 2017-04-20 14:25:56 +02:00
parent a698f7bdf5
commit d4b8a8ff9e
3 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CI/osx/obs-websocket.pkgproj
View File

@ -27,6 +27,22 @@
<dict>
<key>CHILDREN</key>
<array>
<dict>
<key>CHILDREN</key>
<array/>
<key>GID</key>
<integer>80</integer>
<key>PATH</key>
<string>../../release/QtNetwork</string>
<key>PATH_TYPE</key>
<integer>1</integer>
<key>PERMISSIONS</key>
<integer>292</integer>
<key>TYPE</key>
<integer>3</integer>
<key>UID</key>
<integer>0</integer>
</dict>
<dict>
<key>CHILDREN</key>
<array/>

11
CI/package-osx.sh
View File

@ -3,6 +3,7 @@
set -e
export WS_LIB="$(brew --prefix qt5)/lib/QtWebSockets.framework/QtWebSockets"
export NET_LIB="$(brew --prefix qt5)/lib/QtNetwork.framework/QtNetwork"
export GIT_HASH=$(git rev-parse --short HEAD)
@ -13,8 +14,18 @@ fi
export FILENAME="obs-websocket-$VERSION-osx.pkg"
# TODO : put a loop in there
install_name_tool \
-change "$(brew --prefix qt5)/lib/QtWebSockets.framework/Versions/5/QtWebSockets" @rpath/QtWebSockets \
-change "$(brew --prefix qt5)/lib/QtWidgets.framework/Versions/5/QtWidgets" @rpath/QtWidgets \
-change "$(brew --prefix qt5)/lib/QtNetwork.framework/Versions/5/QtNetwork" @rpath/QtNetwork \
-change "$(brew --prefix qt5)/lib/QtGui.framework/Versions/5/QtGui" @rpath/QtGui \
-change "$(brew --prefix qt5)/lib/QtCore.framework/Versions/5/QtCore" @rpath/QtCore \
./build/obs-websocket.so
mkdir release
cp $WS_LIB ./release
cp $NET_LIB ./release
packagesbuild ./CI/osx/obs-websocket.pkgproj

11
CMakeLists.txt
View File

@ -7,6 +7,7 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
include(external/FindLibObs.cmake)
find_package(LibObs REQUIRED)
find_package(Qt5Core REQUIRED)
find_package(Qt5WebSockets REQUIRED)
@ -54,6 +55,7 @@ target_link_libraries(obs-websocket
Qt5::WebSockets
Qt5::Widgets
mbedcrypto)
# --- End of section ---
# --- Windows-specific build settings and tasks ---
@ -127,10 +129,11 @@ if(UNIX AND NOT APPLE)
endif()
# --- End of section ---
# TODO : OS X build settings and tasks
# -- OS X specific build settings and tasks --
if(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -fvisibility=default -v")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -fvisibility=default")
set_target_properties(obs-websocket PROPERTIES PREFIX "")
target_link_libraries(obs-websocket "${OBS_FRONTEND_LIB}")
set_target_properties(obs-websocket PROPERTIES PREFIX "")
target_link_libraries(obs-websocket "${OBS_FRONTEND_LIB}")
endif()
# -- End of section --