7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2025-03-22 02:45:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions1

fix macos installer and the action

Browse source
This commit is contained in:
altalk23 2023-08-03 23:39:17 +03:00
parent 2233b94542
commit ea5a5f0076
2 changed files with 17 additions and 12 deletions
installer/mac/Scripts
postinstall
loader
CMakeLists.txt

24
installer/mac/Scripts/postinstall
View file

@ -1,12 +1,12 @@
#!/usr/bin/env osascript
set tmpPath to POSIX path of "/tmp/"
set binPath to POSIX path of (tmpPath & "geode-install/")
set tmpPath to (POSIX path of "/tmp/")
set binPath to (tmpPath & "geode-install/")
on ExitWithMessage(message)
display dialog message
do shell script "rm -rf " & binPath
do shell script "sudo rm -rf \"" & binPath & "\""
error number -128
end ExitWithMessage
@ -41,27 +41,27 @@ on error
end try
try
do shell script "mv -n " & (frameworkPath & fmodPath) & " " & (frameworkPath & fmodOriginalPath)
do shell script "mv -n \"" & (frameworkPath & fmodPath) & "\" \"" & (frameworkPath & fmodOriginalPath) & "\""
on error
ExitWithMessage ("Moving original fmod failed: " & (frameworkPath & fmodPath))
end try
try
do shell script "mv " & (binPath & geodePath) & " " & (frameworkPath & geodePath)
do shell script "mv " & (binPath & bootstrapperPath) & " " & (frameworkPath & bootstrapperPath)
do shell script "mv " & (binPath & fmodPath) & " " & (frameworkPath & fmodPath)
do shell script "INSTALLER_USER=$(stat -f '%Su' $HOME) && sudo chown -R $INSTALLER_USER " & frameworkPath
do shell script "sudo mv \"" & (binPath & geodePath) & "\" \"" & (frameworkPath & geodePath) & "\""
do shell script "sudo mv \"" & (binPath & bootstrapperPath) & "\" \"" & (frameworkPath & bootstrapperPath) & "\""
do shell script "sudo mv \"" & (binPath & fmodPath) & "\" \"" & (frameworkPath & fmodPath) & "\""
do shell script "INSTALLER_USER=$(stat -f '%Su' $HOME) && sudo chown -R $INSTALLER_USER \"" & frameworkPath & "\""
on error
ExitWithMessage ("Moving libraries failed: " & frameworkPath)
end try
try
do shell script "mkdir -p " & (gdPath & newResourcesPath)
do shell script "mv " & (binPath & resourcesPath) & "* " & (gdPath & newResourcesPath)
do shell script "INSTALLER_USER=$(stat -f '%Su' $HOME) && sudo chown -R $INSTALLER_USER " & (gdPath & newGeodePath)
do shell script "sudo mkdir -p \"" & (gdPath & newResourcesPath) & "\""
do shell script "sudo mv \"" & (binPath & resourcesPath) & "\"* \"" & (gdPath & newResourcesPath) & "\""
do shell script "INSTALLER_USER=$(stat -f '%Su' $HOME) && sudo chown -R $INSTALLER_USER \"" & (gdPath & newGeodePath) & "\""
on error
ExitWithMessage ("Moving resources failed: " & (gdPath & newResourcesPath))
end try
do shell script "rm -rf " & binPath
do shell script "sudo rm -rf \"" & binPath & "\""

5
loader/CMakeLists.txt
View file

@ -140,6 +140,11 @@ package_geode_resources_now(
${CMAKE_CURRENT_SOURCE_DIR}/src/internal/resources.hpp
)
if (APPLE)
# I don't care a single bit where to put this
file(COPY ${GEODE_LOADER_PATH}/include/link/libfmod.dylib DESTINATION ${GEODE_BIN_PATH}/nightly)
endif()
target_include_directories(${PROJECT_NAME} PRIVATE
src/
src/loader/