diff options
| author | Ries van Twisk <github@rvt.dds.nl> | 2020-01-05 21:58:43 +0100 |
|---|---|---|
| committer | Ries van Twisk <github@rvt.dds.nl> | 2020-01-05 21:58:43 +0100 |
| commit | 2d709bb4755305342b79a1574c90b2be348b4c4d (patch) | |
| tree | e5a7f92330897a428f8276930e7b89aabd46e1f2 | |
| parent | 18cbd25f2e3ed59bb9f20ba314d603df0eb46c1d (diff) | |
Copy third party DLL/EXE to third party direcoty for WINE users
| -rw-r--r-- | cmake/opentrack-install.cmake | 12 | ||||
| -rwxr-xr-x | macosx/make-app-bundle.sh | 3 |
2 files changed, 9 insertions, 6 deletions
diff --git a/cmake/opentrack-install.cmake b/cmake/opentrack-install.cmake index 784cf59a..d464936c 100644 --- a/cmake/opentrack-install.cmake +++ b/cmake/opentrack-install.cmake @@ -71,11 +71,13 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") cleanup_visual_studio_debug() endif() -if (NOT APPLE) -otr_install_exec("${opentrack-hier-pfx}" FILES "${CMAKE_SOURCE_DIR}/bin/freetrackclient.dll") -otr_install_exec("${opentrack-hier-pfx}" FILES "${CMAKE_SOURCE_DIR}/bin/freetrackclient64.dll") -otr_install_exec("${opentrack-hier-pfx}" FILES +# For now copy third party needed files into a seperate direcvtory instead of the plugins directory +if (APPLE) + set(OSX_POST_INSTALL_DIR "/../thirdparty") +endif() +otr_install_exec("${opentrack-hier-pfx}${OSX_POST_INSTALL_DIR}" FILES "${CMAKE_SOURCE_DIR}/bin/freetrackclient.dll") +otr_install_exec("${opentrack-hier-pfx}${OSX_POST_INSTALL_DIR}" FILES "${CMAKE_SOURCE_DIR}/bin/freetrackclient64.dll") +otr_install_exec("${opentrack-hier-pfx}${OSX_POST_INSTALL_DIR}" FILES "${CMAKE_SOURCE_DIR}/bin/NPClient.dll" "${CMAKE_SOURCE_DIR}/bin/NPClient64.dll" "${CMAKE_SOURCE_DIR}/bin/TrackIR.exe") -endif()
\ No newline at end of file diff --git a/macosx/make-app-bundle.sh b/macosx/make-app-bundle.sh index b124d4a1..9265eeb9 100755 --- a/macosx/make-app-bundle.sh +++ b/macosx/make-app-bundle.sh @@ -72,10 +72,11 @@ create-dmg \ --icon "$APPNAME.app" 200 180 \ --app-drop-link 420 180 \ --hide-extension "$APPNAME.app" \ - --add-folder "Document" "$install/doc" 20 40 \ --no-internet-enable \ + --add-folder "Document" "$install/doc" 20 40 \ --add-folder "source-code" "$install/source-code" 220 40 \ --add-folder "Xplane-Plugin" "$install/xplane" 420 40 \ + --add-folder "thirdparty" "$install/thirdparty" 620 40 \ "$version.dmg" \ "$install/$APPNAME.app" |