fix: use correct ndk env variable

This commit is contained in:
Hugo Pointcheval 2023-12-05 15:15:53 +01:00
parent 8a23012e40
commit 2b114a0e4f
Signed by: hugo
GPG Key ID: 3AAC487E131E00BC
2 changed files with 2 additions and 21 deletions

View File

@ -81,22 +81,3 @@ In this case, you need to add the dependencies as **DLL assemblies** in the `ext
``` ```
Then during the build, the script will automatically add the external dependencies to the generated project. Then during the build, the script will automatically add the external dependencies to the generated project.
### iOS
For iOS you also need to add path to each dll in `template.beyondnetgen.ios.config.json`:
```json
{
"AssemblyPath": "INPUT_PROJECT_NAME/bin/Release/INPUT_NET_SPEC/INPUT_PROJECT_NAME.dll",
"CSharpUnmanagedOutputPath": "GENERATED_PROJECT_NAME/Generated.cs",
"COutputPath": "GENERATED_PROJECT_NAME/Generated.h",
// Add this
"AssemblySearchPaths": [
"external/Autofac.dll"
],
"Build": {
"Target": "apple-universal"
}
}
```

View File

@ -46,8 +46,8 @@
<NdkHost Condition="$(IsWindowsHost) == 'true'">windows-x86_64</NdkHost> <NdkHost Condition="$(IsWindowsHost) == 'true'">windows-x86_64</NdkHost>
<NdkHost Condition="$(IsLinuxHost) == 'true'">linux-x86_64</NdkHost> <NdkHost Condition="$(IsLinuxHost) == 'true'">linux-x86_64</NdkHost>
<NdkHost Condition="$(IsOSXHost) == 'true'">darwin-x86_64</NdkHost> <NdkHost Condition="$(IsOSXHost) == 'true'">darwin-x86_64</NdkHost>
<ObjCopyName Condition="'$(ObjCopyName)' == ''">$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/$(NdkHost)/bin/llvm-objcopy</ObjCopyName> <ObjCopyName Condition="'$(ObjCopyName)' == ''">$(ANDROID_NDK_HOME)/toolchains/llvm/prebuilt/$(NdkHost)/bin/llvm-objcopy</ObjCopyName>
<SysRoot Condition="'$(SysRoot)' == ''">$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/$(NdkHost)/sysroot</SysRoot> <SysRoot Condition="'$(SysRoot)' == ''">$(ANDROID_NDK_HOME)/toolchains/llvm/prebuilt/$(NdkHost)/sysroot</SysRoot>
<!--Hack for removing init and fini sections into the exports file--> <!--Hack for removing init and fini sections into the exports file-->
<ExportsPatch>'s/global: _init; _fini;/global: /g;'</ExportsPatch> <ExportsPatch>'s/global: _init; _fini;/global: /g;'</ExportsPatch>
</PropertyGroup> </PropertyGroup>