Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2026-01-01 06:00:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix OS X Mono build

Browse Source
This commit is contained in:
JustArchi
2017-05-28 13:09:15 +02:00
parent ea0a1ab086
commit 949a201745
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ArchiSteamFarm/ArchiSteamFarm.csproj
View File

@@ -274,8 +274,8 @@
cp "$(TargetDir)config/example.json" "$(SolutionDir)out/config"
cp "$(TargetDir)config/minimal.json" "$(SolutionDir)out/config"
if [ -n "$MONO_FACADES" ]; then
mono "$(SolutionDir)tools/ILRepack/ILRepack.exe" "/lib:$MONO_FACADES" /ndebug /internalize /parallel /targetplatform:v4 /wildcards /out:"$(SolutionDir)out/ASF-Service.exe" "$(TargetDir)$(TargetName).exe" "$(TargetDir)*.dll"
if [ -n "$MONO_API_PATH" ]; then
mono "$(SolutionDir)tools/ILRepack/ILRepack.exe" "/lib:${MONO_API_PATH}" "/lib:${MONO_API_PATH}/Facades" /ndebug /internalize /parallel /targetplatform:v4 /wildcards /out:"$(SolutionDir)out/ASF-Service.exe" "$(TargetDir)$(TargetName).exe" "$(TargetDir)*.dll"
else
mono "$(SolutionDir)tools/ILRepack/ILRepack.exe" /ndebug /internalize /parallel /targetplatform:v4 /wildcards /out:"$(SolutionDir)out/ASF-Service.exe" "$(TargetDir)$(TargetName).exe" "$(TargetDir)*.dll"
fi

4
ConfigGenerator/ConfigGenerator.csproj
View File

@@ -187,8 +187,8 @@
. "$(SolutionDir)mono_envsetup.sh"
fi
if [ -n "$MONO_FACADES" ]; then
mono "$(SolutionDir)tools/ILRepack/ILRepack.exe" "/lib:$MONO_FACADES" /ndebug /internalize /parallel /targetplatform:v4 /wildcards /out:"$(SolutionDir)out/ASF-ConfigGenerator.exe" "$(TargetDir)$(TargetName).exe" "$(TargetDir)*.dll"
if [ -n "$MONO_API_PATH" ]; then
mono "$(SolutionDir)tools/ILRepack/ILRepack.exe" "/lib:${MONO_API_PATH}" "/lib:${MONO_API_PATH}/Facades" /ndebug /internalize /parallel /targetplatform:v4 /wildcards /out:"$(SolutionDir)out/ASF-ConfigGenerator.exe" "$(TargetDir)$(TargetName).exe" "$(TargetDir)*.dll"
else
mono "$(SolutionDir)tools/ILRepack/ILRepack.exe" /ndebug /internalize /parallel /targetplatform:v4 /wildcards /out:"$(SolutionDir)out/ASF-ConfigGenerator.exe" "$(TargetDir)$(TargetName).exe" "$(TargetDir)*.dll"
fi

4
GUI/GUI.csproj
View File

@@ -385,8 +385,8 @@
. "$(SolutionDir)mono_envsetup.sh"
fi
if [ -n "$MONO_FACADES" ]; then
mono "$(SolutionDir)tools/ILRepack/ILRepack.exe" "/lib:$MONO_FACADES" /ndebug /internalize /parallel /targetplatform:v4 /wildcards /out:"$(SolutionDir)out/ASF-GUI.exe" "$(TargetDir)$(TargetName).exe" "$(TargetDir)*.dll"
if [ -n "$MONO_API_PATH" ]; then
mono "$(SolutionDir)tools/ILRepack/ILRepack.exe" "/lib:${MONO_API_PATH}" "/lib:${MONO_API_PATH}/Facades" /ndebug /internalize /parallel /targetplatform:v4 /wildcards /out:"$(SolutionDir)out/ASF-GUI.exe" "$(TargetDir)$(TargetName).exe" "$(TargetDir)*.dll"
else
mono "$(SolutionDir)tools/ILRepack/ILRepack.exe" /ndebug /internalize /parallel /targetplatform:v4 /wildcards /out:"$(SolutionDir)out/ASF-GUI.exe" "$(TargetDir)$(TargetName).exe" "$(TargetDir)*.dll"
fi

18
mono_envsetup.sh
View File

@@ -72,7 +72,7 @@ VERSION_LESS_EQUAL_THAN() {
# Main
echo "INFO: Mono environment setup executed!"
CURRENT_MONO_VERSION="$(mono -V | head -n 1 | cut -d ' ' -f 5 | cut -d '.' -f '1-3')" # We take only first three version numbers, this is needed for facades path in OS X
CURRENT_MONO_VERSION="$(mono -V | head -n 1 | cut -d ' ' -f 5 | cut -d '.' -f '1-3')" # We take only first three version numbers, this is needed for API path in OS X
echo "INFO: Mono version: $CURRENT_MONO_VERSION | Required: ${MINIMUM_MONO_VERSION}+"
@@ -87,22 +87,22 @@ MONO_DEBUG_ADD_IF_AVAILABLE "no-gdb-backtrace"
MONO_ENV_OPTIONS_ADD "-O=all"
MONO_ENV_OPTIONS_ADD "--server"
if [ -n "$MONO_FACADES" ]; then
echo "INFO: Mono facades path was already set to: $MONO_FACADES"
if [ -n "$MONO_API_PATH" ]; then
echo "INFO: Mono API path was already set to: $MONO_API_PATH"
else
for MONO_LOCATION in "/opt/mono" "/usr" "/Library/Frameworks/Mono.framework/Versions/${CURRENT_MONO_VERSION}"; do
for API in "${MINIMUM_NET_FRAMEWORK}-api" "4.5"; do # 4.5 is fallback path that existed before Mono decided to split Facades on per-API basis - still available
if [ -d "${MONO_LOCATION}/lib/mono/${API}/Facades" ]; then
export MONO_FACADES="${MONO_LOCATION}/lib/mono/${API}/Facades"
for API in "${MINIMUM_NET_FRAMEWORK}-api" "4.5"; do # 4.5 is fallback path that existed before Mono decided to split libraries on per-API basis - still available
if [ -d "${MONO_LOCATION}/lib/mono/${API}" ]; then
export MONO_API_PATH="${MONO_LOCATION}/lib/mono/${API}"
break 2
fi
done
done
if [ -n "$MONO_FACADES" ]; then
echo "INFO: Mono facades path resolved to: $MONO_FACADES"
if [ -n "$MONO_API_PATH" ]; then
echo "INFO: Mono API path resolved to: $MONO_API_PATH"
else
echo "WARN: Could not find Mono facades!"
echo "WARN: Could not find Mono API path!"
fi
fi